From 84e106b4438fbf3a0f514b9a0cf7e0a73a77584c Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 22 Oct 2025 15:22:16 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-22=20copyPart=20Routing=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=20routing=E7=89=88=E6=9C=AC=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=BB=8E1=E5=BC=80=E5=A7=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PartInformationServiceImpl.java      | 81 ++++++++-----------
 1 file changed, 32 insertions(+), 49 deletions(-)

diff --git a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
index c9fcd146..99d42a4c 100644
--- a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
@@ -2263,13 +2263,20 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         HashMap<Integer, Integer> operationMap = new HashMap<Integer, Integer>(); // 存放新的operationId
         // 存放新的routingRevision，key为"site_partNo_routingType"，value为当前的routingRevision值
         HashMap<String, Integer> routingRevisionMap = new HashMap<String, Integer>();
+        // 存放老routing_revision到新routing_revision的映射，key为"routingType_oldRoutingRevision"，value为新的routingRevision
+        HashMap<String, Integer> oldToNewRevisionMap = new HashMap<String, Integer>();
+        
         if (!routingHeaderList.isEmpty()) {
             for (RoutingHeaderVo routingHeader : routingHeaderList) {
+                // 记录原来的routingRevision
+                Integer oldRoutingRevision = routingHeader.getRoutingRevision();
+                String oldRoutingType = routingHeader.getRoutingType();
+                
                 routingHeader.setSite(toPart.getSite());
                 routingHeader.setPartNo(toPart.getPartNo());
                 routingHeader.setCreateBy(inData.getCreateBy());
                 
-                // 根据site、partNo、routingType生成key
+                // 根据site、partNo、routingType生成key，为新物料分配新的routingRevision
                 String revisionKey = toPart.getSite() + "_" + toPart.getPartNo() + "_" + routingHeader.getRoutingType();
                 Integer currentRevision = routingRevisionMap.get(revisionKey);
                 if (currentRevision == null) {
@@ -2280,6 +2287,10 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
                 routingRevisionMap.put(revisionKey, currentRevision);
                 routingHeader.setRoutingRevision(currentRevision);
                 
+                // 记录老版本到新版本的映射关系
+                String oldRevisionKey = oldRoutingType + "_" + oldRoutingRevision;
+                oldToNewRevisionMap.put(oldRevisionKey, currentRevision);
+                
                 routingManagementMapper.saveRoutingHeader(routingHeader);
             }
             // routingManagementMapper.saveRoutingHeaderList(routingHeaderList);
@@ -2288,32 +2299,22 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
             List<RoutingToolEntity> routingToolList = routingManagementMapper.selectRoutingToolByPartNo(fromPart.getSite(), fromPart.getPartNo());
             List<WorkGuidelineEntity> routingGuidelineList = routingManagementMapper.selectRoutingGuidelineByPartNo(fromPart.getSite(), fromPart.getPartNo());
             
-            // 清空routingRevisionMap，为detail等表重新计数
-            routingRevisionMap.clear();
-            
             if (!routingDetailList.isEmpty()) {
                 for (RoutingDetailVo routingDetail : routingDetailList) {
                     routingDetail.setSite(toPart.getSite());
                     routingDetail.setPartNo(toPart.getPartNo());
                     routingDetail.setCreateBy(inData.getCreateBy());
                     
-                    // 根据site、partNo、routingType生成key
-                    String revisionKey = toPart.getSite() + "_" + toPart.getPartNo() + "_" + routingDetail.getRoutingType();
-                    Integer currentRevision = routingRevisionMap.get(revisionKey);
-                    if (currentRevision == null) {
-                        currentRevision = 1;
-                    } else {
-                        currentRevision = currentRevision + 1;
+                    // 根据routingType和老的routingRevision查找新的routingRevision
+                    String oldRevisionKey = routingDetail.getRoutingType() + "_" + routingDetail.getRoutingRevision();
+                    Integer newRevision = oldToNewRevisionMap.get(oldRevisionKey);
+                    if (newRevision != null) {
+                        routingDetail.setRoutingRevision(newRevision);
                     }
-                    routingRevisionMap.put(revisionKey, currentRevision);
-                    routingDetail.setRoutingRevision(currentRevision);
                 }
                 routingManagementMapper.saveRoutingDetailList(routingDetailList);
             }
             
-            // 清空routingRevisionMap，为component表重新计数
-            routingRevisionMap.clear();
-            
             if (!routingComponentList.isEmpty()) {
                 Integer oldOperationId;
                 for (RoutingComponentVo routingComponent : routingComponentList) {
@@ -2322,25 +2323,18 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
                     routingComponent.setPartNo(toPart.getPartNo());
                     routingComponent.setCreateBy(inData.getCreateBy());
                     
-                    // 根据site、partNo、routingType生成key
-                    String revisionKey = toPart.getSite() + "_" + toPart.getPartNo() + "_" + routingComponent.getRoutingType();
-                    Integer currentRevision = routingRevisionMap.get(revisionKey);
-                    if (currentRevision == null) {
-                        currentRevision = 1;
-                    } else {
-                        currentRevision = currentRevision + 1;
+                    // 根据routingType和老的routingRevision查找新的routingRevision
+                    String oldRevisionKey = routingComponent.getRoutingType() + "_" + routingComponent.getRoutingRevision();
+                    Integer newRevision = oldToNewRevisionMap.get(oldRevisionKey);
+                    if (newRevision != null) {
+                        routingComponent.setRoutingRevision(newRevision);
                     }
-                    routingRevisionMap.put(revisionKey, currentRevision);
-                    routingComponent.setRoutingRevision(currentRevision);
                     
                     routingManagementMapper.saveRoutingComponent(routingComponent);
                     operationMap.put(oldOperationId, routingComponent.getOperationId());
                 }
             }
             
-            // 清空routingRevisionMap，为tool表重新计数
-            routingRevisionMap.clear();
-            
             if (!routingToolList.isEmpty()) {
                 for (RoutingToolEntity routingTool : routingToolList) {
                     routingTool.setSite(toPart.getSite());
@@ -2348,23 +2342,16 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
                     routingTool.setOperationId(operationMap.get(routingTool.getOperationId()));
                     routingTool.setCreateBy(inData.getCreateBy());
                     
-                    // 根据site、partNo、routingType生成key
-                    String revisionKey = toPart.getSite() + "_" + toPart.getPartNo() + "_" + routingTool.getRoutingType();
-                    Integer currentRevision = routingRevisionMap.get(revisionKey);
-                    if (currentRevision == null) {
-                        currentRevision = 1;
-                    } else {
-                        currentRevision = currentRevision + 1;
+                    // 根据routingType和老的routingRevision查找新的routingRevision
+                    String oldRevisionKey = routingTool.getRoutingType() + "_" + routingTool.getRoutingRevision();
+                    Integer newRevision = oldToNewRevisionMap.get(oldRevisionKey);
+                    if (newRevision != null) {
+                        routingTool.setRoutingRevision(newRevision);
                     }
-                    routingRevisionMap.put(revisionKey, currentRevision);
-                    routingTool.setRoutingRevision(currentRevision);
                 }
                 routingManagementMapper.saveRoutingTool(routingToolList);
             }
             
-            // 清空routingRevisionMap，为guideline表重新计数
-            routingRevisionMap.clear();
-            
             if (!routingGuidelineList.isEmpty()) {
                 for (WorkGuidelineEntity workGuideline : routingGuidelineList) {
                     workGuideline.setSite(toPart.getSite());
@@ -2372,16 +2359,12 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
                     workGuideline.setOperationId(operationMap.get(workGuideline.getOperationId()));
                     workGuideline.setCreateBy(inData.getCreateBy());
                     
-                    // 根据site、partNo、routingType生成key
-                    String revisionKey = toPart.getSite() + "_" + toPart.getPartNo() + "_" + workGuideline.getRoutingType();
-                    Integer currentRevision = routingRevisionMap.get(revisionKey);
-                    if (currentRevision == null) {
-                        currentRevision = 1;
-                    } else {
-                        currentRevision = currentRevision + 1;
+                    // 根据routingType和老的routingRevision查找新的routingRevision
+                    String oldRevisionKey = workGuideline.getRoutingType() + "_" + workGuideline.getRoutingRevision();
+                    Integer newRevision = oldToNewRevisionMap.get(oldRevisionKey);
+                    if (newRevision != null) {
+                        workGuideline.setRoutingRevision(newRevision);
                     }
-                    routingRevisionMap.put(revisionKey, currentRevision);
-                    workGuideline.setRoutingRevision(currentRevision);
                 }
                 routingManagementMapper.saveGuideLine(routingGuidelineList);
             }