bug修改

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

@@ -135,10 +135,23 @@ public class DdApsServiceImpl implements DdApsService {
                                                 CollUtil.addAllIfNotContains(mergePro.getPreviousProcessesIds(),mergePres.get(i).getPreviousProcessesIds());
                                                 // 合并作业上一道工序的下一道工序设置为当前合并作业
                                                 for (ProductionProcesses previousProcess : mergePres.get(i).getPreviousProcesses()) {
-                                                    previousProcess.getNextProcesses().clear();
+                                                    String preiId = mergePres.get(i).getId();
+                                                    List<ProductionProcesses> merNextprocesses = previousProcess.getNextProcesses().stream().filter(v -> !preiId.equals(v.getId())).collect(Collectors.toList());
+                                                    if(merNextprocesses == null){
+                                                        merNextprocesses = new ArrayList<>();
+                                                    }
+                                                    List<ProductionProcesses> merMainPros = merNextprocesses.stream().filter(v -> mergePro.getId().equals(v.getId())).collect(Collectors.toList());
+                                                    if(merMainPros == null || merMainPros.size() == 0){
+                                                        merNextprocesses.add(mergePro);
+                                                    }
+                                                    List<String> merNextprocessesIds = merNextprocesses.stream().map(ProductionProcesses::getId).collect(Collectors.toList());
+                                                    previousProcess.setNextProcesses(merNextprocesses);
+                                                    previousProcess.setNextProcessesIds(merNextprocessesIds);
+
+                                                    /*previousProcess.getNextProcesses().clear();
                                                     previousProcess.getNextProcesses().add(mergePro);
                                                     previousProcess.getNextProcessesIds().clear();
-                                                    previousProcess.getNextProcessesIds().add(mergePro.getId());
+                                                    previousProcess.getNextProcessesIds().add(mergePro.getId());*/
                                                 }
                                             }
                                         }
@@ -180,7 +193,8 @@ public class DdApsServiceImpl implements DdApsService {
                             for (ProductionProcesses nextProcess : rootProce.getNextProcesses()) {
                                 List<ProductionProcesses> hasPro = nextrootProces.stream().filter(v -> v.getId().equals(nextProcess.getId())).collect(Collectors.toList());
                                 if(hasPro == null || hasPro.size() == 0){
-                                    nextrootProces.addAll(rootProce.getNextProcesses());
+//                                    nextrootProces.addAll(rootProce.getNextProcesses());
+                                    nextrootProces.add(nextProcess);
                                 }
                             }
                         }

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

@@ -52,7 +52,7 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
     @Override
     public ProductionScheduleRetVo productionSchedule(ProductionScheduleVo productionScheduleVo) throws Exception{
         List<String> blankids = new ArrayList<>();
-        blankids.add("9d695c0102d14ae7bec50441ea6be8ea");
+        blankids.add("97f8833a143e4d94a3543c1c0495f6e7");
 //        blankids.add("2f3f48a1c3c74c0481ba06df521fe0d7");
 //        blankids.add("75736c469b1a42568af980260c0689a6");
 //        blankids.add("acf4460f9488459780c0dc7d8038f1f9");