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

logs/aps_error.log

-2026-04-21 19:15:40.112 | main | com.aps.common.util.redis.RedisUtils | Redis 操作失败 1/3: get(material), 错误: Redis exception; nested exception is io.lettuce.core.RedisException: Connection closed
-2026-04-21 19:15:40.627 | main | com.aps.common.util.redis.RedisUtils | Redis 操作失败 2/3: get(material), 错误: LettuceConnectionFactory was destroyed and cannot be used anymore
-2026-04-21 19:58:28.398 | main | com.aps.common.util.redis.RedisUtils | Redis 操作失败 1/3: get(SceneId.6D63146BE5C84A78B5AB044327BA55BD), 错误: Redis exception; nested exception is io.lettuce.core.RedisException: java.io.IOException: 远程主机强迫关闭了一个现有的连接。
-2026-04-21 21:22:58.624 | main | com.aps.common.util.redis.RedisUtils | Redis 操作失败 1/3: get(SceneId.6D63146BE5C84A78B5AB044327BA55BD), 错误: Redis exception; nested exception is io.lettuce.core.RedisException: java.io.IOException: 远程主机强迫关闭了一个现有的连接。
+2026-04-24 11:05:58.256 | main | com.aps.common.util.redis.RedisUtils | Redis 操作失败 1/3: get(SceneId.6D63146BE5C84A78B5AB044327BA55BD), 错误: Redis exception; nested exception is io.lettuce.core.RedisException: java.io.IOException: 远程主机强迫关闭了一个现有的连接。
+2026-04-24 15:25:23.471 | main | com.aps.common.util.redis.RedisUtils | Redis 操作失败 1/3: get(SceneId.6D63146BE5C84A78B5AB044327BA55BD), 错误: Redis exception; nested exception is io.lettuce.core.RedisException: java.io.IOException: 远程主机强迫关闭了一个现有的连接。
+2026-04-24 15:57:33.089 | main | com.aps.common.util.redis.RedisUtils | Redis 操作失败 1/3: get(SceneId.6D63146BE5C84A78B5AB044327BA55BD), 错误: Redis exception; nested exception is io.lettuce.core.RedisException: java.io.IOException: 远程主机强迫关闭了一个现有的连接。

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

@@ -595,53 +595,59 @@ public class GeneticOperations {
         return indexWeights.get(CommonCalculator.getOsIndex(indexWeights));
     }
     public void DelOrder(Chromosome chromosome) {
-        List<Entry> allOperations = chromosome.getAllOperations();
-        List<GlobalOperationInfo> globalOpList=  chromosome.getGlobalOpList();
+
         if(chromosome.getOrders()==null||chromosome.getOrders().size()==0)
             return;
         List<Order> orders = chromosome.getOrders();
-        List<Integer> OperationSequencing=  chromosome.getOperationSequencing();
-
-        log("删除前"+OperationSequencing.size(),true);
-
-        log(String.format("半成品订单-删除前，工序: %d,工序序列: %d，设备: %d,设备序列: %d",
-                allOperations.size(), OperationSequencing.size(),globalOpList.size(),chromosome.getMachineSelection().size()),true);
-
         List<Integer> newoorderids= orders.stream()
                 .filter(t->t.isNewSfCreate())
                 .map(Order::getId)
                 .sorted(Comparator.reverseOrder())
                 .collect(Collectors.toList());
         if(newoorderids!=null&&newoorderids.size()>0) {
+            List<Entry> allOperations = chromosome.getAllOperations();
+            List<GlobalOperationInfo> globalOpList = chromosome.getGlobalOpList();
+            List<Integer> OperationSequencing = chromosome.getOperationSequencing();
+
+
+//            log(String.format("半成品订单-删除前，工序: %d,工序序列: %d，设备: %d,设备序列: %d",
+//                    allOperations.size(), OperationSequencing.size(), globalOpList.size(), chromosome.getMachineSelection().size()), true);
+
+
             for (Integer id : newoorderids) {
 
 
                 List<Entry> sourceOps = allOperations.stream()
-                        .filter(o -> o.getGroupId()==id)
+                        .filter(o -> o.getGroupId() == id)
                         .sorted(Comparator.comparing(Entry::getSequence))
                         .collect(Collectors.toList());
 
                 for (Entry entry : sourceOps) {
                     OptionalInt index1 = IntStream.range(0, globalOpList.size())
-                            .filter(h -> entry.getId()==globalOpList.get(h).getOp().getId())
+                            .filter(h -> entry.getId() == globalOpList.get(h).getOp().getId())
                             .findFirst();
-                    globalOpList.remove((int)index1.orElse(0));
+                    globalOpList.remove((int) index1.orElse(0));
 
-                    chromosome.getMachineSelection().remove((int)index1.orElse(0));
+                    chromosome.getMachineSelection().remove((int) index1.orElse(0));
                 }
 
-                chromosome.getOperatRel().remove(id-1);
+                chromosome.getOperatRel().remove(id - 1);
 
             }
-            allOperations.removeIf(t ->newoorderids.contains(t.getGroupId()));
-            OperationSequencing.removeIf(t ->newoorderids.contains(t));
+            allOperations.removeIf(t -> newoorderids.contains(t.getGroupId()));
+            OperationSequencing.removeIf(t -> newoorderids.contains(t));
             AtomicInteger globalOpId = new AtomicInteger(0);
-            globalOpList.forEach(t-> {
+            globalOpList.forEach(t -> {
 
                 t.setGlobalOpId(globalOpId.getAndIncrement());
 
             });
-            orders.removeIf(t ->newoorderids.contains(t.getId()));
+            orders.removeIf(t -> newoorderids.contains(t.getId()));
+
+
+//            log(String.format("半成品订单-删除后，工序: %d,工序序列: %d，设备: %d,设备序列: %d",
+//                    allOperations.size(), OperationSequencing.size(), globalOpList.size(), chromosome.getMachineSelection().size()), true);
+//
         }
     }
     private void log(String message,  boolean enableLogging) {