From a502dc5a81d42a70e2ba2ad9e4cce97fea2b7669 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 14 一月 2026 15:42:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/PlannerServiceImpl.java | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/PlannerServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PlannerServiceImpl.java
index e7cf395..115fefc 100644
--- a/src/main/java/com/zy/asrs/service/impl/PlannerServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PlannerServiceImpl.java
@@ -237,7 +237,6 @@
}
ArrayList<HashMap<String, Object>> taskDataList = new ArrayList<>();
- Map<String, Integer> outGroupSeqCounter = new HashMap<>();
List<WrkMast> outTasks = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.NEW_OUTBOUND.sts));
for (WrkMast wrkMast : outTasks) {
HashMap<String, Object> t = new HashMap<>();
@@ -294,14 +293,8 @@
}
t.put("eligibleCranes", eligible);
t.put("conveyorPath", new ArrayList<>());
- String group = wrkMast.getWmsWrkNo();
- if (group == null || group.trim().isEmpty()) {
- group = "WCS";
- }
- int seq = outGroupSeqCounter.getOrDefault(group, 0) + 1;
- outGroupSeqCounter.put(group, seq);
- t.put("outGroup", group);
- t.put("outSeq", seq);
+ t.put("outGroup", wrkMast.getBatch());
+ t.put("outSeq", wrkMast.getBatchSeq());
taskDataList.add(t);
}
@@ -417,6 +410,7 @@
config.put("wMakespan", getIntConfig("plannerWeightMakespan", 1000));
config.put("wPriorityEarlyFinish", getIntConfig("plannerWeightPriorityEarlyFinish", 5));
config.put("wWaitTime", getIntConfig("plannerWeightWaitTime", 1));
+ config.put("wOutTardiness", getIntConfig("plannerOutTardiness", 0));
config.put("enableOutDue", getBoolConfig("plannerEnableOutDue", false));
config.put("maxSolveSeconds", getIntConfig("plannerMaxSolveSeconds", 3));
config.put("numSearchWorkers", getIntConfig("plannerNumSearchWorkers", 8));
--
Gitblit v1.9.1