[feat]采购管理：修改添加获取采购报价子表方法，修改采购报价信息，将采购报价编号disable属性改为redeongly，修改采购计划，添加采购计划报价子表信息，添加供应商对象组信息，根据物料对供应商遍历查询。查询的结果放入采购报价物料子表信息供应商组中.

ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchasePlanController.java

@@ -3,6 +3,10 @@ package com.ruoyi.purchase.controller;
 import java.util.List;
 
 import com.ruoyi.purchase.domain.PurchasePlan;
+import com.ruoyi.purchase.domain.PurchasePlanChild;
+import com.ruoyi.purchase.domain.PurchaseQuoteChild;
+import com.ruoyi.purchase.service.IPurchasePlanChildService;
+import com.ruoyi.purchase.service.IPurchaseQuoteChildService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -35,6 +39,11 @@ public class PurchasePlanController extends BaseController
     @Autowired
     private IPurchasePlanService purchasePlanService;
 
+    @Autowired
+    private IPurchasePlanChildService purchasePlanChildService;
+
+    @Autowired
+    private IPurchaseQuoteChildService purchaseQuoteChildService;
     @RequiresPermissions("purchase:purchasePlan:view")
     @GetMapping()
     public String purchasePlan()
@@ -102,8 +111,14 @@ public class PurchasePlanController extends BaseController
     }
     @GetMapping("/addPurchaseOrder/{purchasePlanCodes}")
     public String purChaseOrder(@PathVariable("purchasePlanCodes") String purchasePlanCodes,ModelMap mmap){
+        //查询相关采购计划数据
         List<PurchasePlan> purchasePlanList = purchasePlanService.selectPurchasePlanByPlanCode(purchasePlanCodes);
+        //根据采购计划编号查询对应的采购报价数据
+        List<PurchasePlanChild> purchasePlanChildList = purchasePlanChildService.selectPurchasePlanChildListByPlanCodes(purchasePlanCodes);
+        //把物料根据供应商分组，然后根据供应商分组查询对应的供应商报价数据
+        //再根据采购计划编号分组查询对应的采购报价数据
         mmap.put("purchasePlanList", purchasePlanList);
+        mmap.put("purchasePlanChildList", purchasePlanChildList);
         return prefix + "/addPurchaseOrder";
     }
     @GetMapping("/detail/{purchasePlanId}")

ruoyi-admin/src/main/java/com/ruoyi/purchase/mapper/PurchasePlanChildMapper.java

@@ -74,4 +74,6 @@ public interface PurchasePlanChildMapper
      * @return 结果
      */
     public int restorePurchasePlanChildById(Long purchasePlanChildId);
+
+    List<PurchasePlanChild> selectPurchasePlanChildListByPlanCodes(String[] purchasePlanCodes);
 }

ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchasePlanChildService.java

@@ -72,4 +72,11 @@ public interface IPurchasePlanChildService
      * @return
      */
     int restorePurchasePlanChildById(Long purchasePlanChildId);
+
+    /**
+     *  根据采购计划单号查询采购计划单物料信息
+     * @param purchasePlanCodes
+     * @return
+     */
+    List<PurchasePlanChild> selectPurchasePlanChildListByPlanCodes(String purchasePlanCodes);
 }

ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchasePlanService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.purchase.service;
 
 import com.ruoyi.purchase.domain.PurchasePlan;
+import com.ruoyi.purchase.domain.PurchasePlanChild;
 
 import java.util.List;
 
@@ -74,5 +75,6 @@ public interface IPurchasePlanService
      */
     int restorePurchasePlanById(Long purchasePlanId);
 
-    public List<PurchasePlan> selectPurchasePlanByPlanCode(String planCode);
+    public List<PurchasePlan> selectPurchasePlanByPlanCode(String purchasePlanCodes);
+
 }

ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchasePlanChildServiceImpl.java

@@ -123,4 +123,10 @@ public class PurchasePlanChildServiceImpl implements IPurchasePlanChildService
     {
         return purchasePlanChildMapper.restorePurchasePlanChildById(purchasePlanChildId);
     }
