排程优化-退火合并优化

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

@@ -477,10 +477,12 @@ public class ApsServiceImpl implements ApsService {
                         }
                     }
                 }*/
-                for (ProductionProcesses productionProcesses : mainTh.getNextProcesses()) {
-                    if(productionProcesses.getProcessCategory() != null && "40".equals(productionProcesses.getProcessCategory())
-                            && (productionProcesses.getNextProcesses() == null || productionProcesses.getNextProcesses().size() == 0)){
-                        lastProMerge.add(productionProcesses);
+                if(mainTh.getNextProcesses() != null && mainTh.getNextProcesses().size()>0){
+                    for (ProductionProcesses productionProcesses : mainTh.getNextProcesses()) {
+                        if(productionProcesses.getProcessCategory() != null && "40".equals(productionProcesses.getProcessCategory())
+                                && (productionProcesses.getNextProcesses() == null || productionProcesses.getNextProcesses().size() == 0)){
+                            lastProMerge.add(productionProcesses);
+                        }
                     }
                 }
                 if(lastProMerge.size()>0){
@@ -559,7 +561,6 @@ public class ApsServiceImpl implements ApsService {
                         }
                     });
                 }
-
             }else{
                 for (ProductionProcesses process : v) {
                     List<ProductionProcesses> collect = apsSolution.getProcessesList().stream().filter(vp -> vp.getId().equals(process.getId())).collect(Collectors.toList());