From b352221d2a2f4a8e8a1f9a12dda54fa32a8f7e4e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 22 六月 2024 14:44:46 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java
index c8c57b0..c66ac21 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java
@@ -98,6 +98,15 @@
                 if (liftProtocol.getLev() == command.getTargetLev()) {
                     command.setComplete(true);
                 }
+            } else if (command.getMode() == LiftCommandModeType.RESET.id) {
+                //澶嶄綅
+                command.setComplete(true);
+            } else if (command.getMode() == LiftCommandModeType.LOCK.id) {
+                //澶嶄綅
+                command.setComplete(true);
+            } else if (command.getMode() == LiftCommandModeType.UNLOCK.id) {
+                //澶嶄綅
+                command.setComplete(true);
             }
 
             // 鏇存柊redis鏁版嵁
@@ -114,7 +123,6 @@
 
                 //瀵逛富绾跨▼鎶涘嚭绛夊緟纭鐘舵�亀aiting
                 liftThread.setProtocolStatus(LiftProtocolStatusType.WAITING);
-                liftThread.commandFinished(taskNo);//璋冪敤瀹屾垚鍚庣画鎸囦护(閮ㄥ垎鎻愬崌鏈烘湁鍚庣画鎸囦护锛屽疄闄呮儏鍐电湅鏄惁鏈夌湡姝e疄鐜版柟娉�)
                 redisUtil.del(DeviceRedisConstant.LIFT_WORK_FLAG + taskNo);
                 return false;//绂佹鍐嶄笅鍙戝懡浠�
             }

--
Gitblit v1.9.1