From a9c9a88af7f59aa83cee2e5d075eba0ca8f325bd Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Sun, 30 Jun 2024 11:20:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E7=94=A8=E7=89=A9=E6=96=99=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=EF=BC=8C=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=85=A5=E5=BA=93=E9=83=A8=E9=97=A8=E3=80=81=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase/domain/PurchaseOrderChild.java   | 11 +++++++++++
 .../purchase/domain/PurchasePlanChild.java    | 13 ++++++++++++-
 .../purchase/PurchaseOrderChildMapper.xml     | 12 ++++++++----
 .../purchase/PurchasePlanChildMapper.xml      | 17 ++++++++++++++---
 .../purchasePlan/addPurchaseOrder.html        | 19 +++++++++++--------
 .../purchase/purchasePlan/purchasePlan.html   | 15 ++++++---------
 6 files changed, 62 insertions(+), 25 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseOrderChild.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseOrderChild.java
index 75e12141..42f52729 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseOrderChild.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseOrderChild.java
@@ -64,6 +64,9 @@ public class PurchaseOrderChild extends BaseEntity
 
     @Excel(name = "物料加工方法")
     private String materialProcessMethod;
+
+    @Excel(name = "入库部门")
+    private String warehouseDept;
     /** 物料不含税单价 */
     @Excel(name = "物料不含税单价")
     private BigDecimal materialNoRmb;
@@ -165,6 +168,14 @@ public class PurchaseOrderChild extends BaseEntity
         this.purchaseQuoteChildList = purchaseQuoteChildList;
     }
 
