遗传算法

src/main/java/com/aps/entity/basic/Material.java

+package com.aps.entity.basic;
+import lombok.Data;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 物料实体类
+ */
+@Data
+public class Material {
+    /**
+     * 物料ID
+     */
+    private int Id;
+
+    /**
+     * 物料名称
+     */
+    private String name;
+
+    /**
+     * 当前库存
+     */
+    private double CurrentStock;
+
+    /**
+     * 在途物料（预计到货）
+     */
+    private List<MaterialSupply> InTransit = new ArrayList<>();
+
+    /**
+     * 采购周期
+     */
+    private int PurchaseLeadTime;
+
+
+    /**
+     * 物料类型
+     */
+    private MaterialType MaterialType;
+    @Override
+    public String toString() {
+        return "Material{" +
+                "id=" + Id +
+                ", name='" + name + '\'' +
+                ", currentStock=" + CurrentStock +
+                ", inTransit=" + InTransit +
+                ", purchaseLeadTime=" + PurchaseLeadTime +
+                ", type=" + MaterialType +
+                '}';
+    }
+}
+

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

@@ -7,11 +7,13 @@ import com.aps.entity.Algorithm.Chromosome;
 import com.aps.entity.Algorithm.GAScheduleResult;
 import com.aps.entity.Algorithm.ScheduleParams;
 import com.aps.entity.Algorithm.ScheduleResultDetail;
+import com.aps.entity.MesHoliday;
 import com.aps.entity.basic.ScheduleChromosome;
 import com.aps.entity.Schedule.GenVO;
 import com.aps.entity.Schedule.MachineVO;
 import com.aps.entity.basic.*;
 import com.aps.service.Algorithm.GeneticAlgorithm;
+import com.aps.service.MesHolidayService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -26,7 +28,11 @@ public class PlanResultService {
     // 注入FileUploadController
     @Autowired
     private FileUploadController fileUploadController;
-    
+
+    @Autowired
+    private MesHolidayService _MesHolidayService;
+
+
     private final LocalDateTime baseTime = LocalDateTime.of(2025, 10, 1, 0, 0, 0);
 
     public List<ScheduleChromosome> execute() {
@@ -129,6 +135,7 @@ public class PlanResultService {
             param.setPopulationSize(50);
             param.setMaxIterations(100);
 
+         // List<MesHoliday> holidays=  _MesHolidayService.list();
 
             // 创建节假日
             List<Holiday> holidays = Arrays.asList(