aps-拆分

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/ApsProcessOperationProcessEquService.java

@@ -43,6 +43,7 @@ public interface ApsProcessOperationProcessEquService extends IService<ApsProces
     void splitProcessEqu(ApsProcessOperationProcessEquDo processEqus,
                          int waitSplitRoll,
                          ApsProcessOperationDo apsProcessOperationDo,
+                         String previousEquId,
                          List<ApsProcessOperationProcessEquDo> needUpdateOldList,
                          List<ApsProcessOperationProcessEquDo> needInsertNewList,
                          List<ApsProcessOperationProcessEquDo> waitUpdateEquList,

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationProcessEquServiceImpl.java

@@ -416,6 +416,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     splitProcessEqu(processEqus,
                             waitSplitRoll,
                             apsProcessOperationDo,
+                            processEqus.getPreviousprocessesids(),
                             needUpdateOldList,
                             needInsertNewList,
                             waitUpdateEquList,
@@ -581,6 +582,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
     public void splitProcessEqu(ApsProcessOperationProcessEquDo processEqus,
                                 int waitSplitRoll,
                                 ApsProcessOperationDo apsProcessOperationDo,
+                                String previousEquId,
                                 List<ApsProcessOperationProcessEquDo> needUpdateOldList,
                                 List<ApsProcessOperationProcessEquDo> needInsertNewList,
                                 List<ApsProcessOperationProcessEquDo> waitUpdateEquList,
@@ -739,12 +741,12 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         //前道作业明细的后道作业ID增加新拆分的作业明细ID
         //新拆分的作业明细的前道作业ID=前道作业明细ID
         //新拆分的作业明细的后道作业ID=（空）
-        if (StringUtils.isNotBlank(processEqus.getPreviousprocessesids())) {
-            newProcessEqu.setPreviousprocessesids(processEqus.getPreviousprocessesids());
+        if (StringUtils.isNotBlank(previousEquId)) {
+            newProcessEqu.setPreviousprocessesids(previousEquId);
             newProcessEqu.setNextprocessesids(null);
 
             //查询前道明细是否为新增的明细
-            ApsProcessOperationProcessEquDo previousEqu = needInsertNewList.stream().filter(item -> item.getId().equals(processEqus.getPreviousprocessesids())).findFirst().orElse(null);
+            ApsProcessOperationProcessEquDo previousEqu = needInsertNewList.stream().filter(item -> item.getId().equals(previousEquId)).findFirst().orElse(null);
             //查询前道明细
             if (previousEqu == null) {
                 previousEqu = this.getById(processEqus.getPreviousprocessesids());
@@ -753,7 +755,12 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 needUpdateOldPreEqu.setNextprocessesids(previousEqu.getNextprocessesids() + "," + newProcessEqu.getId());
                 needUpdateOldList.add(needUpdateOldPreEqu);
             } else {
-                previousEqu.setNextprocessesids(previousEqu.getNextprocessesids() + "," + newProcessEqu.getId());
+                if (StringUtils.isNotBlank(previousEqu.getNextprocessesids())) {
+                    previousEqu.setNextprocessesids(previousEqu.getNextprocessesids() + "," + newProcessEqu.getId());
+                } else {
+                    previousEqu.setNextprocessesids(newProcessEqu.getId());
+                }
+
             }
 
         }
@@ -767,8 +774,8 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         //该作业明细新拆分的作业明细的后道作业ID增加该后道作业明细新拆分的作业明细的的ID
         //继续拆分后续明细
         //如果该作业明细有后道作业明细，则默认仅一个后道作业明细(取第一个后道明细ID)
-        if (StringUtils.isNotBlank(newProcessEqu.getNextprocessesids())) {
-            String nextProcessEquId = newProcessEqu.getNextprocessesids().split(",")[0];
+        if (StringUtils.isNotBlank(processEqus.getNextprocessesids())) {
+            String nextProcessEquId = processEqus.getNextprocessesids().split(",")[0];
             //临时计算待拆分卷数=取其小（拆分卷数，该后道作业明细剩余待开工卷数）
             //将该后道作业明细按照待拆分卷数，拆分新的作业明细，参见【拆分作业明细】，
             //该后道作业明细新拆分的作业明细的前道作业明细ID=该作业明细新拆分的作业明细ID
@@ -790,6 +797,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             splitProcessEqu(nextProcessEqu,
                     nextWaitSplitRoll,
                     nextProcess,
+                    newProcessEqu.getId(),
                     needUpdateOldList,
                     needInsertNewList,
                     new LinkedList<>(),
@@ -1504,6 +1512,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     apsProcessOperationProcessEquService.splitProcessEqu(currentProcessEquDo,
                             splitQty,
                             currentProcessOperationDo,
+                            currentProcessEquDo.getPreviousprocessesids(),
                             needUpdateOldList,
                             needInsertNewList,
                             waitUpdateEquList,

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportRecordsServiceImpl.java

@@ -1263,6 +1263,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
                 apsProcessOperationProcessEquService.splitProcessEqu(apsProcessOperationProcessEquDo,
                         newLeaveWaitWorkRoll,
                         apsProcessOperationDo,
+                        apsProcessOperationProcessEquDo.getId(),
                         needUpdateOldList,
                         needInsertNewList,
                         waitUpdateEquList,