+
+    @Override
+    public List<PurchasePlanChild> selectPurchasePlanChildListByPlanCodes(String purchasePlanCodes)
+    {
+        return purchasePlanChildMapper.selectPurchasePlanChildListByPlanCodes(Convert.toStrArray(purchasePlanCodes));
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchasePlanServiceImpl.java

@@ -125,8 +125,8 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService
     }
 
     @Override
-    public List<PurchasePlan> selectPurchasePlanByPlanCode(String planCodes) {
+    public List<PurchasePlan> selectPurchasePlanByPlanCode(String purchasePlanCodes) {
-        return purchasePlanMapper.selectPurchasePlanByPlanCode(Convert.toStrArray(planCodes));
+        return purchasePlanMapper.selectPurchasePlanByPlanCode(Convert.toStrArray(purchasePlanCodes));
     }
 
 }

ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectPurchasePlanChildList" parameterType="PurchasePlanChild" resultMap="PurchasePlanChildResult">
         <include refid="selectPurchasePlanChildVo"/>
-        <where>  
+        <where>
             <if test="purchasePlanChildId != null "> and purchase_plan_child_id = #{purchasePlanChildId}</if>
             <if test="purchasePlanCode != null  and purchasePlanCode != ''"> and purchase_plan_code = #{purchasePlanCode}</if>
             <if test="materialId != null "> and material_id = #{materialId}</if>
@@ -57,7 +57,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectPurchasePlanChildVo"/>
         where purchase_plan_child_id = #{purchasePlanChildId}
     </select>
-        
+
+    <select id="selectPurchasePlanChildListByPlanCodes" resultMap="PurchasePlanChildResult">
+        <include refid="selectPurchasePlanChildVo"/>
+        where purchase_plan_code in
+        <foreach item="purchasePlanCode" collection="array" open="(" separator="," close=")">
+            #{purchasePlanCode}
+        </foreach>
+    </select>
+
     <insert id="insertPurchasePlanChild" parameterType="PurchasePlanChild" useGeneratedKeys="true" keyProperty="purchasePlanChildId">
         insert into purchase_plan_child
         <trim prefix="(" suffix=")" suffixOverrides=",">

ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/addPurchaseOrder.html

@@ -6,51 +6,61 @@
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
   <form class="form-horizontal m" id="form-plan-add" th:object="${purchasePlanList}">
-    <div class="container">
+    <div class="form-header">
-      <label class="col-sm-3 control-label">已选择采购计划：</label>
+      <label class="col-sm-5 control-label">已选择采购计划：</label>
-      <div class="col-sm-6">
+      <div class="col-sm-7">
-         <input name="purchasePlanCode" class="form-control" type="text">
+        <input id="purchasePlanCodes" name="purchasePlanCode" class="form-control" type="text">
       </div>
     </div>
-    <div class="container">
+    <div class="container-div" id="material">
-      <div class="form-row">
+      <div class="col-sm-12 select-table table-striped">
-        <span class="form-header-4">公司收获地址:</span>
+        <div class="other container">
+          <div class="form-row">
+            <div class="btn-group-sm" id="toolbar" role="group">
+              <span>物料信息1</span>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-sm-12 select-table table-striped">
+              <table id="bootstrap-sub-table-order"></table>
+            </div>
+          </div>
+        </div>
       </div>
-      <div class="row">
+    </div>
+    <div class="container">
+      <h4 class="form-header h4">公司地址</h4>
         <div class="form-group">
           <label for="inputWarehouseID" class="col-sm-3 col-form-label">仓库ID:</label>
-          <div class="col-sm-5">
+          <div class="col-sm-8">
             <input type="text" class="form-control" id="inputWarehouseID" placeholder="请输入仓库ID">
           </div>
         </div>
         <div class="form-group">
           <label for="inputWarehouseName" class="col-sm-3 col-form-label">仓库名称:</label>
-          <div class="col-sm-5">
+          <div class="col-sm-8">
             <input type="text" class="form-control" id="inputWarehouseName" placeholder="请输入仓库名称">
           </div>
         </div>
