调度排程异常问题处理

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

@@ -174,6 +174,8 @@ public class DdApsTaServiceImpl implements DdApsTaService {
                                         for (String proid:mergeProNexts.keySet()){
                                             if(mergePro.getNextProcessesIds() == null){
                                                 int a = 1;
+                                                mergePro.setNextProcessesIds(new ArrayList<>());
+                                                mergePro.setNextProcesses(new ArrayList<>());
                                             }
                                             if(!mergePro.getNextProcessesIds().contains(proid)){
                                                 ProductionProcessesTa propro = mergeProNexts.get(proid);
@@ -881,7 +883,10 @@ public class DdApsTaServiceImpl implements DdApsTaService {
                         List<String> commonEqusNext = new ArrayList<>();
                         Map<String,String> commonEquGsNext = new HashMap<>();
                         for (String optionalEquipment : rootPro.getOptionalEquipments()) {
-                            if(commonEqus.contains(optionalEquipment)
+                            if(commonEquGs.get(optionalEquipment) == null || rootPro.getOptionalEquipmentZg().get(optionalEquipment) == null || optionalEquipment == null){
+                                int aa = 0;
+                            }
+                            if(commonEqus.contains(optionalEquipment) && commonEquGs.get(optionalEquipment) != null && rootPro.getOptionalEquipmentZg().get(optionalEquipment) != null
                                     && commonEquGs.get(optionalEquipment).equals(rootPro.getOptionalEquipmentZg().get(optionalEquipment))){
                                 commonEqusNext.add(optionalEquipment);
                                 commonEquGsNext.put(optionalEquipment,commonEquGs.get(optionalEquipment));