退火调度排程优化

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

@@ -1829,8 +1829,8 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
      */
     public ProductionScheduleRetVo tuiHuoSchedule(ProductionScheduleVo productionScheduleVo) throws Exception{
         /*List<String> blankids = new ArrayList<>();
-        blankids.add("3dffee02b25141cfb6a38624e855f9b2");
-        blankids.add("133bea9029db4db4b199a3c578a5695c");
+        blankids.add("a9ac246b0b644b87847327d4ad7cc431");
+//        blankids.add("133bea9029db4db4b199a3c578a5695c");
         List<ProductionProcesses> collect = productionScheduleVo.getProcesses().stream().filter(v ->
                 blankids.contains(v.getProduceOrder().get(0).getId())
         ).collect(Collectors.toList());
@@ -2058,6 +2058,8 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
                 }
             }
         }
+        // 退火被合并工序处理
+        solvedBalance.getProcessesList().addAll(otherThproces);
 
         for (ProductionProcesses productionProcesses : solvedBalance.getProcessesList()) {
             productionProcesses.setPreviousProcesses(null);