From 1edc46cc37adb14e30c80c22491d770bfe9214d1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 29 六月 2023 11:35:59 +0800
Subject: [PATCH] 优化寻车，出库问题
---
src/main/java/com/zy/core/thread/ShuttleThread.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/ShuttleThread.java b/src/main/java/com/zy/core/thread/ShuttleThread.java
index 88b5ab8..029180e 100644
--- a/src/main/java/com/zy/core/thread/ShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/ShuttleThread.java
@@ -804,6 +804,10 @@
}
}
+ if (commands.size() == 0) {
+ return false;
+ }
+
//鍙栧嚭鍛戒护
ShuttleCommand command = commands.get(commandStep);
@@ -1069,8 +1073,13 @@
}
private boolean executeLift(LiftThread liftThread, LiftProtocol liftProtocol, ShuttleRedisCommand redisCommand, Integer shuttleLocNoLev) {//璋冨害鎻愬崌鏈�
- if (liftProtocol.getRunning()) {
- //鎻愬崌鏈鸿繍琛屼腑锛岀姝笅鍙�
+ if (!liftProtocol.isIdle()) {
+ //鎻愬崌鏈轰笉绌洪棽绂佹涓嬪彂
+ return false;
+ }
+
+ if (liftProtocol.getPlatShuttleCheck()) {
+ //鎻愬崌鏈哄唴鏈夎溅绂佹涓嬪彂
return false;
}
--
Gitblit v1.9.1