调度排程优化

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

@@ -50,12 +50,12 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
      */
     @Override
     public ProductionScheduleRetVo productionSchedule(ProductionScheduleVo productionScheduleVo) throws Exception{
-        /*List<ProductionProcesses> collect = productionScheduleVo.getProcesses().stream().filter(v ->
-                "17ec0583bac645289edceba3dcd88782".equals(v.getProduceOrder().get(0).getId())
-                        || "7cc30ae6ddc442dbb544665e9372d43d".equals(v.getProduceOrder().get(0).getId())
-                        || "3e48a015dabe47468af18f59b9f3d567".equals(v.getProduceOrder().get(0).getId())
-                ).collect(Collectors.toList());
-        productionScheduleVo.setProcesses(collect);*/
+//        List<ProductionProcesses> collect = productionScheduleVo.getProcesses().stream().filter(v ->
+//                "b2ea2ea002e344d2b0fdc06b84f62ade".equals(v.getProduceOrder().get(0).getId())
+//                        || "7cc30ae6ddc442dbb544665e9372d43d".equals(v.getProduceOrder().get(0).getId())
+//                        || "3e48a015dabe47468af18f59b9f3d567".equals(v.getProduceOrder().get(0).getId())
+//                ).collect(Collectors.toList());
+//        productionScheduleVo.setProcesses(collect);
 
         log.info("*************** 排程开始："+productionScheduleVo.getProductionScheduleId()+" *******************");
         if(productionScheduleVo.getScheduleType().getScheduleType() == null){
@@ -596,7 +596,7 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
                         otherThproce.setConflictRoptions(thpro.getConflictRoptions());
 
                         thpro.setOpeProducePcNum(1);
-                        if(thpro.getPreviousProcessesIds() != null && thpro.getPreviousProcessesIds().size()>0){
+                        /*if(thpro.getPreviousProcessesIds() != null && thpro.getPreviousProcessesIds().size()>0){
                             List<String> preids = new ArrayList<>();
                             preids.add(thpro.getPreviousProcessesIds().get(0));
                             thpro.setPreviousProcessesIds(preids);
@@ -609,7 +609,7 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
                                     thpro.getNextProcessesIds().remove(i);
                                 }
                             }
-                        }
+                        }*/
                         if(thpro.getProcessType().equals("小卷成退")){
                             thpro.setMinThPcNum(thpro.getMinThPcNum()-otherThproce.getMinThPcNum());
                         }