From 86c03a7e96cab90ab36dfc199c7127aead381466 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 21 六月 2024 19:53:56 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java
index 371cf83..051ea35 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java
@@ -196,11 +196,11 @@
                     return false;
                 }
 
-//                if (!liftProtocol.getLineFrontHasStock() || !liftProtocol.getLineEndHasStock()) {
-//                    return false;
-//                }
-
                 if (!liftProtocol.getLev().equals(Integer.valueOf(motion.getTarget()))) {
+                    return false;
+                }
+
+                if (!liftProtocol.getHasTray()) {
                     return false;
                 }
 
@@ -230,6 +230,10 @@
                     return false;
                 }
 
+                if (!liftProtocol.getHasTray()) {
+                    return false;
+                }
+
                 if (!liftProtocol.getLev().equals(Integer.valueOf(motion.getTarget()))) {
                     return false;
                 }

--
Gitblit v1.9.1