From ff1fedd00c22aa232541f63ebcaa5a7f929b89b7 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 15 七月 2024 08:28:26 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 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..5b05c7e 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;
@@ -222,18 +222,13 @@
return false;
}
- if (task.getTaskSts() < 100) {//鍏ュ簱鍒ゆ柇鎵樼洏鏄惁杩涘叆鎻愬崌鏈�
- if (!liftProtocol.getHasTray()) {
- return false;
- }
- } else if (task.getTaskSts() >= 100 && task.getTaskSts() < 200) {//鍑哄簱鍒ゆ柇鎵樼洏鏄惁绂诲紑鎻愬崌鏈�
- if (liftProtocol.getHasTray()) {
- return false;
- }
+ //鍒ゆ柇鎻愬崌鏈烘墭鐩樻槸鍚﹀瓨鍦�
+ if (liftProtocol.getHasTray()) {
+ return false;
}
if (motion.getReleaseLift() == 1) {//閲婃斁鎻愬崌鏈�
- task.setLiftNo(null);
+ task.setLiftNo(0);
task.setUpdateTime(new Date());
if (!taskService.updateById(task)) {
return false;
@@ -289,7 +284,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