排程优化-退火合并优化

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

@@ -440,7 +440,9 @@ public class ApsServiceImpl implements ApsService {
                     List<ProductionProcesses> collect = apsSolution.getProcessesList().stream().filter(vp -> vp.getId().equals(process.getId())).collect(Collectors.toList());
                     if(collect != null && collect.size()>0){
                         for (ProductionProcesses productionProcesses : collect) {
-                            productionProcesses.getApsOverallConfig().setStartTime(productionProcesses.getRooprocess().getApsOverallConfig().getStartTime());
+                            if(productionProcesses.getRooprocess() != null){
+                                productionProcesses.getApsOverallConfig().setStartTime(productionProcesses.getRooprocess().getApsOverallConfig().getStartTime());
+                            }
                             if(relPros.containsKey(productionProcesses.getId())){
                                 Map<String, List<ProductionProcesses>> stringListMap = relPros.get(productionProcesses.getId());
                                 productionProcesses.setPreviousProcesses(stringListMap.get("pres"));