Merge remote-tracking branch 'origin/tl'

# Conflicts:
#	src/main/java/com/aps/service/Algorithm/GeneticAlgorithm.java

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

@@ -382,7 +382,10 @@ if(finishedOrder==null||finishedOrder.size()==0)
         FileHelper.writeLogFile("  开始    "+operation.getGroupId()+" : "+operation.getId()+",处理时间: " + processingTime + ", 后处理: " + teardownTime +
                 ", 前处理: " + preTime + ", 换型: " + setupTime+ ", 数量: " + operation.getQuantity()+ ", 设备: "+machine.getId()+ ", 是否可中断: "+operation.getIsInterrupt());
 
-
+if(operation.getId()==69)
+{
+    int i=0;
+}
         // 确定任务的最早开始时间（基于前一道工序的完整结束时间，包含后处理）
         int earliestStartTime = prevOperationEndTime;
 

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

@@ -987,7 +987,7 @@ public class MachineCalculator {
             LocalDateTime geneEndTime = baseTime.plusSeconds(geneDetails.getEndTime());
         TimeSegment usedSegment = null;
             if (targetSegment.getEnd().isAfter(geneEndTime)) {
-
+                usedSegment=new TimeSegment();
                 usedSegment.setStart(baseTime.plusSeconds(geneDetails.getStartTime()));
                 usedSegment.setEnd(geneEndTime);
                 usedSegment.setHoliday(false);

src/test/java/com/aps/demo/PlanResultServiceTest.java

@@ -39,12 +39,12 @@ public class PlanResultServiceTest {
        // nsgaiiUtils.Test();
         //planResultService.execute2("C5FB5EF2A7334A0A92F826F4937E1008");
        //  planResultService.execute2("726D4C1A712B4B1393175BD44B775B66");
-       planResultService.execute2("BCA6FA43FFA444D3952CF8F6E1EA291B");
+       planResultService.execute2("E81EE93EFA564CEB8594C61CAEEBCD53");
 //        LocalDateTime t=   LocalDateTime.of(2025, 11, 15, 6, 51, 11);
-//       List<Integer> opids=new ArrayList<>();
+//       List<Integer> opids=new ArrayList<>();BCA6FA43FFA444D3952CF8F6E1EA291B
 //        opids.add(1);
 //        planResultService.Move("B571EF6682DB463AB2977B1055A74112",opids,t,3403L);
-      //  planResultService.Redecode("12345679");
+       // planResultService.Redecode("12345679");
        // MaintenanceWindow maintenanceWindow=new MaintenanceWindow();
       //  maintenanceWindow.setStartTime(LocalDateTime.of(2025, 10, 21, 0, 0, 0));
       //  maintenanceWindow.setEndTime(LocalDateTime.of(2025, 10, 31, 0, 0, 0));