fix

easydo-mes/src/main/java/easydo/technology/model/MaterialRequisition.java

@@ -7,6 +7,7 @@ public class MaterialRequisition {
     
     private String id;
     private String code;
+    private String name;
     private String dispatchId;
     private String orderId;
     private String bomId;
@@ -14,6 +15,7 @@ public class MaterialRequisition {
     private String outboundStatus;
     private String status;
     private String requisitionDate;
+    private Long receiverId;
     private String remark;
     private String tenantId;
     private Long createId;
@@ -37,6 +39,14 @@ public class MaterialRequisition {
         this.code = code;
     }
 
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public String getDispatchId() {
         return dispatchId;
     }
@@ -93,6 +103,14 @@ public class MaterialRequisition {
         this.requisitionDate = requisitionDate;
     }
 
+    public Long getReceiverId() {
+        return receiverId;
+    }
+
+    public void setReceiverId(Long receiverId) {
+        this.receiverId = receiverId;
+    }
+
     public String getRemark() {
         return remark;
     }

easydo-mes/src/main/java/easydo/technology/model/vo/MaterialRequisitionVO.java

@@ -13,6 +13,7 @@ public class MaterialRequisitionVO {
     
     private String id;
     private String code;
+    private String name;
     private String dispatchId;
     private String orderId;
     private String bomId;
@@ -20,6 +21,7 @@ public class MaterialRequisitionVO {
     private String outboundStatus;
     private String status;
     private String requisitionDate;
+    private Long receiverId;
     private String remark;
     private String tenantId;
     private Long createId;

easydo-mes/src/main/java/easydo/technology/model/vo/ProductOrderDispatchVO.java

@@ -70,6 +70,7 @@ public class ProductOrderDispatchVO {
     public static class SimpleMaterialRequisition {
         private String id;
         private String code;
+        private String name;
         private String dispatchId;
         private String orderId;
         private String bomId;
@@ -77,6 +78,7 @@ public class ProductOrderDispatchVO {
         private String outboundStatus;   // applied-申请完毕, pending-未出库, partial-部分出库, completed-出库完毕
         private String status;           // pending-未领料, complete-已领料
         private String requisitionDate;
+        private Long receiverId;
         private String remark;
         private String tenantId;
         private Long createId;

easydo-mes/src/main/java/easydo/technology/service/impl/MaterialRequisitionServiceImpl.java

@@ -54,6 +54,7 @@ public class MaterialRequisitionServiceImpl implements MaterialRequisitionServic
                 // 复制主要字段
                 vo.setId(model.getId());
                 vo.setCode(model.getCode());
+                vo.setName(model.getName());
                 vo.setDispatchId(model.getDispatchId());
                 vo.setOrderId(model.getOrderId());
                 vo.setBomId(model.getBomId());
@@ -61,6 +62,7 @@ public class MaterialRequisitionServiceImpl implements MaterialRequisitionServic
                 vo.setOutboundStatus(model.getOutboundStatus());
                 vo.setStatus(model.getStatus());
                 vo.setRequisitionDate(model.getRequisitionDate());
+                vo.setReceiverId(model.getReceiverId());
                 vo.setRemark(model.getRemark());
                 vo.setTenantId(model.getTenantId());
                 vo.setCreateId(model.getCreateId());

easydo-mes/src/main/java/easydo/technology/service/impl/ProductOrderDispatchServiceImpl.java

@@ -280,12 +280,32 @@ public class ProductOrderDispatchServiceImpl implements ProductOrderDispatchServ
                             throw new BizException("派工记录与工单不匹配: " + item.getId());
                         }
 
-                        // 先删子表
+                        // 先删派工人员子表
                         DispatchUserItem removeUserItemParam = new DispatchUserItem();
                         removeUserItemParam.setDispatchId(item.getId());
                         jdbcClient.jdbcRemove(removeUserItemParam, connection);
 
-                        // 再删主表
+                        // 删除关联领料单明细与主单（按 dispatch_id 关联）
+                        MaterialRequisition requisitionQuery = new MaterialRequisition();
+                        requisitionQuery.setDispatchId(item.getId());
+                        List<MaterialRequisition> requisitionList = jdbcClient.getJdbcList(requisitionQuery, connection);
+                        if (requisitionList != null && !requisitionList.isEmpty()) {
+                            for (MaterialRequisition requisition : requisitionList) {
+                                if (requisition.getId() == null || requisition.getId().trim().isEmpty()) {
+                                    continue;
+                                }
+
+                                MaterialRequisitionItem requisitionItemParam = new MaterialRequisitionItem();
+                                requisitionItemParam.setRequisitionId(requisition.getId());
+                                jdbcClient.jdbcRemove(requisitionItemParam, connection);
+
+                                MaterialRequisition removeRequisitionParam = new MaterialRequisition();
+                                removeRequisitionParam.setId(requisition.getId());
+                                jdbcClient.jdbcRemoveById(removeRequisitionParam, connection);
+                            }
+                        }
+
+                        // 再删派工主表
                         ProductOrderDispatch removeDispatchParam = new ProductOrderDispatch();
                         removeDispatchParam.setId(item.getId());
                         jdbcClient.jdbcRemoveById(removeDispatchParam, connection);
@@ -599,6 +619,7 @@ public class ProductOrderDispatchServiceImpl implements ProductOrderDispatchServ
                             new ProductOrderDispatchVO.SimpleMaterialRequisition();
                         simpleReq.setId(req.getId());
                         simpleReq.setCode(req.getCode());
+                        simpleReq.setName(req.getName());
                         simpleReq.setDispatchId(req.getDispatchId());
                         simpleReq.setOrderId(req.getOrderId());
                         simpleReq.setBomId(req.getBomId());
@@ -606,6 +627,7 @@ public class ProductOrderDispatchServiceImpl implements ProductOrderDispatchServ
                         simpleReq.setOutboundStatus(req.getOutboundStatus());
                         simpleReq.setStatus(req.getStatus());
                         simpleReq.setRequisitionDate(req.getRequisitionDate());
+                        simpleReq.setReceiverId(req.getReceiverId());
                         simpleReq.setRemark(req.getRemark());
                         simpleReq.setTenantId(req.getTenantId());
                         simpleReq.setCreateId(req.getCreateId());