预排程多卷分支模型bug修改

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

@@ -2008,6 +2008,29 @@ public class ApsServiceImpl implements ApsService {
                         }
                         // 递归按照退火合并
                         thPreProMerge(mergePro,notMergeProces,mergeprocesses,bsProceses,hasMerge,allProMap,thNexts);
+                    }else{
+                        List<ProductionProcesses> samePres = mergeprocesses.stream().filter(v -> {
+                            List<ProductionProcesses> mvs = mergePres.stream().filter(mv -> v.getId().equals(mv.getId())).collect(Collectors.toList());
+                            if (mvs != null && mvs.size() > 0) {
+                                return true;
+                            } else {
+                                return false;
+                            }
+                        }).collect(Collectors.toList());
+                        if(samePres != null && samePres.size()>0){
+                            List<ProductionProcesses> thpsPrePros = new ArrayList<>();
+                            List<String> thpsPreProIds = new ArrayList<>();
+                            for (ProductionProcesses samePre : samePres) {
+                                if(!samePre.getNextProcessesIds().contains(thps.getId())){
+                                    samePre.getNextProcessesIds().add(thps.getId());
+                                    samePre.getNextProcesses().add(thps);
+                                }
+                                thpsPrePros.add(samePre);
+                                thpsPreProIds.add(samePre.getId());
+                            }
+                            thps.setPreviousProcesses(thpsPrePros);
+                            thps.setPreviousProcessesIds(thpsPreProIds);
+                        }
                     }
                 }
             }else{