新模型合并

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

@@ -833,6 +833,10 @@ public class DdApsServiceImpl implements DdApsService {
             if(rootPro.getPreviousProcesses() != null && rootPro.getPreviousProcesses().size()>0){
                 if(rootPro.getPreviousProcesses().size()>1){
                     notMerge = false;
+                }else{
+                    if(rootPro.getPreviousProcesses().get(0).getNextProcesses().size()>1){
+                        notMerge = false;
+                    }
                 }
             }
 

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

@@ -52,15 +52,15 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
     @Override
     public ProductionScheduleRetVo productionSchedule(ProductionScheduleVo productionScheduleVo) throws Exception{
         List<String> blankids = new ArrayList<>();
-        blankids.add("4f6c1750a44f4d86b0226788b761d709");
+        blankids.add("9e8bbe425aa044a4af55d8daf7ebb4cb");
 //        blankids.add("2f3f48a1c3c74c0481ba06df521fe0d7");
 //        blankids.add("75736c469b1a42568af980260c0689a6");
 //        blankids.add("acf4460f9488459780c0dc7d8038f1f9");
 //        blankids.add("efeb1f8d01b04cdb9921c0d1711bb967");
-        List<ProductionProcesses> collect = productionScheduleVo.getProcesses().stream().filter(v ->
-                        blankids.contains(v.getProduceOrder().get(0).getId())
-                ).collect(Collectors.toList());
-        productionScheduleVo.setProcesses(collect);
+//        List<ProductionProcesses> collect = productionScheduleVo.getProcesses().stream().filter(v ->
+//                        blankids.contains(v.getProduceOrder().get(0).getId())
+//                ).collect(Collectors.toList());
+//        productionScheduleVo.setProcesses(collect);
 
         log.info("*************** 排程开始："+productionScheduleVo.getProductionScheduleId()+" *******************");
         if(productionScheduleVo.getScheduleType().getScheduleType() == null){