From 2cfa8856fb1fd1ad7f642fd998d1644879abcdb5 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 25 七月 2024 10:02:24 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/LiftCommandService.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 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..9789394 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
@@ -17,6 +17,8 @@
import com.zy.asrs.wcs.rcs.model.enums.LiftProtocolStatusType;
import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
+import com.zy.asrs.wcs.rcs.model.protocol.StaProtocol;
+import com.zy.asrs.wcs.rcs.thread.DevpThread;
import com.zy.asrs.wcs.rcs.thread.LiftThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -61,7 +63,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 +206,7 @@
}
if (motion.getReleaseLift() == 1) {//閲婃斁鎻愬崌鏈�
- task.setLiftNo(null);
+ task.setLiftNo(0);
task.setUpdateTime(new Date());
if (!taskService.updateById(task)) {
return false;
@@ -222,18 +224,27 @@
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;
+ }
+
+ //鍒ゆ柇鐩爣绔欐槸鍚︽湁鎵樼洏
+ Integer conveyorDeviceId = Integer.parseInt(motion.getDockNo());
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Conveyor, conveyorDeviceId);
+ if (devpThread == null) {
+ return false;
+ }
+ StaProtocol staProtocol = devpThread.getStation().get(motion.getTarDrt());
+ if(staProtocol == null) {
+ return false;
+ }
+ if (!staProtocol.isLoading()) {
+ return false;
}
if (motion.getReleaseLift() == 1) {//閲婃斁鎻愬崌鏈�
- task.setLiftNo(null);
+ task.setLiftNo(0);
task.setUpdateTime(new Date());
if (!taskService.updateById(task)) {
return false;
@@ -289,7 +300,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