bug修改

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/service/impl/ApsServiceImpl.java

@@ -1056,6 +1056,9 @@ public class ApsServiceImpl implements ApsService {
         // 按订单分组
         Map<String, List<ProductionProcesses>> orderProcess = processes.stream().collect(Collectors.groupingBy(ProductionProcesses::getOrderId));
         orderProcess.forEach((orderId,orderpss)->{
+            if("6639310eb2204f77ac9d36a2f289039c".equals(orderId)){
+                int a = 1;
+            }
             // 退火作业集合
             Map<String,List<ProductionProcesses>> thproMap = new HashMap<>();
             for (ProductionProcesses process : orderpss) {
@@ -1369,6 +1372,9 @@ public class ApsServiceImpl implements ApsService {
         // 根据订单分组
         Map<String, List<ProductionProcesses>> orderProcess = mergeprocesses.stream().collect(Collectors.groupingBy(ProductionProcesses::getOrderId));
         orderProcess.forEach((k,processes)->{
+            if("6639310eb2204f77ac9d36a2f289039c".equals(k)){
+                int a = 1;
+            }
             // 退火工序过滤
             List<ProductionProcesses> thpros = new ArrayList<>();
             // 所有单卷作业集合
@@ -1389,7 +1395,7 @@ public class ApsServiceImpl implements ApsService {
                     othermergeprocesses.add(mergeprocess);
                 } else {
                     if(("是".equals(mergeprocess.getIssubsection()) && mergeprocess.getNextProcesses() != null && mergeprocess.getNextProcesses().size()>0
-                     && mergeprocess.getProducePcNum()<mergeprocess.getNextProcesses().get(0).getProducePcNum()) || mergeprocess.getIfLock()){
+                     && !mergeprocess.getNextProcesses().get(0).getProcessType().equals("小卷成退")) || mergeprocess.getIfLock()){
                         othermergeprocesses.add(mergeprocess);
                     }else {
                         /*if(mergeprocess.getPreviousProcessesIds() == null || mergeprocess.getPreviousProcessesIds().size() == 0){
@@ -1633,7 +1639,7 @@ public class ApsServiceImpl implements ApsService {
             ){
                 // 分卷工序
                 if(("是".equals(nextProcesses.get(0).getIssubsection()) && nextProcesses.get(0).getNextProcesses() != null && nextProcesses.get(0).getNextProcesses().size()>0
-                        && nextProcesses.get(0).getNextProcesses().get(0).getProducePcNum()>nextProcesses.get(0).getProducePcNum())
+                        && !nextProcesses.get(0).getNextProcesses().get(0).getProcessType().equals("小卷成退"))
                         || nextProcesses.get(0).getIfLock()){
                     for (ProductionProcesses nextProcess : nextProcesses) {
                         List<ProductionProcesses> pres = new ArrayList<>();
@@ -1742,7 +1748,7 @@ public class ApsServiceImpl implements ApsService {
 //                    && previousProcesses.get(0).getPreviousProcessesIds() != null && previousProcesses.get(0).getPreviousProcessesIds().size()>0
             ){
                 // 分卷工序
-                if(("是".equals(previousProcesses.get(0).getIssubsection()) && previousProcesses.get(0).getProducePcNum()<thps.getProducePcNum()) || previousProcesses.get(0).getIfLock()){
+                if(("是".equals(previousProcesses.get(0).getIssubsection()) && !thps.getProcessType().equals("小卷成退")) || previousProcesses.get(0).getIfLock()){
                     for (ProductionProcesses preProcess : previousProcesses) {
                         List<ProductionProcesses> nexts = new ArrayList<>();
                         if(preProcess.getNextProcesses().size()>1){
@@ -2176,6 +2182,9 @@ public class ApsServiceImpl implements ApsService {
                 // 已合并处理过作业ID
                 List<String> hasMid = new ArrayList<>();
                 for (ProductionProcesses rootPro : rootPros) {
+                    if(rootPro.getId().equals("deaf796d6e2b416dbc243201b9ad5795")){
+                        int a = 1;
+                    }
                     getLzBzSeries(rootPro,lzbzMerges,null,null,null,hasMid);
                 }
                 if(lzbzMerges != null && lzbzMerges.size()>0){

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/service/impl/ProductionScheduleServiceImpl.java

@@ -1338,13 +1338,15 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
                     }
 
                 }
-                if(pres != null && pres.size()>0){
-                    process.setPreviousProcesses(pres);
-                }
                 // 前道工序历史备份
                 List<String> oldpreids = new ArrayList<>();
                 oldpreids.addAll(process.getPreviousProcessesIds());
                 process.setOldPreviousProcessesIds(oldpreids);
+                if(pres != null && pres.size()>0){
+                    process.setPreviousProcesses(pres);
+                }else{
+                    process.setPreviousProcessesIds(null);
+                }
             }
             // 后道工序
             if(process.getNextProcessesIds() != null && process.getNextProcessesIds().size()>0){