From b2e9d1f13a8a88e2963f504926234589fa2d2787 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 11 四月 2025 13:45:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fyxc_shuttle_wcs' into fyxc_shuttle_wcs
---
src/main/java/com/zy/core/thread/impl/NyLiftThread.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/NyLiftThread.java b/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
index 77a5e0d..24eac5e 100644
--- a/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
@@ -441,8 +441,11 @@
}
@Override
- public String getLiftStandByLocNo(int lev) {
- return Utils.getLocNo(slave.getStandByRow(), slave.getStandByBay(), lev);
+ public String getLiftStandByLocNo(int lev, boolean in) {
+ if (in) {
+ return Utils.getLocNo(slave.getStandByInRow(), slave.getStandByInBay(), lev);
+ }
+ return Utils.getLocNo(slave.getStandByOutRow(), slave.getStandByOutBay(), lev);
}
@Override
--
Gitblit v1.9.1