排程优化-退火合并

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

@@ -87,14 +87,17 @@ public class ApsServiceImpl implements ApsService {
                     }
                     // 开始时间设置
                     process.setApsOverallConfig(apsOverallConfig);
-                    // 前后道工序置空
-                    process.setPreviousProcesses(null);
-                    process.setNextProcesses(null);
                 }
                 tuihuos.add(process);
             }
         }
         Collections.sort(tuihuos, (p1,p2)->p2.getApsOverallConfig().getStartTime().compareTo(p1.getApsOverallConfig().getStartTime()));
+        // 前后道工序置空
+        for (ProductionProcesses tuihuo : tuihuos) {
+            // 前后道工序置空
+            tuihuo.setPreviousProcesses(null);
+            tuihuo.setNextProcesses(null);
+        }
         apsSolutionTuihuo.setProcessesList(tuihuos);
         apsSolutionTuihuo.setEquipmentList(apsSolution.getEquipmentList());
         return apsSolutionTuihuo;

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

@@ -292,7 +292,7 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
         productionScheduleRetVo.setProcesses(solvedBalance.getProcessesList());
         // 循环引用ProductionProcesses置空
 //        solvedBalance.getProcessesList().addAll(solvedBalance1.getProcessesList());
-//        solvedBalance.getProcessesList().addAll(hasLocks);
+        solvedBalance.getProcessesList().addAll(hasLocks);
         // 退火合并工序排程完拆分
         if(otherThproces != null && otherThproces.size()>0){
             for (ProductionProcesses otherThproce : otherThproces) {
@@ -396,7 +396,7 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
                     sers.add(po);
                 }
                 if(hasreplacenextLock){
-                    productionProcesses.getConflictDes().replaceAll("与下道工序开始时间不符合规则","");
+                    productionProcesses.setConflictDes(productionProcesses.getConflictDes().replaceAll("与下道工序开始时间不符合规则",""));
                 }
             }
         }