From d54a3e85b0de394bbc6d36cb99683b2cccb98bef Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期四, 11 四月 2024 16:01:07 +0800
Subject: [PATCH] #输送线任务下发重写
---
src/main/java/com/zy/asrs/controller/CrnController.java | 144 +++++++++++++++++++++++++++---------------------
1 files changed, 81 insertions(+), 63 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index eb9a0dd..4844ff3 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -376,21 +376,21 @@
@ManagerAuth(memo = "鍏ュ簱")
@PostMapping("/crn/operator/put")
public R crnPut(CrnOperatorParam param){
- // 绯荤粺杩愯鐘舵�佸垽鏂�
- if (SystemProperties.WCS_RUNNING_STATUS.get()) {
- return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
- }
+// // 绯荤粺杩愯鐘舵�佸垽鏂�
+// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+// }
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡
- command.setSourcePosZ(param.getSourceRow()); // 婧愬簱浣嶆帓
- command.setSourcePosX(param.getSourceBay()); // 婧愬簱浣嶅垪
- command.setSourcePosY(param.getSourceLev()); // 婧愬簱浣嶅眰
- command.setDestinationPosZ(param.getRow()); // 鐩爣搴撲綅鎺�
- command.setDestinationPosX(param.getBay()); // 鐩爣搴撲綅鍒�
- command.setDestinationPosY(param.getLev()); // 鐩爣搴撲綅灞�
+ command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓
+ command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪
+ command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰
+ command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
command.setCommand((short)1);
return crnControl(command)?R.ok():R.error();
}
@@ -399,20 +399,21 @@
@PostMapping("/crn/operator/take")
public R crnTake(CrnOperatorParam param){
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (SystemProperties.WCS_RUNNING_STATUS.get()) {
- return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
- }
+// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+// }
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- command.setTaskMode(CrnTaskModeType.PAKOUT); // 浠诲姟妯″紡
- command.setSourcePosZ(param.getSourceRow()); // 婧愬簱浣嶆帓
- command.setSourcePosX(param.getSourceBay()); // 婧愬簱浣嶅垪
- command.setSourcePosY(param.getSourceLev()); // 婧愬簱浣嶅眰
- command.setDestinationPosZ(param.getRow()); // 鐩爣搴撲綅鎺�
- command.setDestinationPosX(param.getBay()); // 鐩爣搴撲綅鍒�
- command.setDestinationPosY(param.getLev()); // 鐩爣搴撲綅灞�
+ command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡
+ command.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓
+ command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪
+ command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰
+ command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
+ command.setCommand((short)1);
return crnControl(command)?R.ok():R.error();
}
@@ -420,9 +421,9 @@
@PostMapping("/crn/operator/stockMove")
public R crnStockMove(CrnOperatorParam param){
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (SystemProperties.WCS_RUNNING_STATUS.get()) {
- return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
- }
+// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+// }
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
@@ -447,9 +448,9 @@
@PostMapping("/crn/operator/siteMove")
public R crnSiteMove(CrnOperatorParam param){
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (SystemProperties.WCS_RUNNING_STATUS.get()) {
- return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
- }
+// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+// }
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
@@ -468,9 +469,9 @@
@PostMapping("/crn/operator/bacOrigin")
public R crnBacOrigin(CrnOperatorParam param){
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (SystemProperties.WCS_RUNNING_STATUS.get()) {
- return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
- }
+// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+// }
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
@@ -489,9 +490,9 @@
@PostMapping("/crn/operator/reverseOrigin")
public R reverseOrigin(CrnOperatorParam param){
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (SystemProperties.WCS_RUNNING_STATUS.get()) {
- return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
- }
+// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+// }
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
@@ -528,9 +529,9 @@
@PostMapping("/crn/operator/taskComplete")
public R crnTaskComplete(CrnOperatorParam param){
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (SystemProperties.WCS_RUNNING_STATUS.get()) {
- return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
- }
+// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+// }
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
@@ -542,6 +543,7 @@
command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞�
+ command.setCommand((short)0);
return crnControl(command)?R.ok():R.error();
}
@@ -561,9 +563,9 @@
@PostMapping("/crn/operator/clearCommand")
public R crnClearCommand(CrnOperatorParam param){
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (SystemProperties.WCS_RUNNING_STATUS.get()) {
- return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
- }
+// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+// }
if (param.getCrnNo() == null) {
throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�");
}
@@ -585,9 +587,9 @@
@PostMapping("/crn/operator/handleReset")
public R handleReset(CrnOperatorParam param) throws Exception {
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (SystemProperties.WCS_RUNNING_STATUS.get()) {
- return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
- }
+// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+// }
if (param.getCrnNo() == null) {
throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�");
}
@@ -610,7 +612,7 @@
crnCommand.setCommand((short) 0); // 浠诲姟瀹屾垚纭浣�
// 寤舵椂鍙戦��
Thread.sleep(1000L);
- if (CommandUtils.offer(SlaveType.Crn, crn.getId(), new Task(2, crnCommand), false)) {
+ if (CommandUtils.offer(SlaveType.Crn, crn.getId(), new Task(5, crnCommand), false)) {
return R.ok();
} else {
throw new CoolException("鍛戒护涓嬪彂澶辫触");
@@ -627,9 +629,9 @@
@PostMapping("/crn/operator/auto")
public R crnAuto(CrnOperatorParam param){
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (SystemProperties.WCS_RUNNING_STATUS.get()) {
- return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
- }
+// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+// }
short[] array = new short[9];
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
@@ -642,9 +644,9 @@
@PostMapping("/crn/operator/semiAutomatic")
public R crnsemiAutomatic(CrnOperatorParam param){
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (SystemProperties.WCS_RUNNING_STATUS.get()) {
- return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
- }
+// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+// }
short[] array = new short[9];
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
@@ -657,9 +659,9 @@
@PostMapping("/crn/operator/hand")
public R onlineWrk1(CrnOperatorParam param){
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (SystemProperties.WCS_RUNNING_STATUS.get()) {
- return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
- }
+// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+// }
short[] array = new short[9];
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
@@ -672,9 +674,9 @@
@PostMapping("/crn/operator/onlineWrk1")
public R onlineWrk2(CrnOperatorParam param){
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (SystemProperties.WCS_RUNNING_STATUS.get()) {
- return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
- }
+// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+// }
short[] array = new short[9];
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
@@ -687,9 +689,9 @@
@PostMapping("/crn/operator/onlineWrk2")
public R onlineWrk3(CrnOperatorParam param){
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (SystemProperties.WCS_RUNNING_STATUS.get()) {
- return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
- }
+// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+// }
short[] array = new short[9];
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
@@ -702,9 +704,9 @@
@PostMapping("/crn/operator/onlineWrk3")
public R onlineWrk4(CrnOperatorParam param){
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (SystemProperties.WCS_RUNNING_STATUS.get()) {
- return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
- }
+// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+// }
short[] array = new short[9];
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
@@ -717,9 +719,9 @@
@PostMapping("/crn/operator/onlineWrk4")
public R crnHand(CrnOperatorParam param){
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (SystemProperties.WCS_RUNNING_STATUS.get()) {
- return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
- }
+// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+// }
short[] array = new short[9];
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
@@ -729,6 +731,22 @@
return crnControl2(command)?R.ok():R.error();
}
+ @ManagerAuth(memo = "澶嶄綅")
+ @PostMapping("/crn/operator/reset")
+ public R crnReset(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+// if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+// return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+// }
+ short[] array = new short[9];
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setReset((short)1);
+
+ return crnControl2(command)?R.ok():R.error();
+ }
+
private boolean crnControl2(CrnCommand command){
--
Gitblit v1.9.1