-      </div>
-      <div class="row">
         <div class="form-group">
           <label for="inputReceiver" class="col-sm-3 col-form-label">收货人:</label>
-          <div class="col-sm-5">
+          <div class="col-sm-8">
             <input type="text" class="form-control" id="inputReceiver" placeholder="请输入收货人">
           </div>
         </div>
         <div class="form-group">
           <label for="inputPhone" class="col-sm-3 col-form-label">收货电话:</label>
-          <div class="col-sm-5">
+          <div class="col-sm-8">
-            <input type="tel" class="form-control" id="inputPhone" placeholder="请输入收货电话">
+            <input type="text" class="form-control" id="inputPhone" placeholder="请输入收货电话">
           </div>
         </div>
         <div class="form-group">
           <label for="inputAddressDetails" class="col-sm-3 col-form-label">详细地址:</label>
-          <div class="col-sm-5">
+          <div class="col-sm-8">
-            <textarea class="form-control" id="inputAddressDetails" rows="3"></textarea>
+            <textarea class="form-control" id="inputAddressDetails"></textarea>
           </div>
         </div>
       </div>
-    </div>
   </form>
 </div>
 <th:block th:include="include :: footer" />
@@ -58,10 +68,9 @@
   var prefix = ctx + "purchase/plan"
   $("#form-plan-add").validate({focusCleanup: true});
   var purchasePlanList = [[${purchasePlanList}]];
