前后道工序合并bug修改

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

@@ -830,8 +830,10 @@ public class DdApsServiceImpl implements DdApsService {
             // 判断是否可合并
             boolean notMerge = true;
             // 后端工序只有一个，前道工序有多个不能合并
-            if(nextProcesses.size() == 1 && nextProcesses.get(0).getPreviousProcesses().size()>1){
-                notMerge = false;
+            if(nextProcesses != null && nextProcesses.size()>0){
+                if(nextProcesses.size() == 1 && nextProcesses.get(0).getPreviousProcesses().size()>1){
+                    notMerge = false;
+                }
             }
 
             if("否".equals(rootPro.getIssubsection()) && ("冷轧".equals(rootPro.getProcessType()) || "箔轧".equals(rootPro.getProcessType()))

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("3d7f12ce4db247df863ea39c84ad6805");
+        blankids.add("53bf294756e3457fac9a0e0e174314b3");
 //        blankids.add("2f3f48a1c3c74c0481ba06df521fe0d7");
 //        blankids.add("75736c469b1a42568af980260c0689a6");
 //        blankids.add("acf4460f9488459780c0dc7d8038f1f9");