From 15edc521582e08e0e59ee5da9eaec2f2049bb462 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 24 十月 2026 21:57:46 +0800
Subject: [PATCH] fix(mes): 自动生成生产入库及倒冲领料单

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderBomService.java          |    9 ++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java |   16 +++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java           |   12 ++-
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderBomServiceImpl.java      |    5 +
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueService.java         |   13 +++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java |   77 +++++++++++++++++++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImpl.java       |    6 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptService.java     |   12 +++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java     |   80 ++++++++++++++++++++
 9 files changed, 222 insertions(+), 8 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
index e4752c9..468a8c2 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
@@ -1,7 +1,6 @@
 package cn.iocoder.yudao.module.mes.service.pro.feedback;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -33,6 +32,7 @@
 import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderProcessService;
 import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
 import cn.iocoder.yudao.module.mes.service.wm.itemconsume.MesWmItemConsumeService;
+import cn.iocoder.yudao.module.mes.service.wm.productissue.MesWmProductIssueService;
 import cn.iocoder.yudao.module.mes.service.wm.productproduce.MesWmProductProduceLineService;
 import cn.iocoder.yudao.module.mes.service.wm.productproduce.MesWmProductProduceService;
 import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
@@ -92,6 +92,8 @@
     private MesProTaskService taskService;
     @Resource
     private MesWmItemConsumeService itemConsumeService;
+    @Resource
+    private MesWmProductIssueService productIssueService;
     @Resource
     private MesWmProductProduceService productProduceService;
     @Resource
