From 5e3cd26eb7038849be8d4429ac844389587a6728 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 03 七月 2023 10:23:27 +0800
Subject: [PATCH] 手动操作提升机四向车状态
---
src/main/java/com/zy/asrs/controller/LiftController.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LiftController.java b/src/main/java/com/zy/asrs/controller/LiftController.java
index a6c157c..7768523 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();
@@ -119,6 +121,7 @@
vo.setLineEndHasStock(liftProtocol.getLineEndHasStock());
vo.setInConveyLineCardTrayAlarm(liftProtocol.getInConveyLineCardTrayAlarm());
vo.setOutConveyLineCardTrayAlarm(liftProtocol.getOutConveyLineCardTrayAlarm());
+ vo.setShuttleNo(liftProtocol.getShuttleNo().intValue());
}
return R.ok().add(list);
}
@@ -202,6 +205,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();
@@ -213,4 +217,28 @@
return R.error();
}
+ @PostMapping("/detl/update")
+ @ManagerAuth(memo = "淇敼鏁版嵁")
+ public R liftUpdate(@RequestParam Integer liftNo,
+ @RequestParam Short workNo,
+ @RequestParam String pakMk){
+ for (LiftSlave liftSlave : slaveProperties.getLift()) {
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, liftSlave.getId());
+ if (liftThread == null) {
+ return R.error("plc宸叉帀绾�");
+ }
+ LiftProtocol liftProtocol = liftThread.getLiftProtocol();
+ if (liftProtocol == null) {
+ return R.error("plc宸叉帀绾�");
+ }
+ if (workNo != null) {
+ liftProtocol.setTaskNo(workNo);
+ }
+ if (pakMk != null) {
+ liftProtocol.setPakMk(pakMk.equals("Y"));
+ }
+ }
+ return R.error("plc宸叉帀绾�");
+ }
+
}
--
Gitblit v1.9.1