+    public String getWarehouseDept() {
+        return warehouseDept;
+    }
+
+    public void setWarehouseDept(String warehouseDept) {
+        this.warehouseDept = warehouseDept;
+    }
+
     public void setPurchaseOrderChildId(Long purchaseOrderChildId)
     {
         this.purchaseOrderChildId = purchaseOrderChildId;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchasePlanChild.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchasePlanChild.java
index 0050c4a5..b7b0fc45 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchasePlanChild.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchasePlanChild.java
@@ -60,6 +60,8 @@ public class PurchasePlanChild extends BaseEntity
     @Excel(name = "物料的描述")
     private String describe;
 
+    @Excel(name = "物料单位")
+    private String unit;
     @Excel(name = "物料入库部门")
     private String warehouseDept;
 
@@ -203,7 +205,16 @@ public class PurchasePlanChild extends BaseEntity
     {
         return describe;
     }
-    public void setMaterialNum(Long materialNum) 
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public void setMaterialNum(Long materialNum)
     {
         this.materialNum = materialNum;
     }
diff --git a/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseOrderChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseOrderChildMapper.xml
index ec24b568..0e2c0946 100644
--- a/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseOrderChildMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseOrderChildMapper.xml
@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialBrand"                column="material_brand"                 />
         <result property="materialDescribe"             column="material_describe"              />
         <result property="materialPhotourl"             column="material_photoUrl"              />
+        <result property="warehouseDept"                column="warehouseDept"                 />
         <result property="materialProcessMethod"        column="material_process_method"        />
         <result property="materialUnit"                 column="material_unit"                  />
         <result property="hasStorageNum"                column="has_storage_num"                />
@@ -50,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select purchase_order_child_id, purchase_order_code, purchase_plan_code,purchase_plan_correlation_code,
                supplier_code, supplier_name,
                material_code, material_name,material_type, material_describe,material_brand,
-               material_photoUrl, material_process_method,material_unit,
+               material_photoUrl, material_process_method,material_unit,warehouseDept,
                material_no_rmb, material_rmb, material_num,
                material_amount, material_sum, material_no_rmb_sum, material_rmb_sum,
                material_real_num, material_real_no_rmb, material_real_rmb, material_real_no_rmb_sum,
@@ -95,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialPhotourl != null">material_photo_url,</if>
             <if test="materialProcessMethod != null">material_process_method,</if>
             <if test="materialUnit != null">material_unit,</if>
+            <if test="warehouseDept != null">warehouseDept,</if>
             <if test="materialNoRmb != null">material_no_rmb,</if>
             <if test="materialRmb != null">material_rmb,</if>
             <if test="materialNum != null">material_num,</if>
@@ -131,6 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialPhotourl != null">#{materialPhotourl},</if>
             <if test="materialProcessMethod != null">#{materialProcessMethod},</if>
             <if test="materialUnit != null">#{materialUnit},</if>
+            <if test="warehouseDept != null">#{warehouseDept},</if>
             <if test="materialNoRmb != null">#{materialNoRmb},</if>
             <if test="materialRmb != null">#{materialRmb},</if>
             <if test="materialNum != null">#{materialNum},</if>
@@ -170,6 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialPhotourl != null">material_photo_url = #{materialPhotourl}</if>
             <if test="materialProcessMethod != null">material_process_method = #{materialProcessMethod},</if>
             <if test="materialUnit != null">material_unit = #{materialUnit},</if>
+            <if test="warehouseDept != null">warehouse_dept = #{warehouseDept},</if>
             <if test="materialNoRmb != null">material_no_rmb = #{materialNoRmb},</if>
             <if test="materialRmb != null">material_rmb = #{materialRmb},</if>
             <if test="materialNum != null">material_num = #{materialNum},</if>
@@ -237,12 +241,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectPurhcaseOrderStorageByPurchaseOrderCode"  parameterType="String" resultMap="PurchaseOrderChildResult">
         select p.purchase_order_child_id,p.purchase_order_code,p.purchase_plan_code,p.purchase_plan_correlation_code,
                    p.supplier_code,p.supplier_name,p.material_code,p.material_name,p.material_type,p.material_describe,
-                   p.material_brand,p.material_photo_url,p.material_process_method,p.material_unit,p.material_no_rmb,
+                   p.material_brand,p.material_photo_url,p.material_process_method,p.material_unit,p.warehouse_dept,p.material_no_rmb,
                    p.material_rmb,p.material_num,p.material_amount,p.material_sum,p.material_no_rmb_sum,p.material_rmb_sum,
                    p.material_real_num,p.material_real_no_rmb,p.material_real_rmb,p.material_real_no_rmb_sum,p.material_real_rmb_sum,
                    p.delivery_time,p.eceipt_status,p.payment_status,p.tax_rate,p.create_by,p.create_time,p.update_by,p.update_time,p.del_flag,
-               (select w.has_storage_num from warehouse_storage_order_detail as w where w.material_no = p.material_code and w.related_order_code = p.purchase_order_code and w.supplier_code = p.supplier_code) as has_storage_num,
-               (select w.notify_has_arrived_num from warehouse_storage_order_detail as w where w.material_no = p.material_code and w.related_order_code = p.purchase_order_code and w.supplier_code = p.supplier_code) as notify_has_arrived_num
+               (select sum(w.has_storage_num) from warehouse_storage_order_detail as w where w.material_no = p.material_code and w.related_order_code = p.purchase_order_code and w.supplier_code = p.supplier_code) as has_storage_num,
+               (select sum(w.notify_has_arrived_num) from warehouse_storage_order_detail as w where w.material_no = p.material_code and w.related_order_code = p.purchase_order_code and w.supplier_code = p.supplier_code) as notify_has_arrived_num
         from purchase_order_child as p  where p.purchase_order_code = #{purchaseOrderCode};
     </select>
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml
index 2f59dc3c..4a53433e 100644
--- a/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.purchase.mapper.PurchasePlanChildMapper">
-    <resultMap type="PurchasePlanChild" id="PurchasePlanChildResult">
+    <resultMap type="PurchasePlanChild"                     id="PurchasePlanChildResult">
         <result property="purchasePlanChildId"               column="purchase_plan_child_id"             />
         <result property="purchasePlanCode"                  column="purchase_plan_code"                 />
         <result property="materialId"                        column="material_id"                        />
@@ -11,9 +11,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialName"                      column="material_name"                      />
         <result property="materialType"                      column="material_type"                      />
         <result property="processMethod"                     column="process_method"                     />
+        <result property="unit"                              column="unit"                               />
         <result property="brand"                             column="brand"                              />
         <result property="photoUrl"                          column="photoUrl"                           />
         <result property="describe"                          column="describe"                           />
+        <result property="warehouseDept"                     column="warehouseDept"                     />
         <result property="materialNum"                       column="material_num"                       />
         <result property="materialSole"                      column="material_sole"                      />
         <result property="materialRmb"                       column="material_rmb"                       />
@@ -35,8 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectPurchasePlanChildVo">
         select purchase_plan_child_id, purchase_plan_code, material_id,
-               material_code, material_name, material_type, process_method, brand,
-               photoUrl, `describe`, material_num, material_sole, material_rmb,supplier_code,supplier_name,
+               material_code, material_name, material_type, process_method, brand,unit,
+               photoUrl, `describe`, warehouseDept,material_num, material_sole, material_rmb,supplier_code,supplier_name,
                material_noRmb, create_by, create_time, update_by, update_time, remark,
                use_status, audit_status, del_flag from purchase_plan_child
     </sql>
@@ -52,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialType != null  and materialType != ''"> and material_type = #{materialType}</if>
             <if test="processMethod != null  and processMethod != ''"> and process_method = #{processMethod}</if>
             <if test="brand != null  and brand != ''"> and brand = #{brand}</if>
+            <if test="warehouseDept != null and warehouseDept != ''">and warehouseDept = #{warehouseDept}</if>
             <if test="useStatus != null  and useStatus != ''"> and use_status = #{useStatus}</if>
             <if test="auditStatus != null  and auditStatus != ''"> and audit_status = #{auditStatus}</if>
         </where>
@@ -82,6 +85,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="brand != null">brand,</if>
             <if test="photoUrl != null">photoUrl,</if>
             <if test="describe != null">`describe`,</if>
+            <if test="unit != null">unit,</if>
+            <if test="warehouseDept != null">warehouse_dept,</if>
             <if test="materialNum != null">material_num,</if>
             <if test="materialSole != null">material_sole,</if>
             <if test="materialRmb != null">material_rmb,</if>
@@ -105,6 +110,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="brand != null">#{brand},</if>
             <if test="photoUrl != null">#{photoUrl},</if>
             <if test="describe != null">#{describe},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="warehouseDept != null">#{warehouseDept},</if>
             <if test="materialNum != null">#{materialNum},</if>
             <if test="materialSole != null">#{materialSole},</if>
             <if test="materialRmb != null">#{materialRmb},</if>
@@ -132,6 +139,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="brand != null">brand = #{brand},</if>
             <if test="photoUrl != null">photoUrl = #{photoUrl},</if>
             <if test="describe != null">`describe` = #{describe},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="warehouseDept != null">warehouse_dept = #{warehouseDept},</if>
             <if test="materialNum != null">material_num = #{materialNum},</if>
             <if test="materialSole != null">material_sole = #{materialSole},</if>
             <if test="materialRmb != null">material_rmb = #{materialRmb},</if>
@@ -212,6 +221,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         planChild.process_method,
         planChild.brand,
         planChild.photoUrl,
+        planChild.unit,
+        planChild.warehouseDept,
         sum(planChild.material_num) as material_num,
         GROUP_CONCAT(DISTINCT plan.correlation_code ORDER BY plan.correlation_code) AS correlation_codes,
         GROUP_CONCAT(DISTINCT plan.purchase_plan_code ORDER BY plan.purchase_plan_code) AS purchase_plan_codes
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/addPurchaseOrder.html b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/addPurchaseOrder.html
index dcdfd541..f010beaf 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/addPurchaseOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/addPurchaseOrder.html
@@ -85,6 +85,7 @@
   var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
   var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]];
   var processMethodDatas = [[${@dict.getType('processMethod')}]];