@@ -274,9 +276,9 @@
         // 3. 鐗╂枡娑堣�楋細鍊掑啿宸ュ簭鎸� BOM 鑷姩鎵f枡锛涢潪鍊掑啿宸ュ簭璺宠繃锛堢墿鏂欒蛋鎵嬪伐棰嗘枡/鎶曟枡锛�
         boolean backflushFlag = routeProcess != null && Boolean.TRUE.equals(routeProcess.getBackflushFlag());
         if (backflushFlag) {
-            // 3.1 鏍¢獙鍊掑啿宸ュ簭蹇呴』閰嶇疆 BOM 娑堣�楋紝閬垮厤闈欓粯涓嶆墸鏂�
-            List<MesProWorkOrderBomDO> boms = workOrderBomService.getWorkOrderBomListByWorkOrderId(
-                    feedback.getWorkOrderId());
+            // 3.1 鏍¢獙褰撳墠鍊掑啿宸ュ簭蹇呴』閰嶇疆鎶曟枡 BOM锛岄伩鍏嶉潤榛樹笉鎵f枡
+            List<MesProWorkOrderBomDO> boms = workOrderBomService.getWorkOrderBomListByWorkOrderIdAndProcessId(
+                    feedback.getWorkOrderId(), feedback.getProcessId());
             if (CollUtil.isEmpty(boms)) {
                 throw exception(PRO_FEEDBACK_BACKFLUSH_BOM_REQUIRED);
             }
@@ -284,6 +286,8 @@
             MesWmItemConsumeDO itemConsume = itemConsumeService.generateItemConsume(feedback);
             if (itemConsume != null) {
                 itemConsumeService.finishItemConsume(itemConsume.getId());
+                // 娑堣�楀崟璐熻矗瀹為檯鎵e簱锛涢鏂欏崟浠呬綔涓哄�掑啿涓氬姟鍑瘉锛岄伩鍏嶉噸澶嶆墸鍑忓簱瀛�
+                productIssueService.generateBackflushProductIssue(feedback, itemConsume);
             }
         }
 
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderBomService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderBomService.java
index d1e8201..de4cee2 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderBomService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderBomService.java
@@ -63,6 +63,15 @@
     List<MesProWorkOrderBomDO> getWorkOrderBomListByWorkOrderId(Long workOrderId);
 
     /**
+     * 鏍规嵁宸ュ崟缂栧彿涓庡伐搴忕紪鍙疯幏寰� BOM 鍒楄〃锛堝�掑啿浠呭鐞嗗綋鍓嶆姤宸ュ伐搴忕殑鎶曟枡锛�
+     *
+     * @param workOrderId 宸ュ崟缂栧彿
+     * @param processId 宸ュ簭缂栧彿
+     * @return BOM 鍒楄〃
+     */
+    List<MesProWorkOrderBomDO> getWorkOrderBomListByWorkOrderIdAndProcessId(Long workOrderId, Long processId);
+
+    /**
      * 鏍规嵁宸ュ崟缂栧彿鍒犻櫎 BOM
      *
      * @param workOrderId 宸ュ崟缂栧彿
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderBomServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderBomServiceImpl.java
index 464ee46..1dc45b3 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderBomServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderBomServiceImpl.java
@@ -116,6 +116,11 @@
     }
 
     @Override
+    public List<MesProWorkOrderBomDO> getWorkOrderBomListByWorkOrderIdAndProcessId(Long workOrderId, Long processId) {
+        return workOrderBomMapper.selectListByWorkOrderIdAndProcessId(workOrderId, processId);
+    }
+
+    @Override
     public void deleteWorkOrderBomByWorkOrderId(Long workOrderId) {
         workOrderBomMapper.deleteByWorkOrderId(workOrderId);
     }
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImpl.java
index 51bf769..c5e850f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImpl.java
@@ -78,9 +78,9 @@
         if (feedback.getWorkOrderId() == null) {
             throw exception(PRO_FEEDBACK_ROUTE_PROCESS_INVALID);
         }
-        // 1.2 鏌ヨ宸ュ崟 BOM 鐗╂枡鍒楄〃锛堝�掑啿鎸夊伐鍗曟姇鏂欙紝闈炲伐鑹鸿矾绾匡級
-        List<MesProWorkOrderBomDO> boms = workOrderBomService.getWorkOrderBomListByWorkOrderId(
-                feedback.getWorkOrderId());
+        // 1.2 鍙煡璇㈠綋鍓嶅�掑啿宸ュ簭鐨勬姇鏂� BOM锛岄伩鍏嶉噸澶嶆墸鍑忓叾浠栧伐搴忕殑鐗╂枡
+        List<MesProWorkOrderBomDO> boms = workOrderBomService.getWorkOrderBomListByWorkOrderIdAndProcessId(
+                feedback.getWorkOrderId(), feedback.getProcessId());
         if (CollUtil.isEmpty(boms)) {
             return null;
         }
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueService.java
index 5c977a2..bc691de 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueService.java
@@ -5,6 +5,8 @@
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssueImportRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssuePageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssueSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productissue.MesWmProductIssueDO;
 import jakarta.validation.Valid;
 
@@ -24,6 +26,17 @@
     Long createProductIssue(@Valid MesWmProductIssueSaveReqVO createReqVO);
 
     /**
+     * 鏍规嵁鍊掑啿娑堣�楄褰曠敓鎴愬凡瀹屾垚鐨勭敓浜ч鏂欏崟銆�
+     *
+     * <p>璇ユ柟娉曞彧鐢熸垚棰嗘枡涓氬姟鍑瘉锛屼笉鍐嶅垱寤哄簱瀛樹簨鍔★紱瀹為檯鎵e簱鐢辩墿鏂欐秷鑰楀崟瀹屾垚銆�</p>
+     *
+     * @param feedback 鎶ュ伐璁板綍
+     * @param consume 鐗╂枡娑堣�楄褰�
+     * @return 棰嗘枡鍗曠紪鍙�
+     */
+    Long generateBackflushProductIssue(MesProFeedbackDO feedback, MesWmItemConsumeDO consume);
+
+    /**
      * 淇敼棰嗘枡鍑哄簱鍗�
      *
      * @param updateReqVO 淇敼淇℃伅
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java
index 24053ea..3f13334 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java
@@ -12,12 +12,18 @@
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssuePageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssueSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskIssueDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeDetailDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeLineDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productissue.MesWmProductIssueDetailDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productissue.MesWmProductIssueDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productissue.MesWmProductIssueLineDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.pro.task.MesProTaskIssueMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productissue.MesWmProductIssueDetailMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productissue.MesWmProductIssueLineMapper;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.productissue.MesWmProductIssueMapper;
 import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductIssueStatusEnum;
@@ -29,6 +35,8 @@
 import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskIssueService;
 import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
 import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
+import cn.iocoder.yudao.module.mes.service.wm.itemconsume.MesWmItemConsumeDetailService;
+import cn.iocoder.yudao.module.mes.service.wm.itemconsume.MesWmItemConsumeLineService;
 import cn.iocoder.yudao.module.mes.service.wm.stockreserve.MesWmStockReserveService;
 import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
 import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
@@ -63,11 +71,19 @@
 
     @Resource
     private MesWmProductIssueMapper issueMapper;
+    @Resource
+    private MesWmProductIssueLineMapper issueLineMapper;
+    @Resource
+    private MesWmProductIssueDetailMapper issueDetailMapper;
 
     @Resource
     private MesWmProductIssueLineService issueLineService;
     @Resource
     private MesWmProductIssueDetailService issueDetailService;
+    @Resource
+    private MesWmItemConsumeLineService itemConsumeLineService;
+    @Resource
+    private MesWmItemConsumeDetailService itemConsumeDetailService;
     @Resource
     private MesMdWorkstationService workstationService;
     @Resource
@@ -118,6 +134,70 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    public Long generateBackflushProductIssue(MesProFeedbackDO feedback, MesWmItemConsumeDO consume) {
+        String code = "AUTO-BC-" + consume.getId();
+        MesWmProductIssueDO existing = issueMapper.selectByCode(code);
+        if (existing != null) {
+            return existing.getId();
+        }
+
+        LocalDateTime now = LocalDateTime.now();
+        MesWmProductIssueDO issue = MesWmProductIssueDO.builder()
+                .code(code)
+                .name("鍊掑啿鑷姩棰嗘枡-" + feedback.getCode())
+                .taskId(feedback.getTaskId())
+                .workOrderId(feedback.getWorkOrderId())
+                .workstationId(feedback.getWorkstationId())
+                .issueType(MesWmProductIssueTypeEnum.NORMAL.getType())
+                .issueDate(now)
+                .requiredTime(now)
+                .status(MesWmProductIssueStatusEnum.FINISHED.getStatus())
+                .remark("宸ュ簭鍊掑啿鑷姩鐢熸垚锛岀墿鏂欐秷鑰楀崟ID锛�" + consume.getId())
+                .build();
+        issueMapper.insert(issue);
+
+        List<MesWmItemConsumeLineDO> consumeLines = itemConsumeLineService
+                .getItemConsumeLineListByConsumeId(consume.getId());
+        List<MesWmItemConsumeDetailDO> consumeDetails = itemConsumeDetailService
+                .getItemConsumeDetailListByConsumeId(consume.getId());
+        Map<Long, List<MesWmItemConsumeDetailDO>> detailsByLineId = CollectionUtils.convertMultiMap(
+                consumeDetails, MesWmItemConsumeDetailDO::getLineId);
+
+        for (MesWmItemConsumeLineDO consumeLine : consumeLines) {
+            MesWmProductIssueLineDO issueLine = MesWmProductIssueLineDO.builder()
+                    .issueId(issue.getId())
+                    .taskId(feedback.getTaskId())
+                    .itemId(consumeLine.getItemId())
+                    .quantity(consumeLine.getQuantity())
+                    .remark("宸ュ簭鍊掑啿鑷姩鐢熸垚")
+                    .build();
+            issueLineMapper.insert(issueLine);
+
+            for (MesWmItemConsumeDetailDO consumeDetail : detailsByLineId
+                    .getOrDefault(consumeLine.getId(), List.of())) {
+                MesMdItemDO item = mdmItemService.getItem(consumeDetail.getItemId());
+                Long mdmItemId = item != null && item.getMdmItemId() != null
+                        ? item.getMdmItemId() : consumeDetail.getItemId();
+                issueDetailMapper.insert(MesWmProductIssueDetailDO.builder()
+                        .issueId(issue.getId())
+                        .lineId(issueLine.getId())
+                        .materialStockId(consumeDetail.getMaterialStockId())
+                        .itemId(mdmItemId)
+                        .quantity(consumeDetail.getQuantity())
+                        .batchId(consumeDetail.getBatchId())
+                        .batchCode(consumeDetail.getBatchCode())
+                        .warehouseId(consumeDetail.getWarehouseId())
+                        .locationId(consumeDetail.getLocationId())
+                        .areaId(consumeDetail.getAreaId())
+                        .remark("宸ュ簭鍊掑啿鑷姩鐢熸垚")
+                        .build());
+            }
+        }
+        return issue.getId();
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     public void updateProductIssue(MesWmProductIssueSaveReqVO updateReqVO) {
         // 1.1 鏍¢獙瀛樺湪 + 鍑嗗涓姸鎬�
         validateProductIssueExistsAndPrepare(updateReqVO.getId());
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java
index ef11a06..d70dea9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java
@@ -8,6 +8,7 @@
 import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchGenerateReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderProcessDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDetailDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDO;
@@ -21,7 +22,9 @@
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
 import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
+import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderProcessService;
 import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
+import cn.iocoder.yudao.module.mes.service.wm.productreceipt.MesWmProductReceiptService;
 import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
 import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
@@ -57,6 +60,10 @@
     @Resource
     private MesProWorkOrderService workOrderService;
     @Resource
+    private MesProWorkOrderProcessService workOrderProcessService;
+    @Resource
+    private MesWmProductReceiptService productReceiptService;
+    @Resource
     private MesWmBatchService batchService;
     @Resource
     private MesWmTransactionService wmTransactionService;
@@ -71,7 +78,7 @@
     @Transactional(rollbackFor = Exception.class)
     public void finishProductProduce(Long id) {
         // 1.1 鏍¢獙瀛樺湪 + 鑽夌鐘舵��
-        validateProductProduceExistsAndPrepare(id);
+        MesWmProductProduceDO produce = validateProductProduceExistsAndPrepare(id);
         // 1.2 鏍¢獙鑷冲皯鏈変竴鏉¤
         List<MesWmProductProduceLineDO> lines = productProduceLineService.getProductProduceLineListByProduceId(id);
         if (CollUtil.isEmpty(lines)) {
@@ -84,6 +91,13 @@
         // 3. 鏇存柊鍏ュ簱鍗曠姸鎬�
         productProduceMapper.updateById(new MesWmProductProduceDO()
                 .setId(id).setStatus(MesWmProductProduceStatusEnum.FINISHED.getStatus()));
+
+        // 4. 鍙湁鏈亾宸ュ簭鐨勫悎鏍间骇鍑烘墠鐢熸垚浜у搧鍏ュ簱鍗曪紝閬垮厤涓棿宸ュ簭閲嶅鐢熸垚鎴愬搧鍏ュ簱
+        MesProWorkOrderProcessDO lastProcess = workOrderProcessService
+                .getLastWorkOrderProcessByWorkOrderId(produce.getWorkOrderId());
+        if (lastProcess != null && ObjUtil.equal(lastProcess.getProcessId(), produce.getProcessId())) {
+            productReceiptService.generateProductReceipt(produce, lines);
+        }
     }
 
     private void createTransactionList(Long produceId, List<MesWmProductProduceLineDO> lines) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptService.java
index 327829b..95bce50 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptService.java
@@ -5,6 +5,8 @@
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptImportRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptPageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceLineDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDO;
 import jakarta.validation.Valid;
 
@@ -24,6 +26,16 @@
     Long createProductReceipt(@Valid MesWmProductReceiptSaveReqVO createReqVO);
 
     /**
+     * 鏍规嵁鏈亾宸ュ簭鐨勪骇鍝佷骇鍑虹敓鎴愪骇鍝佸叆搴撳崟鑽夌鍙婂悎鏍煎搧琛屻��
+     *
+     * @param produce 浜у搧浜у嚭鍗�
+     * @param produceLines 浜у搧浜у嚭琛�
+     * @return 浜у搧鍏ュ簱鍗曠紪鍙凤紱娌℃湁鍚堟牸鍝佹椂杩斿洖 {@code null}
+     */
+    Long generateProductReceipt(MesWmProductProduceDO produce,
+                                List<MesWmProductProduceLineDO> produceLines);
+
+    /**
      * 淇敼浜у搧鏀惰揣鍗�
      *
      * @param updateReqVO 淇敼淇℃伅
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java
index 6c39b88..dbdf2cc 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java
@@ -11,7 +11,11 @@
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptImportRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptPageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.productreceipt.vo.MesWmProductReceiptSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceLineDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDetailDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptLineDO;
@@ -19,10 +23,14 @@
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.productreceipt.MesWmProductReceiptMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productreceipt.MesWmProductReceiptLineMapper;
 import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductReceiptStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
 import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
 import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
+import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService;
 import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
 import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
 import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
@@ -34,6 +42,7 @@
 import org.springframework.validation.annotation.Validated;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -51,6 +60,8 @@
 
     @Resource
     private MesWmProductReceiptMapper productReceiptMapper;
+    @Resource
+    private MesWmProductReceiptLineMapper productReceiptLineMapper;
 
     @Resource
     private MesWmProductReceiptLineService productReceiptLineService;
@@ -60,6 +71,10 @@
     private MesWmTransactionService wmTransactionService;
     @Resource
     private MesProWorkOrderService workOrderService;
+    @Resource
+    private MesMdItemService mdItemService;
+    @Resource
+    private MesWmMaterialStockService materialStockService;
     @Resource
     private MesWmWarehouseService warehouseService;
     @Resource
@@ -83,6 +98,68 @@
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Long generateProductReceipt(MesWmProductProduceDO produce,
+                                       List<MesWmProductProduceLineDO> produceLines) {
+        List<MesWmProductProduceLineDO> qualifiedLines = produceLines.stream()
+                .filter(line -> ObjUtil.equal(line.getQualityStatus(), MesWmQualityStatusEnum.PASS.getStatus()))
+                .filter(line -> line.getQuantity() != null && line.getQuantity().compareTo(BigDecimal.ZERO) > 0)
+                .toList();
+        if (CollUtil.isEmpty(qualifiedLines)) {
+            return null;
+        }
+
+        String code = "AUTO-PR-" + produce.getId();
+        MesWmProductReceiptDO existing = productReceiptMapper.selectByCode(code);
+        if (existing != null) {
+            return existing.getId();
+        }
+
+        MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(produce.getWorkOrderId());
+        MesMdItemDO firstItem = mdItemService.getItem(qualifiedLines.get(0).getItemId());
+        Long firstMdmItemId = firstItem != null && firstItem.getMdmItemId() != null
+                ? firstItem.getMdmItemId() : qualifiedLines.get(0).getItemId();
+        String workOrderCode = workOrder != null ? workOrder.getCode() : String.valueOf(produce.getWorkOrderId());
+
+        MesWmProductReceiptDO receipt = MesWmProductReceiptDO.builder()
+                .code(code)
+                .name("鐢熶骇瀹屾垚鑷姩鍏ュ簱-" + workOrderCode)
+                .workOrderId(produce.getWorkOrderId())
+                .itemId(firstMdmItemId)
+                .receiptDate(LocalDateTime.now())
+                .status(MesWmProductReceiptStatusEnum.PREPARE.getStatus())
+                .remark("鏈亾宸ュ簭浜у嚭鑷姩鐢熸垚锛屼骇鍑哄崟ID锛�" + produce.getId())
+                .build();
+        productReceiptMapper.insert(receipt);
+
+        MesWmWarehouseDO virtualWarehouse = warehouseService.getWarehouseByCode(
+                MesWmWarehouseDO.WIP_VIRTUAL_WAREHOUSE);
+        MesWmWarehouseLocationDO virtualLocation = locationService.getWarehouseLocationByCode(
+                MesWmWarehouseLocationDO.WIP_VIRTUAL_LOCATION);
+        MesWmWarehouseAreaDO virtualArea = areaService.getWarehouseAreaByCode(
+                MesWmWarehouseAreaDO.WIP_VIRTUAL_AREA);
+
+        for (MesWmProductProduceLineDO produceLine : qualifiedLines) {
+            MesMdItemDO item = mdItemService.getItem(produceLine.getItemId());
+            Long mdmItemId = item != null && item.getMdmItemId() != null
+                    ? item.getMdmItemId() : produceLine.getItemId();
+            MesWmMaterialStockDO stock = materialStockService.getMaterialStockByCompositeKey(
+                    mdmItemId, virtualWarehouse.getId(), virtualLocation.getId(), virtualArea.getId(),
+                    produceLine.getBatchId(), null);
+            productReceiptLineMapper.insert(MesWmProductReceiptLineDO.builder()
+                    .receiptId(receipt.getId())
+                    .itemId(mdmItemId)
+                    .materialStockId(stock != null ? stock.getId() : null)
+                    .quantity(produceLine.getQuantity())
+                    .batchId(produceLine.getBatchId())
+                    .batchCode(produceLine.getBatchCode())
+                    .remark("鏈亾宸ュ簭鍚堟牸鍝佽嚜鍔ㄧ敓鎴�")
+                    .build());
+        }
+        return receipt.getId();
+    }
+
+    @Override
     public void updateProductReceipt(MesWmProductReceiptSaveReqVO updateReqVO) {
         // 1.1 鏍¢獙瀛樺湪 + 鑽夌鐘舵��
         validateProductReceiptExistsAndDraft(updateReqVO.getId());

--
Gitblit v1.9.3