From 3fd8d1f2e73a843acd330e8e8b84f5800f858407 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 10 十一月 2026 11:42:21 +0800
Subject: [PATCH] feat(seal): 印章详情视图与编辑删除接口

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImpl.java |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

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 413d6eb..9d43702 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
@@ -5,7 +5,7 @@
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductBomDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderBomDO;
 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;
@@ -19,8 +19,7 @@
 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.mdm.MesMdmItemService;
-import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProductBomService;
-import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteService;
+import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderBomService;
 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;
@@ -45,7 +44,7 @@
 /**
  * MES 鐗╂枡娑堣�楄褰� Service 瀹炵幇绫�
  *
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠$悊鍛�
  */
 @Service
 @Validated
@@ -59,9 +58,7 @@
     @Resource
     private MesWmItemConsumeDetailService itemConsumeDetailService;
     @Resource
-    private MesProRouteProductBomService routeProductBomService;
-    @Resource
-    private MesProRouteService routeService;
+    private MesProWorkOrderBomService workOrderBomService;
     @Resource
     private MesWmTransactionService wmTransactionService;
     @Resource
@@ -77,14 +74,14 @@
 
     @Override
     public MesWmItemConsumeDO generateItemConsume(MesProFeedbackDO feedback) {
-        // 1.1 閬垮厤 routeId 绛変负 null 鏃� getRouteProductBomList 鍥� eqIfPresent 鏀惧鏉′欢瀵艰嚧璇煡
-        if (feedback.getRouteId() == null || feedback.getProcessId() == null || feedback.getItemId() == null) {
+        // 1.1 鏍¢獙宸ュ崟缂栧彿鏈夋晥
+        if (feedback.getWorkOrderId() == null) {
             throw exception(PRO_FEEDBACK_ROUTE_PROCESS_INVALID);
         }
-        routeService.validateRouteExists(feedback.getRouteId());
-        // 1.2 鏌ヨ褰撳墠宸ュ簭鐨� BOM 鐗╂枡閰嶇疆
-        List<MesProRouteProductBomDO> boms = routeProductBomService.getRouteProductBomList(
-                feedback.getRouteId(), feedback.getProcessId(), feedback.getItemId());
+        // 1.2 鏌ヨ璇ュ�掑啿宸ュ簭鐨勬姇鏂� BOM 鍒楄〃锛堟寜鎶ュ伐宸ュ簭杩囨护锛屽彧鎵e綋鍓嶅伐搴忕殑鎶曟枡鏄庣粏锛�
+        //     閬垮厤鎶婂叾浠栧伐搴忕殑鎶曟枡涓�骞舵墸闄ゅ鑷村鎵g墿鏂欙級
+        List<MesProWorkOrderBomDO> boms = workOrderBomService.getWorkOrderBomListByWorkOrderIdAndProcessId(
+                feedback.getWorkOrderId(), feedback.getProcessId());
         if (CollUtil.isEmpty(boms)) {
             return null;
         }
@@ -181,6 +178,9 @@
         // 1. 鏌ヨ娑堣�楁槑缁嗭紙detail 绾у埆锛屽寘鍚簿纭殑鎵规/浠撳簱淇℃伅锛�
         List<MesWmItemConsumeDetailDO> details = itemConsumeDetailService
                 .getItemConsumeDetailListByConsumeId(consumeId);
+        // 鐢熶骇璁㈠崟 ID 鍐椾綑鍒版祦姘达紝渚夸簬鍑哄簱鍙拌处鎸夌敓浜ц鍗曡拷婧�
+        MesWmItemConsumeDO consume = itemConsumeMapper.selectById(consumeId);
+        Long workOrderId = consume != null ? consume.getWorkOrderId() : null;
 
         // 2. 閬嶅巻鏄庣粏锛屽垱寤哄簱瀛樹簨鍔★紙鎸夋壒娆$簿纭墸鍑忕嚎杈瑰簱锛�
         for (MesWmItemConsumeDetailDO detail : details) {
@@ -195,7 +195,7 @@
                     .setAreaId(detail.getAreaId())
                     .setCheckFlag(false) // 绾胯竟搴撳厑璁歌礋搴撳瓨
                     .setBizType(MesBizTypeConstants.WM_ITEM_CONSUME)
-                    .setBizId(consumeId)
+                    .setBizId(consumeId).setWorkOrderId(workOrderId)
                     .setBizCode("")
                     .setBizLineId(detail.getLineId()));
         }

--
Gitblit v1.9.3