[fix] 工程管理

开发修改单详情新增仓库入库部门字段
修改开发修改单详情查询方法新增：仓库入库部门字段
修改开发修改单详情新增方法新增：仓库入库部门字段
修改开发修改单详情修改方法新增：仓库入库部门字段
修改开发修改单审核通过后生成采购计划方法：生成采购计划子表新增仓库入库部门字段
修改开发修改单新增页面：列表加上仓库入库部门字段，并隐藏
修改采购物料选择物料页面：表加上仓库入库部门字段，并隐藏

ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpDevelopModifyorderDetail.java

@@ -60,6 +60,11 @@ public class ErpDevelopModifyorderDetail extends BaseEntity
     @Excel(name = "加工方式")
     private String materialProcessMethod;
 
+
+    /** 入库部门 (0仓库 1采购) */
+    private String warehouseDept;
+
+
     /** BOM的id */
     @Excel(name = "BOM的id")
     private Integer bomId;
@@ -200,6 +205,14 @@ public class ErpDevelopModifyorderDetail extends BaseEntity
         return updateFinishTime;
     }
 
+    public String getWarehouseDept() {
+        return warehouseDept;
+    }
+
+    public void setWarehouseDept(String warehouseDept) {
+        this.warehouseDept = warehouseDept;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -214,6 +227,7 @@ public class ErpDevelopModifyorderDetail extends BaseEntity
             .append("materialBrand", getMaterialBrand())
             .append("materialDescribe", getMaterialDescribe())
             .append("materialProcessMethod", getMaterialProcessMethod())
+            .append("warehouseDept", getWarehouseDept())
             .append("bomId", getBomId())
             .append("materialNum", getMaterialNum())
             .append("updateFinishTime", getUpdateFinishTime())

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

@@ -196,6 +196,10 @@ public class PurchaseOrderController extends BaseController
         mmap.put("purchaseOrderChild", purchaseOrderChild);
         return prefix + "/detail";
     }
+
+    /**
+     * 加载采购入库通知单弹窗
+     */
     @GetMapping("/addPurchaseOrderStorage/{purchaseOrderCode}")
     public String addPurchaseOrderStorage(@PathVariable("purchaseOrderCode") String purchaseOrderCode,ModelMap mmap){
         //purchasePlanCodes去除重复数据,purchasePlanCodeArray作为数组类型去除
@@ -207,6 +211,9 @@ public class PurchaseOrderController extends BaseController
         return prefix + "/addPurchaseStorage";
     }
 
+    /**
+     * 新增采购入库通知单
+     */
     @RequiresPermissions("purchase:purchaseOrder:addPurchaseOrderStorage")
     @Log(title = "采购订单", businessType = BusinessType.INSERT)
     @PostMapping("/addPurchaseOrderStorageSave")

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

@@ -366,6 +366,7 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService
         purchasePlanChild.setUnit(detail.getMaterialUnit());
         purchasePlanChild.setDescribe(detail.getMaterialDescribe());
         purchasePlanChild.setMaterialNum(Long.valueOf(detail.getMaterialNum()));
+        purchasePlanChild.setWarehouseDept(detail.getWarehouseDept());
         return purchasePlanChild;
     }
 
@@ -381,7 +382,7 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService
         purchasePlanChild.setBrand(bom.getBrand());
         purchasePlanChild.setUnit(bom.getUnit());
         purchasePlanChild.setDescribe(bom.getDescribe());
-        // MaterialNum will be set later based on the parent's quantity and useNum
+        purchasePlanChild.setWarehouseDept(bom.getWarehouseDept());
         return purchasePlanChild;
     }
 

ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderDetailMapper.xml

@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialBrand"    column="material_brand"    />
         <result property="materialDescribe"    column="material_describe"    />
         <result property="materialProcessMethod"    column="material_process_method"    />
+        <result property="warehouseDept"    column="warehouse_dept"    />
         <result property="bomId"    column="bom_id"    />
         <result property="materialNum"    column="material_num"    />
         <result property="updateFinishTime"    column="update_finish_time"    />
