From a032e83b86f182f2939454949129adfece45ebed Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 26 九月 2024 16:35:52 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java |    8 ++++----
 1 files changed, 4 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 7c55f48..496ca62 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
@@ -61,7 +61,7 @@
         }
 
         //妫�娴嬫彁鍗囨満鏄惁鏈変换鍔$粦瀹�
-        boolean liftResult = Utils.checkLiftHasBinding(deviceNo, String.valueOf(motion.getTaskNo()));
+        boolean liftResult = Utils.checkLiftHasBinding(liftProtocol.getLiftNo(), String.valueOf(motion.getTaskNo()));
         if (liftResult) {
             //瀛樺湪浠诲姟锛岀姝㈡墽琛�
             return false;
@@ -204,7 +204,7 @@
                 }
 
                 if (motion.getReleaseLift() == 1) {//閲婃斁鎻愬崌鏈�
-                    task.setLiftNo(null);
+                    task.setLiftNo(0);
                     task.setUpdateTime(new Date());
                     if (!taskService.updateById(task)) {
                         return false;
@@ -233,7 +233,7 @@
                 }
 
                 if (motion.getReleaseLift() == 1) {//閲婃斁鎻愬崌鏈�
-                    task.setLiftNo(null);
+                    task.setLiftNo(0);
                     task.setUpdateTime(new Date());
                     if (!taskService.updateById(task)) {
                         return false;
@@ -289,7 +289,7 @@
                 }
 
                 if (motion.getReleaseLift() == 1) {//閲婃斁鎻愬崌鏈�
-                    task.setLiftNo(null);
+                    task.setLiftNo(0);
                     task.setUpdateTime(new Date());
                     if (!taskService.updateById(task)) {
                         return false;

--
Gitblit v1.9.1