优先级

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

@@ -562,7 +562,7 @@ public class Initialization {
         }
         boolean considerSequence = rnd.nextBoolean();
         if (considerSequence) {
-            sortedOps.sort(Comparator.comparing((Entry op) -> -op.getPriority())
+            sortedOps.sort(Comparator.comparing((Entry op) -> op.getPriority())
                     .thenComparing(Entry::getSequence)
                     .thenComparing(op -> op.getProductId() != null ? op.getProductId() : "") // 相同物料排在一起，减少换型
                     .thenComparing(op -> {
@@ -571,7 +571,7 @@ public class Initialization {
                     })
                     .thenComparing(randomIds::get));
         }else {
-            sortedOps.sort(Comparator.comparing((Entry op) -> -op.getPriority())
+            sortedOps.sort(Comparator.comparing((Entry op) -> op.getPriority())
                     .thenComparing(op -> op.getProductId() != null ? op.getProductId() : "") // 相同物料排在一起，减少换型
                     .thenComparing(op -> {
                         Order order = orderMap.get(op.getGroupId());
@@ -664,7 +664,7 @@ public class Initialization {
             randomIds.put(allOperations.get(i), indices.get(i));
         }
 
-        sortedOps.sort(Comparator.comparing((Entry op) -> -op.getPriority())
+        sortedOps.sort(Comparator.comparing((Entry op) -> op.getPriority())
                 .thenComparing(op -> op.getProductId() != null ? op.getProductId() : "")
                 .thenComparing(op -> op.getMachineOptions().get(0).getProcessingTime() * op.getQuantity())
                 .thenComparing(randomIds::get));
@@ -890,7 +890,7 @@ public class Initialization {
             }
         }
 
-        sortedOps.sort(Comparator.comparing((Entry op) -> -op.getPriority())
+        sortedOps.sort(Comparator.comparing((Entry op) -> op.getPriority())
                 .thenComparing((Entry op) -> {
                     if (op.getMachineOptions() == null || op.getMachineOptions().isEmpty()) {
                         return 0.0;
@@ -964,7 +964,7 @@ public class Initialization {
         for (int i = 0; i < allOperations.size(); i++) {
             randomIds.put(allOperations.get(i), indices.get(i));
         }
-        sortedOps.sort(Comparator.comparing((Entry op) -> -op.getPriority())
+        sortedOps.sort(Comparator.comparing((Entry op) -> op.getPriority())
                 .thenComparing(op -> op.getProductId() != null ? op.getProductId() : "") // 相同物料排在一起，减少换型
                 .thenComparing(randomIds::get));
 

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

@@ -95,6 +95,7 @@ public class MachineCalculator {
         int remainingTime = processingTime;
         final LocalDateTime processSearchEnd = cursor;
 
+
         List<TimeSegment> processSegments = machine.getAvailability().stream()
                 .filter(slot -> !slot.isUsed())
                 .filter(slot -> slot.getType() != SegmentType.MAINTENANCE)

src/main/resources/application.yml

@@ -58,7 +58,7 @@ spring:
         #  url: jdbc:oracle:thin:@//39.100.77.7:1522/ORCLPDB1 # ORCL为你的Oracle实例名
           #          username: mes  # 替换为你的Oracle用户名
 #          password: root_mes123456  # 替换为你的Oracle密码
-          url: jdbc:oracle:thin:@//39.100.78.207:7002/ORCLPDB1 # ORCL为你的Oracle实例名
+          url: jdbc:oracle:thin:@//39.100.78.207:7002/ORCLPDB1 # ORCL为你的Oracle实例名 7005
           username: mes  # 替换为你的Oracle用户名
           password: root_mes123456  # 替换为你的Oracle密码
 #        sqlserver:

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

@@ -41,7 +41,8 @@ public class PlanResultServiceTest {
      //  sortService.test1();
        // nsgaiiUtils.Test();
 
-          planResultService.execute2("64E64F6B68094AF38CEDC418630C3CC2");//2000
+     //     planResultService.execute2("64E64F6B68094AF38CEDC418630C3CC2");//2000
+             planResultService.execute2("5C93A528725F40228889FCFC1E040B55");//2000
 
         //  planResultService.execute2("15210B13B88A453F8B84AAC7F16C7541");//2000