@@ -27,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectErpDevelopModifyorderDetailVo">
-        select develop_order_detail_id, develop_order_code, make_no, material_no, material_name, material_type, material_photo_url, material_unit, material_brand, material_describe, material_process_method, bom_id, material_num, update_finish_time, create_by, create_time, update_by, update_time, remark from erp_develop_modifyorder_detail
+        select develop_order_detail_id, develop_order_code, make_no, material_no, material_name, material_type, material_photo_url, material_unit, material_brand, material_describe, material_process_method, warehouse_dept, bom_id, material_num, update_finish_time, create_by, create_time, update_by, update_time, remark from erp_develop_modifyorder_detail
     </sql>
 
     <select id="selectErpDevelopModifyorderDetailList" parameterType="ErpDevelopModifyorderDetail" resultMap="ErpDevelopModifyorderDetailResult">
@@ -59,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialBrand != null">material_brand,</if>
             <if test="materialDescribe != null">material_describe,</if>
             <if test="materialProcessMethod != null">material_process_method,</if>
+            <if test="warehouseDept != null">warehouse_dept,</if>
             <if test="bomId != null">bom_id,</if>
             <if test="materialNum != null">material_num,</if>
             <if test="updateFinishTime != null">update_finish_time,</if>
@@ -79,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialBrand != null">#{materialBrand},</if>
             <if test="materialDescribe != null">#{materialDescribe},</if>
             <if test="materialProcessMethod != null">#{materialProcessMethod},</if>
+            <if test="warehouseDept != null">#{warehouseDept},</if>
             <if test="bomId != null">#{bomId},</if>
             <if test="materialNum != null">#{materialNum},</if>
             <if test="updateFinishTime != null">#{updateFinishTime},</if>
@@ -103,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialBrand != null">material_brand = #{materialBrand},</if>
             <if test="materialDescribe != null">material_describe = #{materialDescribe},</if>
             <if test="materialProcessMethod != null">material_process_method = #{materialProcessMethod},</if>
+            <if test="warehouseDept != null">warehouse_dept = #{warehouseDept},</if>
             <if test="bomId != null">bom_id = #{bomId},</if>
             <if test="materialNum != null">material_num = #{materialNum},</if>
             <if test="updateFinishTime != null">update_finish_time = #{updateFinishTime},</if>

ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html

@@ -156,7 +156,8 @@
                     "materialUnit": item.materialUnit,
                     "materialProcessMethod": item.materialProcessMethod,
                     "bomId":item.bomId,
-                    "materialNum":item.materialNum
+                    "materialNum":item.materialNum,
+                    "warehouseDept":item.warehouseDept
                     // ...其他字段
                 };
             });
@@ -425,6 +426,12 @@
                         title: '订单数量',
                         editable:true
                     },
+                    {
+                        field: 'warehouseDept',
+                        align: 'center',
+                        title: '入库部门',
+                        visible: false
+                    },
                     {
                         title: '操作',
                         align: 'center',
@@ -646,7 +653,8 @@
                     materialBrand: rowData.brand,
                     materialUnit: rowData.unit,
                     materialProcessMethod:rowData.processMethod,
-                    materialNum:'0'
+                    materialNum:'0',
+                    warehouseDept:rowData.warehouseDept
                 }
             })
             layer.close(index);

ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html

@@ -270,6 +270,8 @@
             $.modal.open("详情",url);
         }
 
+
+
         function readConfirm(developOrderId){
                 var options = {
                     title: '相关人员确认',
@@ -277,13 +279,18 @@
                 };
             $.modal.openOptions(options);
         }
-        function pickingOrder(developOrderId){
+
+
+        function pickAdd(developOrderId){
             var options = {
                 title: '开发修改单领料',
-                url: prefix + '/pickingOrder/' + developOrderId,
+                url: prefix + '/pickAdd/' + developOrderId,
             };
             $.modal.openOptions(options);
         }
+
+
+
     </script>
 </body>
 </html>

ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/purchaseOrderMaterialSelect.html

@@ -91,6 +91,11 @@
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
+                },
+                {
+                    title: '入库部门',
+                    field: 'warehouseDept',
+                    visible:false
                 }
             ]
         };