Merge branch 'master' of http://39.100.78.207:1213/tongli/hyh.apsj

src/main/java/com/aps/config/RedisConfiguration.java

 package com.aps.config;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -51,6 +52,9 @@ public class RedisConfiguration {
         // 设置可见性
         om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
 
+        // 忽略空值（包括空数组、空字符串、null）
+        om.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
+
         // 注册 JavaTimeModule 支持 Java 8 日期时间
         om.registerModule(new JavaTimeModule());
 

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

@@ -2936,6 +2936,7 @@ if(geneDetails!=null&&geneDetails.size()>0)
                     double totalSetupTime = calculateTotalSetupTime(chromosome);
                     chromosome.setTotalChangeoverTime(totalSetupTime);
                     Objectives[i] = totalSetupTime;
+
                 }
                 if (GlobalParam.OBJECTIVE_FLOW_TIME.equals(config.getName())) {
                     // 4. 最小化总流程时间 所有工序加工时间的总和

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

@@ -444,6 +444,24 @@ public class HillClimbing {
         }
 
         FileHelper.writeLogFile(String.format("爬山法%s - kpi：%s",chromosome.getGeneStr(), fitness));
+      if(chromosome.getMakespan()!=0) {
+          FileHelper.writeLogFile(String.format("爬山法%s - kpi-Makespan: %f", chromosome.getGeneStr(), chromosome.getMakespan()));
+      }
+        if(chromosome.getDelayTime()!=0) {
+            FileHelper.writeLogFile(String.format("爬山法%s - kpi-DelayTime: %f", chromosome.getGeneStr(), chromosome.getDelayTime()));
+        }
+        if(chromosome.getTotalChangeoverTime()!=0) {
+
+        FileHelper.writeLogFile(String.format("爬山法%s - kpi-ChangeoverTime: %f",chromosome.getGeneStr(), chromosome.getTotalChangeoverTime()));
+        }
+        if(chromosome.getMachineLoadStd()!=0) {
+            FileHelper.writeLogFile(String.format("爬山法%s - kpi-MachineLoad: %f",chromosome.getGeneStr(), chromosome.getMachineLoadStd()));
+        }
+        if(chromosome.getTotalFlowTime()!=0) {
+        FileHelper.writeLogFile(String.format("爬山法%s - kpi-FlowTime: %f",chromosome.getGeneStr(), chromosome.getTotalFlowTime()));
+        }
+
+
 
     }
     /**
@@ -613,7 +631,20 @@ public class HillClimbing {
             // 假设Machine类有拷贝方法，或使用MapStruct等工具进行映射
 
             chromosome.setMachines(ProductionDeepCopyUtil.deepCopyList(machines,Machine.class)); // 简单拷贝，实际可能需要深拷贝
-
+            chromosome.setOrders(ProductionDeepCopyUtil.deepCopyList(new CopyOnWriteArrayList<>(orders), Order.class) ); // 简单拷贝，实际可能需要深拷贝
+            chromosome.setOperatRel(ProductionDeepCopyUtil.deepCopyList(new CopyOnWriteArrayList<>(_entryRel), GroupResult.class) ); // 简单拷贝，实际可能需要深拷贝
+            chromosome.setMaterials(ProductionDeepCopyUtil.deepCopyTreeMap(materials,String.class,Material.class)); // 简单拷贝，实际可能需要深拷贝
+
+            chromosome.setAllOperations(ProductionDeepCopyUtil.deepCopyList(new CopyOnWriteArrayList<>(allOperations), Entry.class) ); // 简单拷贝，实际可能需要深拷贝
+
+            // 加载锁定工单到ResultOld
+            List<GAScheduleResult> lockedOrders = GlobalCacheUtil.get("locked_orders_" + chromosome.getScenarioID());
+            if (lockedOrders != null && !lockedOrders.isEmpty()) {
+                chromosome.setResultOld(ProductionDeepCopyUtil.deepCopyList(lockedOrders, GAScheduleResult.class));
+                FileHelper.writeLogFile("将 " + lockedOrders.size() + " 个锁定工单加载到初始种群中");
+            } else {
+                chromosome.setResultOld(new CopyOnWriteArrayList<>());
+            }
         }
 
         // 并行解码所有候选方案

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

@@ -485,6 +485,7 @@ public class HybridAlgorithm {
         chromosome.setMachines(ProductionDeepCopyUtil.deepCopyList(machines,Machine.class)); // 简单拷贝，实际可能需要深拷贝
         chromosome.setOrders(ProductionDeepCopyUtil.deepCopyList(new CopyOnWriteArrayList<>(orders), Order.class) ); // 简单拷贝，实际可能需要深拷贝
         chromosome.setOperatRel(ProductionDeepCopyUtil.deepCopyList(new CopyOnWriteArrayList<>(_entryRel), GroupResult.class) ); // 简单拷贝，实际可能需要深拷贝
+
         chromosome.setMaterials(ProductionDeepCopyUtil.deepCopyTreeMap(materials, String.class, Material.class)); // 简单拷贝，实际可能需要深拷贝
 
         chromosome.setAllOperations(ProductionDeepCopyUtil.deepCopyList(new CopyOnWriteArrayList<>(allOperations), Entry.class) ); // 简单拷贝，实际可能需要深拷贝

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

@@ -1286,13 +1286,15 @@ if(demand==null)
                            if (material1 == null) {
                                break;
                            }
+                           FileHelper.writeLogFile("RoutingSupportingReplace: "+(commitChanges?"1":"0")+" " +material1.getCode()+": "+useStock);
+
                            OrderMaterialRequirement orderMaterial1 = MaterialStock(material1, rsr.getTargetmaterialid(), orderMaterial.getOrderId(), orderMaterial.getChildOrderId(), operationId, allneeded, needed, earliestStartTime, commitChanges);
                            if (orderMaterial1 != null) {
                                useStock = orderMaterial1.getUseStock();
 
 
                                needed -= useStock;
-                               FileHelper.writeLogFile("RoutingSupportingReplace: "+material1.getCode()+": "+useStock);
+                               FileHelper.writeLogFile("RoutingSupportingReplace: "+(commitChanges?"1":"0")+" " +material1.getCode()+": "+useStock);
                                orderMaterial.setUseStock(orderMaterial.getUseStock() + useStock);
                                orderMaterial.getReplaceMaterial().add(orderMaterial1);
                                if (needed <= 0) {