排程优化

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

@@ -12,7 +12,7 @@ public interface ApsService {
 
     ApsSolution tuihuoAps(ApsSolution apsSolution);
 
-    void tuihuoApsSch(ApsSolution apsSolution);
+    void tuihuoApsSch(ApsSolution apsSolution,List<ProductionProcesses> otherThproces);
 
     SolverFactory<ApsSolution> solverInit(ProductionScheduleVo productionScheduleVo);
 

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

@@ -91,7 +91,7 @@ public class ApsServiceImpl implements ApsService {
      * @param apsSolution
      */
     @Override
-    public void tuihuoApsSch(ApsSolution apsSolution){
+    public void tuihuoApsSch(ApsSolution apsSolution,List<ProductionProcesses> otherThproces){
         ApsSolution apsSolutionTh = tuihuoAps(apsSolution);
         // 退火工序求解器运行
         int processNum1 = apsSolutionTh.getProcessesList().size();
@@ -158,7 +158,6 @@ public class ApsServiceImpl implements ApsService {
                     }
                 }
                 // 提前合并退火作业
-                List<ProductionProcesses> otherThproces = new ArrayList<>();
                 starttimeProcess.forEach((k,v)->{
                     if(v.size()>1){
                         List<ProductionProcesses> thps = new ArrayList<>();

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

@@ -181,7 +181,7 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
             }
         }
         // 退火提前排序
-        apsService.tuihuoApsSch(apsSolution);
+        apsService.tuihuoApsSch(apsSolution,otherThproces);
         // 去掉锁定工序
         List<ProductionProcesses> notLocks = new ArrayList<>();
         List<ProductionProcesses> hasLocks = new ArrayList<>();