-
   function submitHandler() {
     if ($.validate.form()) {
-      $.operate.save(prefix + "/add", $('#form-plan-add').serialize());
+      $.operate.save(prefix + "/add", $(#form-plan-add).serialize());
     }
   }
   //根据物料物料数量添加物料分类表，自动生成类似的表单对象
@@ -71,93 +80,98 @@
   var formId = $("#form-plan-add").attr("id");
   //获取采购计划单的物料信息
   var materialList = [];
+  var purchasePlanList = $("#purchasePlanCodes").val();
   //获取
-  function addMaterial() {
-    //循环生成表
-    //在表中正在循环生成表供应商相关信息
-    var row =
-            '<div className="row purchase-table"> ' +
-                '<span className="help-block m-b-none">物料 ： </span>'+
-                '<div className="col-sm-12 select-table table-striped">'+
-                  '<table id="bootstrap-table"></table>'+
-                '</div>'+
-            '</div>'
-  }
   $(function() {
-    // 假设qualityOrderCode已经定义或者可以通过某种方式获取到
+      var options = {
-    var materialList = purchasePlanList;
+        id: "bootstrap-table" + tableCounter,
-    for (var i = 0; i < materialList.length; i++) {
+        // url: prefix + "/list",
-       var material = materialList[i];
+        modalName: "采购计划单",
-       var row =
+        search: false,
-               '<div className="row purchase-table"> ' +
+        showExport: false,
-                   '<span className="help-block m-b-none">物料 ： </span>'+
+        showFooter: false,
-                   '<div className="col-sm-12 select-table table-striped">'+
+        showSearch: false,
-                     '<table id="bootstrap-table"></table>'+
+        showRefresh: false,
-                   '</div>'+
+        showColumns: false,
-               '</div>'
+        showToggle: false,
-      var tableId = 'bootstrap-table-' + supplierCode.replace(/[^a-z0-9]/gi, '_').toLowerCase();
+        columns: [
+          {checkbox: false},
+          {title: '料号', field: 'materialNo'},
+          {title: '图片', field: 'photoUrl'},
+          {title: '物料名称', field: 'materialName'},
+          {title: '物料类型', field: 'materialType'},
+          {title: '物料描述', field: 'describe'},
+          {title: '品牌', field: 'brand'},
+          {title: '加工方式', field: 'processMethod',},
+          {title: '单位', field: 'unit'},
+          {title: '计划采购数', field: 'planPurchaseNum',},
+        ]
+      }
+      $.table.init(options);
+    var materialList = purchasePlanList; // 假设这是获取到的物料列表
+    var tableCounter = 0; // 计数器，用于生成唯一的表格ID
+    // 遍历物料列表，为每个物料生成表格
+    materialList.forEach(function(material, index) {
       var $tableWrapper = $('<div class="table-responsive mt-3"></div>');
+      var $table = $('<table id="' + uniqueTableId + '" class="table table-striped table-bordered"></table>');
 
-    }
+      // 初始化此表格的配置
+      var tableOptions = Object.assign({}, options, { // 复制并修改options以适应当前物料
+        id: uniqueTableId,
+        data: [material] // 假设options支持直接传入数据来渲染表格
+      });
+      $.table.init(tableOptions, $table); // 假设$.table.init可以接受jQuery对象来初始化表格
+
+      // 添加表头信息
+      var supplierInfo = material.supplier || {}; // 假设物料对象中包含供应商信息
+      addHead(uniqueTableId, material, supplierInfo);
+
+      // 将表格加入到页面的某个容器中，这里假设存在一个容器div#materials-container
+      $('#materials-container').append($tableWrapper.append($table));
+    });
   });
-  function addhead(tableId,data,supplierInfo) {
+    // 假设qualityOrderCode已经定义或者可以通过某种方式获取到
-    var headerTitle =
+
-            '供应商' + '</br>' + +' -  ' + (supplierInfo.supplierName || 'N/A') +
+  $(function() {
-            ' </br> ' + (supplierInfo.customerContact || 'N/A') +
+    var tableOptions = {
-            ' - ' + '最新不含税采购价' + '10' + 'RMB' + '  最新含税采购价:' + '20' + 'RMB' +
+      showExport: false,
-            '<div class="form-group">' +
+      showFooter: false,
-            '<label class="col-sm-4 col-form-label is-required">实际采购数:</label>' +
+      showSearch: false,
-            '<div class="col-sm-4">' +
+      showRefresh: false,
-            '<input type="text" class="form-control"  placeholder="请输入仓库ID" required="required">' +
+      showColumns: false,
-            '</div>' +
+      showToggle: false,
-            '</div>' +
-            '<div class="form-group">' +
-            '<label  class="col-sm-2 col-form-label">交付时间:</label>' +
-            '<div class="input-group date">' +
-            '<input name="pricingDate" class="form-control" placeholder="yyyy-MM-dd" type="text">' +
-            '<span class="input-group-addon"><i class="fa fa-calendar"></i></span>' +
-            '</div>' +
-            '</div>';
-            '<div class="form-group">' +
-            '<label  class="col-sm-2 col-form-label">实际采购合计:</label>' +
-            '<div class="input-group date">' +
-            '<input name="pricingDate" class="form-control" placeholder="yyyy-MM-dd" type="text">' +
-            '</div>' +
-            '</div>' +
-            '<div class="form-group">' +
-            '<label  class="col-sm-2 col-form-label">不含税采购总价:</label>' +
-            '<div class="input-group date">' +
-            '<input name="pricingDate" class="form-control"  type="text">' +
-            '</div>' +
-            '</div>' +
-            '<div class="form-group">' +
-            '<label  class="col-sm-2 col-form-label">含税采购总价:</label>' +
-            '<div class="input-group date">' +
-            '<input name="pricingDate" class="form-control" type="text">' +
-            '<span class="input-group-addon"><i class="fa fa-calendar"></i></span>' +
-            '</div>' +
-            '</div>';
-    var $header = $('<h4>' + headerTitle + '</h4>');
-    var $table = $('<table id="' + tableId + '" class="table table-striped table-bordered"></table>');
-  }
-  function bootstrapTable(id,data) {
-    $('#'+ id).bootstrapTable({
-      data: data,
       columns: [
         {checkbox: false},
-        {title: '料号',field: 'materialNo'},
+        {title: '料号', field: 'materialNo'},
-        {title: '图片',field: 'photoUrl'},
+        {title: '图片', field: 'photoUrl'},
-        {title: '物料名称',field: 'materialName'},
+        {title: '物料名称', field: 'materialName'},
-        {title: '物料类型',field: 'materialType'},
+        {title: '物料类型', field: 'materialType'},
         {title: '物料描述', field: 'describe'},
-        {title: '品牌',field: 'brand'},
+        {title: '品牌', field: 'brand'},
-        {title: '半成品类型',field: 'processMethod',},
+        {title: '加工方式', field: 'processMethod'},
-        {title: '单位',field: 'unit'},
+        {title: '单位', field: 'unit'},
-        {title: '计划采购数',field: 'planPurchaseNum',
+        {title: '计划采购数', field: 'planPurchaseNum'},
-        },]
+      ]
-    });
+    };
-    //在行数据下添加采购供应商信息。
+    purchasePlanList.forEach(function(material, index) {
-  }
+      // 创建一个新的表格容器
+      var $tableWrapper = $('<div class="table-responsive mt-3"></div>');
+      var tableId = 'bootstrap-table-' + index;
+      var $table = $('<table id="' + tableId + '" class="table table-striped table-bordered"></table>');
+
+      // 在每个表格前添加关联销售订单号
+      var $headerDiv = $('<div class="header-div text-center mb-3"><strong>关联销售订单号:</strong> ' + material.salesOrderCode + '</div>');
+      $tableWrapper.append($headerDiv);
+
+      // 使用物料数据初始化表格
+      var materialData = [material]; // Bootstrap Table需要一个数组作为数据源
+      var tableOpts = Object.assign({}, tableOptions, {data: materialData});
+      $table.bootstrapTable(tableOpts);
+
+      // 添加到DOM中
+      $('#material').append($tableWrapper.append($table)); // 根据实际情况调整父容器选择器
+    })
+  });
 </script>
 </body>
 </html>

ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html

@@ -72,6 +72,7 @@
         var useStatusDatas = [[${@dict.getType('useStatus')}]];
         var processMethodDatas = [[${@dict.getType('processMethod')}]];
         var sysUnitClassDatas = [[${@dict.getType('sysUnitClassDatas')}]];
+        var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
         var purchasePlanTypeDatas = [[${@dict.getType('purchase_plan_source')}]];
         var prefix = ctx + "purchase/purchasePlan";
         $(function() {
@@ -137,7 +138,7 @@
                 },
                 columns: [
                     {field: 'purchasePlanId',title: '主键id',visible: false},
-                    {field: 'materialNo',title: '料号',},
+                    {field: 'materialCode',title: '料号',},
                     {field: 'photoUrl',title: '图片',
                         formatter: function(value, row, index) {return $.table.imageView(value);}
                     },
@@ -166,10 +167,18 @@
                 $.modal.alertWarning("请选择采购计划单");
                 return;
             }else{
-
+                if(selections.length > 1 ){
-                for(var i=0;i<selections.length;i++){
+                    //·拼接采购计划单号
-                    purchasePlanCodes += selections[i].purchasePlanCode;
+                    for(var i=0;i<selections.length;i++){
+                        purchasePlanCodes += selections[i].purchasePlanCode + ",";
+                        if(i == selections.length-1){
+                            purchasePlanCodes += selections[i].purchasePlanCode ;
+                        }
+                    }
+                }else{
+                    purchasePlanCodes = selections[0].purchasePlanCode;
                 }
+
             }
             $.modal.open("新增采购订单", prefix + "/addPurchaseOrder/" + purchasePlanCodes);
         }

ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/edit.html

@@ -14,7 +14,7 @@
             <div class="form-group" hidden="hidden">
                 <label class="col-sm-3 control-label" >采购报价单号：</label>
                 <div class="col-sm-8">
-                    <input id="purchaseQuoteCode_edit" name="purchaseQuoteCode" th:field="*{purchaseQuoteCode}" class="form-control" type="text" disabled>
+                    <input id="purchaseQuoteCode_edit" name="purchaseQuoteCode" th:field="*{purchaseQuoteCode}" class="form-control" type="text" readonly>
                 </div>
             </div>
             <div class="form-group">