From 45a87642e46c746802af13bf47bcd70e3b69277a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 14 十二月 2023 16:49:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CrnController.java | 106 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 86 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 403b11d..eb9a0dd 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -376,51 +376,65 @@
@ManagerAuth(memo = "鍏ュ簱")
@PostMapping("/crn/operator/put")
public R crnPut(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ 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.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓
- command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪
- command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰
- command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
+ 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.setCommand((short)1);
return crnControl(command)?R.ok():R.error();
}
@ManagerAuth(memo = "鍑哄簱")
@PostMapping("/crn/operator/take")
public R crnTake(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ 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.setSourcePosX(param.getSourceRow()); // 婧愬簱浣嶆帓
- command.setSourcePosY(param.getSourceBay()); // 婧愬簱浣嶅垪
- command.setSourcePosZ(param.getSourceLev()); // 婧愬簱浣嶅眰
- command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
+ command.setSourcePosZ(param.getSourceRow()); // 婧愬簱浣嶆帓
+ command.setSourcePosX(param.getSourceBay()); // 婧愬簱浣嶅垪
+ command.setSourcePosY(param.getSourceLev()); // 婧愬簱浣嶅眰
+ command.setDestinationPosZ(param.getRow()); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosX(param.getBay()); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosY(param.getLev()); // 鐩爣搴撲綅灞�
return crnControl(command)?R.ok():R.error();
}
@ManagerAuth(memo = "搴撲綅杞Щ")
@PostMapping("/crn/operator/stockMove")
public R crnStockMove(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ 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.LOC_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()); // 鐩爣搴撲綅灞�
+ 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.setCommand((short)1);
LocMast sourceLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getSourcePosX())
.eq("bay1", command.getSourcePosY()).eq("lev1", command.getSourcePosZ()));
LocMast loc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getDestinationPosX())
@@ -432,6 +446,10 @@
@ManagerAuth(memo = "绔欏埌绔�")
@PostMapping("/crn/operator/siteMove")
public R crnSiteMove(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
@@ -449,6 +467,10 @@
@ManagerAuth(memo = "鍥炲師鐐�")
@PostMapping("/crn/operator/bacOrigin")
public R crnBacOrigin(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
@@ -466,6 +488,10 @@
@ManagerAuth(memo = "鍙嶅師鐐�")
@PostMapping("/crn/operator/reverseOrigin")
public R reverseOrigin(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
@@ -475,8 +501,8 @@
command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY((short) 34); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ((short) 5); // 鐩爣搴撲綅灞�
+ command.setDestinationPosY((short) 22); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
return crnControl(command)?R.ok():R.error();
}
@@ -501,6 +527,10 @@
@ManagerAuth(memo = "浠诲姟瀹屾垚")
@PostMapping("/crn/operator/taskComplete")
public R crnTaskComplete(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
CrnCommand command = new CrnCommand();
command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
@@ -530,6 +560,10 @@
@ManagerAuth(memo = "娓呴櫎鍛戒护")
@PostMapping("/crn/operator/clearCommand")
public R crnClearCommand(CrnOperatorParam param){
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
if (param.getCrnNo() == null) {
throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�");
}
@@ -550,6 +584,10 @@
@ManagerAuth(memo = "鎵嬪姩澶嶄綅")
@PostMapping("/crn/operator/handleReset")
public R handleReset(CrnOperatorParam param) throws Exception {
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+ }
if (param.getCrnNo() == null) {
throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�");
}
@@ -588,6 +626,10 @@
@ManagerAuth(memo = "鍒囨崲鑱旀満妯″紡")
@PostMapping("/crn/operator/auto")
public R crnAuto(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()); // 鍫嗗灈鏈虹紪鍙�
@@ -599,6 +641,10 @@
@ManagerAuth(memo = "鍒囨崲鍗婃墜鍔ㄦā寮�")
@PostMapping("/crn/operator/semiAutomatic")
public R crnsemiAutomatic(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()); // 鍫嗗灈鏈虹紪鍙�
@@ -610,6 +656,10 @@
@ManagerAuth(memo = "鍒囨崲鎵嬪姩妯″紡")
@PostMapping("/crn/operator/hand")
public R onlineWrk1(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()); // 鍫嗗灈鏈虹紪鍙�
@@ -621,6 +671,10 @@
@ManagerAuth(memo = "鐢宠瀹屾垚浠诲姟")
@PostMapping("/crn/operator/onlineWrk1")
public R onlineWrk2(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()); // 鍫嗗灈鏈虹紪鍙�
@@ -632,6 +686,10 @@
@ManagerAuth(memo = "鐢宠鍙栨秷浠诲姟")
@PostMapping("/crn/operator/onlineWrk2")
public R onlineWrk3(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()); // 鍫嗗灈鏈虹紪鍙�
@@ -643,6 +701,10 @@
@ManagerAuth(memo = "娓呴櫎鑱旀満浠诲姟")
@PostMapping("/crn/operator/onlineWrk3")
public R onlineWrk4(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()); // 鍫嗗灈鏈虹紪鍙�
@@ -654,6 +716,10 @@
@ManagerAuth(memo = "鎭㈠鑱旀満浠诲姟")
@PostMapping("/crn/operator/onlineWrk4")
public R crnHand(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()); // 鍫嗗灈鏈虹紪鍙�
--
Gitblit v1.9.1