From 80d97d40c44165674ee0168be5f08c8ca52d3c06 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 09 六月 2025 09:36:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtwcs' into jxgtwcs
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/LiftDispatcher.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/LiftDispatcher.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/LiftDispatcher.java
index af6aa85..04f5e03 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/LiftDispatcher.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/LiftDispatcher.java
@@ -38,7 +38,7 @@
private NavigateUtils navigateUtils;
/**
- * 鏍规嵁鐩爣浣嶇疆鎼滅储绌洪棽鎻愬崌鏈�
+ * 鏍规嵁鐩爣浣嶇疆鎼滅储鎻愬崌鏈�
* transfer: 鏄惁鍙崲灞�
*/
public LiftThread searchLift(String locNo, Long hostId, Boolean transfer) {
@@ -56,10 +56,6 @@
LiftProtocol liftProtocol = liftThread.getStatus();
if (liftProtocol == null) {
- continue;
- }
-
- if (!liftThread.isIdle()) {
continue;
}
@@ -190,6 +186,22 @@
}
/**
+ * 鑾峰彇杩涙彁鍗囨満寰呮満浣嶄綅缃�
+ */
+ public String getInLiftStandByLocNo(LiftThread liftThread, Integer lev) {
+ Device device = liftThread.getDevice();
+ ShuttleStandby standby = shuttleStandbyService.getOne(new LambdaQueryWrapper<ShuttleStandby>()
+ .eq(ShuttleStandby::getDeviceId, device.getId())
+ .eq(ShuttleStandby::getDeviceLev, lev)
+ .eq(ShuttleStandby::getStatus, 1));
+ if (standby == null) {
+ return null;
+ }
+
+ return standby.getMemo();
+ }
+
+ /**
* 鑾峰彇鎹㈠眰闇�瑕侀攣瀹氱殑璺緞
*/
public List<String> getLockPathByLocNo(LiftThread liftThread, Integer lev) {
--
Gitblit v1.9.1