Commit 1c3a79db authored by Tong Li's avatar Tong Li

已有半成品工单,优先级

parent 20177850
...@@ -62,7 +62,7 @@ public class Entry { ...@@ -62,7 +62,7 @@ public class Entry {
/** /**
* 基因编号 * 基因编号
*/ */
public double Priority; public double Priority=1;
/** /**
* 基因编号 * 基因编号
*/ */
......
...@@ -253,7 +253,7 @@ public class RoutingDataService { ...@@ -253,7 +253,7 @@ public class RoutingDataService {
entry.setMachineOptions(mos); entry.setMachineOptions(mos);
} }
} }
entry.setPriority(1);
entrys.add(entry); entrys.add(entry);
} }
// 输出每个节点的详细信息 // 输出每个节点的详细信息
......
...@@ -341,6 +341,10 @@ order.setDueDate(LocalDateTime.of(2025, 12, 1,0,0,0)); ...@@ -341,6 +341,10 @@ order.setDueDate(LocalDateTime.of(2025, 12, 1,0,0,0));
Set<Long> machineIds=(Set<Long>)list.get(3); Set<Long> machineIds=(Set<Long>)list.get(3);
// 按照优先级排序
entrys.sort(
Comparator.comparing(Entry::getPriority)
);
machines= machines.stream().filter(t->machineIds.contains(t.getId())).collect(Collectors.toList()); machines= machines.stream().filter(t->machineIds.contains(t.getId())).collect(Collectors.toList());
...@@ -938,10 +942,10 @@ private GlobalParam InitGlobalParam() ...@@ -938,10 +942,10 @@ private GlobalParam InitGlobalParam()
// 执行 // 执行
orderSortService.assignPriority(orders, rule); orderSortService.assignPriority(orders, rule);
// 按照优先级排序 // // 按照优先级排序
orders.sort( // orders.sort(
Comparator.comparing(Order::getActualPriority) // Comparator.comparing(Order::getActualPriority)
); // );
return orders; return orders;
} }
......
...@@ -37,7 +37,7 @@ public class PlanResultServiceTest { ...@@ -37,7 +37,7 @@ public class PlanResultServiceTest {
// nsgaiiUtils.Test(); // nsgaiiUtils.Test();
// planResultService.execute2("31EC5BAF7F6B41DFB79AB031D81C53C0"); // planResultService.execute2("31EC5BAF7F6B41DFB79AB031D81C53C0");
planResultService.execute2("8B13052B347B4FC4B21D59E685B06642"); planResultService.execute2("4072BCD6A43B468F96489211AD041A26");
// LocalDateTime t= LocalDateTime.of(2025, 11, 15, 6, 51, 11); // LocalDateTime t= LocalDateTime.of(2025, 11, 15, 6, 51, 11);
// List<Integer> opids=new ArrayList<>(); // List<Integer> opids=new ArrayList<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment