From d56b8093dc9e3e75f8efe1a0f1aa6d821c9c3dfb Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 15 四月 2025 13:30:35 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
index 09eb424..f8964a1 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
@@ -111,9 +111,15 @@
resThread = this.searchDiffLevShuttle(diffLevDeviceMap, locNo, task);
}
- Task result = generateMoveTask(resThread.getDevice(), locNo);
- if (result != null) {
- return resThread.getDevice();
+ if (resThread != null) {
+ if (resThread.getStatus().getCurrentLocNo().equals(locNo)) {
+ return resThread.getDevice();
+ }
+
+ Task result = generateMoveTask(resThread.getDevice(), locNo);
+ if (result != null) {
+ return resThread.getDevice();
+ }
}
News.info("{}鐩爣搴撲綅娌℃湁鎼滅储鍒板彲鐢ㄧ┛姊溅", locNo);
@@ -140,6 +146,10 @@
continue;
}
+ if (shuttleProtocol.getCurrentLocNo() == null) {
+ continue;
+ }
+
int shuttleLev = Utils.getLev(shuttleProtocol.getCurrentLocNo());
if (shuttleLev == lev) {
currentLevDevices.add(device);
--
Gitblit v1.9.1