From 7f1d6410a61bc5a221619f4a7a8f5dcc86eb27b0 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 19 六月 2025 08:28:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CrnController.java | 92 +++++++++++++++++++++++----------------------
1 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 4d02d12..5425e8f 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -307,58 +307,60 @@
return crnControl(command)?R.ok():R.error();
}
- @ManagerAuth(memo = "鍥炲師鐐�")
- @PostMapping("/operator/bacOrigin")
- public R crnBacOrigin(CrnOperatorParam param){
- CrnCommand command = new CrnCommand();
- command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
- command.setTaskNo((short) 0); // 宸ヤ綔鍙�
- command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- command.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡
- command.setSourcePosX((short) 0); // 婧愬簱浣嶆帓
- command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
- command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
- command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞�
- return crnControl(command)?R.ok():R.error();
- }
-
- @ManagerAuth(memo = "鍙嶅師鐐�")
- @PostMapping("/operator/reverseOrigin")
- public R reverseOrigin(CrnOperatorParam param){
- CrnCommand command = new CrnCommand();
- command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
- command.setTaskNo((short) 0); // 宸ヤ綔鍙�
- command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- command.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡
- command.setSourcePosX((short) 0); // 婧愬簱浣嶆帓
- command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
- command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
- command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY((short) 34); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ((short) 5); // 鐩爣搴撲綅灞�
- return crnControl(command)?R.ok():R.error();
- }
-
-// @ManagerAuth(memo = "鍧愭爣绉诲姩")
-// @PostMapping("/operator/coorMove")
-// public R crnCoorMove(CrnOperatorParam param){
+// @ManagerAuth(memo = "鍥炲師鐐�")
+// @PostMapping("/operator/bacOrigin")
+// public R crnBacOrigin(CrnOperatorParam param){
// CrnCommand command = new CrnCommand();
// command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
-// command.setTaskMode(CrnTaskModeType.OFFSET_MOVE); // 浠诲姟妯″紡
-// command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓
-// command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪
-// command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰
-// command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
-// command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
-// command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
-// staNoProcess(param, command);
+// command.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡
+// command.setSourcePosX((short) 0); // 婧愬簱浣嶆帓
+// command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
+// command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
+// command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
+// command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
+// command.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞�
// return crnControl(command)?R.ok():R.error();
// }
+// @ManagerAuth(memo = "鍙嶅師鐐�")
+// @PostMapping("/operator/reverseOrigin")
+// public R reverseOrigin(CrnOperatorParam param){
+// CrnCommand command = new CrnCommand();
+// command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+// command.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡
+// command.setSourcePosX((short) 0); // 婧愬簱浣嶆帓
+// command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
+// command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
+// command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
+// command.setDestinationPosY((short) 34); // 鐩爣搴撲綅鍒�
+// command.setDestinationPosZ((short) 5); // 鐩爣搴撲綅灞�
+// return crnControl(command)?R.ok():R.error();
+// }
+
+ @ManagerAuth(memo = "鍧愭爣绉诲姩")
+ @PostMapping("/operator/crnMove")
+ public R crnCoorMove(CrnOperatorParam param){
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 9999); // 宸ヤ綔鍙�
+ command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ command.setTaskMode(CrnTaskModeType.CRN_MOVE); // 浠诲姟妯″紡
+ command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓
+ command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪
+ command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰
+ command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
+ staNoProcess(param, command);
+
+ boolean offer = MessageQueue.offer(SlaveType.Crn, param.getCrnNo(), new Task(4, command));
+ return offer?R.ok():R.error();
+ }
+
@ManagerAuth(memo = "浠诲姟瀹屾垚")
@PostMapping("/operator/taskComplete")
public R crnTaskComplete(CrnOperatorParam param){
--
Gitblit v1.9.1