From d983b88916d7489aa154984b67e1bcfb2f13f5d1 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期二, 06 五月 2025 11:10:43 +0800
Subject: [PATCH] 解决待机位和提升机互锁问题
---
src/main/java/com/zy/core/action/LiftAction.java | 31 ++++++++++---------------------
1 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/core/action/LiftAction.java b/src/main/java/com/zy/core/action/LiftAction.java
index e0b7d2a..d4c177b 100644
--- a/src/main/java/com/zy/core/action/LiftAction.java
+++ b/src/main/java/com/zy/core/action/LiftAction.java
@@ -132,28 +132,17 @@
command.setComplete(true);
}
} else if (command.getMode() == LiftCommandModeType.PALLET_IN.id) {
-// //鎵樼洏鍏�
-// Integer target = liftDispatcher.getLiftLevLogic(liftThread.getDevice().getId().intValue(), command.getTargetLev());
-// if (liftProtocol.getLev() == target) {
-// command.setComplete(true);
-// }
-//
-// //鍒ゆ柇鎻愬崌鏈烘墭鐩樻槸鍚﹀瓨鍦�
-// if (!liftProtocol.getHasTray()) {
-// return false;
-// }
-
+ //鍒ゆ柇鎻愬崌鏈烘墭鐩樻槸鍚﹀瓨鍦�
+ if (!liftProtocol.getHasTray()) {
+ return false;
+ }
+ command.setComplete(true);
} else if (command.getMode() == LiftCommandModeType.PALLET_OUT.id) {
-// //鎵樼洏鍑�
-// Integer target = liftDispatcher.getLiftLevLogic(liftThread.getDevice().getId().intValue(), command.getTargetLev());
-// if (liftProtocol.getLev() == target) {
-// command.setComplete(true);
-// }
-//
-// //鍒ゆ柇鎻愬崌鏈烘墭鐩樻槸鍚﹀瓨鍦�
-// if (liftProtocol.getHasTray()) {
-// return false;
-// }
+ //鍒ゆ柇鎻愬崌鏈烘墭鐩樻槸鍚﹀瓨鍦�
+ if (liftProtocol.getHasTray()) {
+ return false;
+ }
+ command.setComplete(true);
} else if (command.getMode() == LiftCommandModeType.RESET.id) {
//澶嶄綅
command.setComplete(true);
--
Gitblit v1.9.1