解码优化

src/main/java/com/aps/service/Algorithm/MaterialRequirementService.java

@@ -1140,7 +1140,7 @@ if(headers1==null)
 
      * @return 包含物料需求列表和子订单列表的结果对象（替代C#的out参数）
      */
-    public void EditOperationBOM(Entry operation,Chromosome chromosome,LocalDateTime earliestStartTime,GeneticDecoder coder,Map<Long, CopyOnWriteArrayList<GAScheduleResult>> machineTasksCache) {
+    public void EditOperationBOM(Entry operation,Chromosome chromosome,LocalDateTime earliestStartTime,GeneticDecoder coder,Map<Long, CopyOnWriteArrayList<GAScheduleResult>> machineTasksCache,Map<Integer, Entry> entryIndexById,Map<Integer, GAScheduleResult> scheduleIndexById) {
         List<OrderMaterialRequirement> materialRequirements = new ArrayList<>();
 
         String sceneId=chromosome.getScenarioID();
@@ -1319,7 +1319,7 @@ if(headers1==null)
 
                                for (Integer orderid : orderids) {
                                    coder.ClearorderOperationResult(chromosome, orderid);
-                                   coder.EditorderOperation(chromosome, orderid, needed,machineTasksCache);
+                                   coder.EditorderOperation(chromosome, orderid, needed,machineTasksCache, entryIndexById, scheduleIndexById);
                                }
 
                        }else {

src/main/java/com/aps/service/plan/PlanResultService.java

@@ -222,7 +222,7 @@ public class PlanResultService {
             lockedOrderProcessorService.markLockedOrdersOccupiedTime(machines, timeConfig.getBaseTime());
 
             // 5. 执行调度算法
-            GeneticAlgorithm scheduler =new GeneticAlgorithm(globalParam,machines,orders,Materials1,materialIds,machineScheduler,entryRel,materialRequirementService,_sceneService,SceneId); //new GeneticAlgorithm(products, machines, orders, machineScheduler);
+            HybridAlgorithm scheduler =new HybridAlgorithm(globalParam,machines,orders,Materials1,materialIds,machineScheduler,entryRel,materialRequirementService,_sceneService,SceneId); //new GeneticAlgorithm(products, machines, orders, machineScheduler);
             param.initAdaptiveParams(entrys.size());
             double[] customWeights = new double[] { 0.4, 0.1, 0.1, 0.1, 0.3 }; // 延迟时间权重提升到0.5
             //完工时间、总流程时间、总换型时间、机器负载标准差、延迟时间