From 6b9fbba050fcbc7e9478bbd0a008a3b7f08d7a1d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 04 七月 2023 08:44:58 +0800
Subject: [PATCH] map_1.json
---
src/main/java/com/zy/asrs/controller/LiftController.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 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..0436b11 100644
--- a/src/main/java/com/zy/asrs/controller/LiftController.java
+++ b/src/main/java/com/zy/asrs/controller/LiftController.java
@@ -11,9 +11,11 @@
import com.zy.asrs.entity.BasLift;
import com.zy.asrs.service.BasLiftService;
import com.zy.asrs.service.WrkMastService;
+import com.zy.common.service.CommonService;
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;
@@ -41,7 +43,7 @@
@Autowired
private BasLiftService basLiftService;
@Autowired
- private WrkMastService wrkMastService;
+ private CommonService commonService;
@PostMapping("/table/lift/state")
@ManagerAuth(memo = "鎻愬崌鏈轰俊鎭〃")
@@ -56,6 +58,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 +66,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());
@@ -119,6 +122,7 @@
vo.setLineEndHasStock(liftProtocol.getLineEndHasStock());
vo.setInConveyLineCardTrayAlarm(liftProtocol.getInConveyLineCardTrayAlarm());
vo.setOutConveyLineCardTrayAlarm(liftProtocol.getOutConveyLineCardTrayAlarm());
+ vo.setShuttleNo(liftProtocol.getShuttleNo().intValue());
}
return R.ok().add(list);
}
@@ -199,9 +203,10 @@
LiftAssignCommand assignCommand = new LiftAssignCommand();
assignCommand.setLiftNo(liftSlave.getId().shortValue()); // 鎻愬崌鏈虹紪鍙�
- assignCommand.setTaskNo((short) 9999);
+ assignCommand.setTaskNo((short) commonService.getWorkNo(3));//鑾峰彇浠诲姟鍙�
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 +218,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