+  var warehouseDeptDatas = [[${@dict.getType('warehouseDept')}]];
   var loginName = [[${@permission.getPrincipalProperty('loginName')}]];
   $("#form-plan-purchaseOrder-add").validate({focusCleanup: true});
   var purchasePlanChildList = [[${purchasePlanChildList}]];
@@ -136,6 +137,7 @@
         brand: material.brand,
         processMethod: material.processMethod,
         unit: material.unit,
+        warehouseDept:material.warehouseDept,
         materialNum: material.materialNum,
       };
       var materialData = [materialObj]; // Bootstrap Table需要一个数组作为数据源
@@ -311,29 +313,28 @@
       columns: [
         {checkbox: false},
         {title: '料号', field: 'materialCode'},
-        {
-          title: '图片', field: 'photoUrl', formatter: function (value, row, index) {
+        {title: '图片', field: 'photoUrl', formatter: function (value, row, index) {
             return $.table.imageView(value);
           }
         },
         {title: '物料名称', field: 'materialName'},
-        {
-          title: '物料类型', field: 'materialType', align: 'center', formatter: function (value, row, index) {
+        {title: '物料类型', field: 'materialType', align: 'center', formatter: function (value, row, index) {
             return $.table.selectCategoryLabel(materialTypeDatas, value);
           }
         },
         {title: '物料描述', field: 'describe'},
         {title: '品牌', field: 'brand'},
-        {
-          title: '加工类型', field: 'processMethod', align: 'center', formatter: function (value, row, index) {
+        {title: '加工类型', field: 'processMethod', align: 'center', formatter: function (value, row, index) {
             return $.table.selectDictLabel(processMethodDatas, value);
           }
         },
-        {
-          title: '单位', field: 'unit', align: 'center', formatter: function (value, row, index) {
+        {title: '单位', field: 'unit', align: 'center', formatter: function (value, row, index) {
             return $.table.selectDictLabel(sysUnitClassDatas, value);
           }
         },
+        {title: '入库部门', field: 'warehouseDept', align: 'center', formatter: function (value, row, index) {
+          return $.table.selectDictLabel(warehouseDeptDatas, value);
+          }},
         {title: '计划采购数', field: 'materialNum'},
       ],
     });
@@ -372,6 +373,8 @@
               materialDescribe: materialObj.describe,
               materialProcessMethod:materialObj.processMethod,
               materialUnit:materialObj.unit,
+              materialPhotoUrl: materialObj.photoUrl,
+              warehouseDept: materialObj.warehouseDept,
               materialNum: materialObj.materialNum,
               supplierCode: supplierCode,
               supplierName: supplierName,
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html
index 192af288..33c03ab2 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html
@@ -131,9 +131,7 @@
                 method: 'post',
                 sidePagination: "server",
                 contentType: "application/x-www-form-urlencoded",
-                queryParams : {
-                    purchasePlanCode: row.purchasePlanCode
-                },
+                queryParams : {purchasePlanCode: row.purchasePlanCode},
                 columns: [
                     {field: 'purchasePlanId',title: '主键id',visible: false},
                     {field: 'materialCode',title: '料号',},
@@ -152,24 +150,23 @@
                     {field: 'unit',title: '单位',
                         formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}
                     },
-                    {field: 'planNum',title: '计划采购数',
-                        formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}
-                    },
+                    {field: 'warehouseDept',title: '入库部门',visible: false},
+                    {field: 'materialNum',title: '计划采购数',},
                 ]
             });
         };
         var purchasePlanCodes = "";
         function addPurchaseOrder(){
             var selections = $("#bootstrap-table").bootstrapTable("getSelections");
-            if(selections.length == 0){
+            if(selections.length === 0){
                 $.modal.alertWarning("请选择采购计划单");
                 return;
             }else{
                 if(selections.length > 1 ){
                     //·拼接采购计划单号
-                    for(var i=0;i<selections.length;i++){
+                    for(let i=0;i<selections.length;i++){
                         purchasePlanCodes += selections[i].purchasePlanCode + ",";
-                        if(i == selections.length - 1){
+                        if(i === selections.length - 1){
                             purchasePlanCodes += selections[i].purchasePlanCode ;
                         }
                     }