From b7e0039880d9f6e71230dbf9c13538de4f8135b8 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 10 六月 2023 19:23:26 +0800
Subject: [PATCH] 输送线条码读取bug、出入库模式信号、链条控制信号
---
src/main/java/com/zy/asrs/controller/LiftController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LiftController.java b/src/main/java/com/zy/asrs/controller/LiftController.java
index f88ea21..487738c 100644
--- a/src/main/java/com/zy/asrs/controller/LiftController.java
+++ b/src/main/java/com/zy/asrs/controller/LiftController.java
@@ -14,6 +14,7 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.LiftProtocolStatusType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.LiftSlave;
import com.zy.core.model.Task;
@@ -56,6 +57,7 @@
// 鑾峰彇鎻愬崌鏈轰俊鎭�
LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, basLift.getLiftNo());
if (liftThread == null) {
+ vo.setProtocolStatus(LiftProtocolStatusType.OFFLINE.id);//绂荤嚎
continue;
}
LiftProtocol liftProtocol = liftThread.getLiftProtocol();
@@ -63,7 +65,7 @@
continue;
}
vo.setTaskNo(liftProtocol.getTaskNo()); // 浠诲姟鍙�
- vo.setProtocolStatus(liftProtocol.getProtocolStatusType().desc);
+ vo.setProtocolStatus(liftProtocol.getProtocolStatusType().id);
vo.setLiftLock(liftProtocol.getLiftLock());
vo.setPositionArrivalFeedback(liftProtocol.getPositionArrivalFeedback());
vo.setReady(liftProtocol.getReady());
@@ -202,6 +204,7 @@
assignCommand.setTaskNo((short) 9999);
assignCommand.setTaskMode(param.getLiftTaskMode().shortValue());
assignCommand.setAuto(false);//鎵嬪姩妯″紡
+ assignCommand.setLev(param.getLev());//绉诲姩妤煎眰
if (MessageQueue.offer(SlaveType.Lift, liftSlave.getId(), new Task(3, assignCommand))) {
return R.ok();
--
Gitblit v1.9.1