From bfbb0cbe87bbacbaf3fdfb5fb3caa935ec91da1f Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期六, 10 一月 2026 16:23:36 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/controller/DualCrnController.java | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/DualCrnController.java b/src/main/java/com/zy/asrs/controller/DualCrnController.java
index b33e029..1d9123d 100644
--- a/src/main/java/com/zy/asrs/controller/DualCrnController.java
+++ b/src/main/java/com/zy/asrs/controller/DualCrnController.java
@@ -56,15 +56,13 @@
vo.setLoading(p.getLoaded() != null && p.getLoaded() == 1 ? "鏈夌墿" : "鏃犵墿");
vo.setLoadingTwo(p.getLoadedTwo() != null && p.getLoadedTwo() == 1 ? "鏈夌墿" : "鏃犵墿");
vo.setBay(p.getBay());
- vo.setBayTwo(p.getBayTwo());
vo.setLev(p.getLevel());
- vo.setLevTwo(p.getLevelTwo());
vo.setForkOffset(p.getForkPosType() == null ? "-" : p.getForkPosType().desc);
vo.setForkOffsetTwo(p.getForkPosTypeTwo() == null ? "-" : p.getForkPosTypeTwo().desc);
vo.setLiftPos(p.getLiftPosType() == null ? "-" : p.getLiftPosType().desc);
- vo.setLiftPosTwo(p.getLiftPosTypeTwo() == null ? "-" : p.getLiftPosTypeTwo().desc);
vo.setWalkPos(p.getWalkPos() != null && p.getWalkPos() == 0 ? "鍦ㄥ畾浣�" : "涓嶅湪瀹氫綅");
- vo.setWalkPosTwo(p.getWalkPosTwo() != null && p.getWalkPosTwo() == 0 ? "鍦ㄥ畾浣�" : "涓嶅湪瀹氫綅");
+ vo.setTaskReceive(p.getTaskReceive() != null && p.getTaskReceive() == 1 ? "鎺ユ敹" : "鏃犱换鍔�");
+ vo.setTaskReceiveTwo(p.getTaskReceiveTwo() != null && p.getTaskReceiveTwo() == 1 ? "鎺ユ敹" : "鏃犱换鍔�");
vo.setXspeed(p.getXSpeed());
vo.setYspeed(p.getYSpeed());
vo.setZspeed(p.getZSpeed());
@@ -101,9 +99,46 @@
return R.error("绾跨▼涓嶅瓨鍦�");
}
DualCrnCommand command = crnThread.getPickAndPutCommand(sourceLocNo, targetLocNo, 9999, crnNo, station);
- MessageQueue.offer(SlaveType.DualCrn, crnNo, new Task(2, command));
+ MessageQueue.offer(SlaveType.DualCrn, crnNo, new Task(3, command));
return R.ok();
}
+
+ @PostMapping("/dualcrn/command/pick")
+ @ManagerAuth(memo = "鍙屽伐浣嶅爢鍨涙満鍙栬揣鍛戒护")
+ public R dualCrnCommandPick(@RequestBody DualCrnCommandParam param) {
+ if (Cools.isEmpty(param)) {
+ return R.error("缂哄皯鍙傛暟");
+ }
+ Integer crnNo = param.getCrnNo();
+ String targetLocNo = param.getTargetLocNo();
+ Integer station = param.getStation();
+ DualCrnThread crnThread = (DualCrnThread) SlaveConnection.get(SlaveType.DualCrn, crnNo);
+ if (crnThread == null) {
+ return R.error("绾跨▼涓嶅瓨鍦�");
+ }
+ DualCrnCommand command = crnThread.getPickCommand(targetLocNo, 9999, crnNo, station);
+ MessageQueue.offer(SlaveType.DualCrn, crnNo, new Task(3, command));
+ return R.ok();
+ }
+
+ @PostMapping("/dualcrn/command/put")
+ @ManagerAuth(memo = "鍙屽伐浣嶅爢鍨涙満鏀捐揣鍛戒护")
+ public R dualCrnCommandPut(@RequestBody DualCrnCommandParam param) {
+ if (Cools.isEmpty(param)) {
+ return R.error("缂哄皯鍙傛暟");
+ }
+ Integer crnNo = param.getCrnNo();
+ String targetLocNo = param.getTargetLocNo();
+ Integer station = param.getStation();
+ DualCrnThread crnThread = (DualCrnThread) SlaveConnection.get(SlaveType.DualCrn, crnNo);
+ if (crnThread == null) {
+ return R.error("绾跨▼涓嶅瓨鍦�");
+ }
+ DualCrnCommand command = crnThread.getPutCommand(targetLocNo, 9999, crnNo, station);
+ MessageQueue.offer(SlaveType.DualCrn, crnNo, new Task(3, command));
+ return R.ok();
+ }
+
@PostMapping("/dualcrn/command/move")
@ManagerAuth(memo = "鍙屽伐浣嶅爢鍨涙満绉诲姩鍛戒护")
@@ -120,9 +155,9 @@
}
DualCrnCommand command = crnThread.getMoveCommand(targetLocNo, 9999, crnNo);
if (station != null) {
- command.setStation(station.shortValue());
+ command.setStation(station);
}
- MessageQueue.offer(SlaveType.DualCrn, crnNo, new Task(2, command));
+ MessageQueue.offer(SlaveType.DualCrn, crnNo, new Task(3, command));
return R.ok();
}
@@ -139,7 +174,7 @@
return R.error("绾跨▼涓嶅瓨鍦�");
}
DualCrnCommand command = crnThread.getResetCommand(crnNo, station);
- MessageQueue.offer(SlaveType.DualCrn, crnNo, new Task(2, command));
+ MessageQueue.offer(SlaveType.DualCrn, crnNo, new Task(3, command));
return R.ok();
}
}
--
Gitblit v1.9.1