From 882045fad703a40e5f5aa7659d0b86fc5a145837 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 21 九月 2026 16:23:52 +0800
Subject: [PATCH] fix: 销售台账编辑限制标记实体类

---
 src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java b/src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java
index 8894288..6ae32e0 100644
--- a/src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java
+++ b/src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java
@@ -25,9 +25,11 @@
 import com.ruoyi.technology.mapper.TechnologyRoutingMapper;
 import com.ruoyi.technology.pojo.TechnologyBom;
 import com.ruoyi.technology.pojo.TechnologyBomStructure;
+import com.ruoyi.technology.pojo.TechnologyOperation;
 import com.ruoyi.technology.pojo.TechnologyRouting;
 import com.ruoyi.technology.service.TechnologyBomService;
 import com.ruoyi.technology.service.TechnologyBomStructureService;
+import com.ruoyi.technology.service.TechnologyOperationService;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -45,6 +47,7 @@
 
     private final TechnologyBomMapper technologyBomMapper;
     private final IProductModelService productModelService;
+    private final TechnologyOperationService technologyOperationService;
     private final TechnologyBomStructureService technologyBomStructureService;
     private final TechnologyRoutingMapper technologyRoutingMapper;
     private final IProductService productService;
@@ -194,8 +197,8 @@
             dto.setChildSpec(clean(dto.getChildSpec()));
         });
         handleProcess(list);
-//        Map<String, Long> processMap = productProcessService.list().stream()
-//                .collect(Collectors.toMap(ProductProcess::getName, ProductProcess::getId, (k1, k2) -> k1));
+        Map<String, Long> processMap = technologyOperationService.list().stream()
+                .collect(Collectors.toMap(TechnologyOperation::getName, TechnologyOperation::getId, (k1, k2) -> k1));
 
         //  鍒涘缓 BOM 鏁版嵁
         BomImportDto first = list.get(0);
@@ -247,9 +250,9 @@
             node.setProductModelId(childModel.getId());
             node.setUnitQuantity(dto.getUnitQty());
             node.setUnit(childModel.getUnit());
-//            if (processMap.containsKey(dto.getProcess())) {
-//                node.setProcessId(processMap.get(dto.getProcess()));
-//            }
+            if (processMap.containsKey(dto.getProcess())) {
+                node.setOperationId(processMap.get(dto.getProcess()));
+            }
             technologyBomStructureService.save(node);
 
             //  鎶婂綋鍓嶅瓙椤硅褰曞埌 Map,浣滀负浠ュ悗鏇存繁灞傜骇鐨勭埗椤规煡鎵句緷鎹�

--
Gitblit v1.9.3