From 4c88c0606bb333ac1ad4c1ad536a848f7d27fdb7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 23 四月 2025 12:43:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CrnController.java | 136 ++++++++------------------------------------
1 files changed, 26 insertions(+), 110 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 2ee0692..c459918 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -18,9 +18,8 @@
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
-import com.zy.asrs.service.impl.MainServiceImpl;
import com.zy.asrs.utils.CommandUtils;
-import com.zy.asrs.utils.VersionUtils;
+import com.zy.asrs.utils.CrnOperaUtils;
import com.zy.core.CrnThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
@@ -39,7 +38,6 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -57,9 +55,6 @@
private String wmsUrl;
@Value("${wms.movePath}")
private String movePath;
-
-
-
@Autowired
private SlaveProperties slaveProperties;
@Autowired
@@ -69,9 +64,9 @@
@Autowired
private BasCrnpService basCrnpService;
@Autowired
- private MainServiceImpl mainService;
- @Autowired
private LocMastService locMastService;
+ @Autowired
+ private CrnOperaUtils crnOperaUtils;
@ManagerAuth(memo = "杩涜涓殑鍛戒护")
@@ -380,19 +375,10 @@
// 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.setCommand((short)1);
- return crnControl(command)?R.ok():R.error();
+
+ boolean result = crnOperaUtils.crnPut(param);
+ return result ? R.ok() : R.error();
}
@ManagerAuth(memo = "鍑哄簱")
@@ -402,19 +388,10 @@
// 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.setCommand((short)1);
- return crnControl(command)?R.ok():R.error();
+
+ boolean result = crnOperaUtils.crnTake(param);
+ return result ? R.ok() : R.error();
}
@ManagerAuth(memo = "搴撲綅杞Щ")
@@ -424,24 +401,10 @@
// 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.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())
- .eq("bay1", command.getDestinationPosY()).eq("lev1", command.getDestinationPosZ()));
- VersionUtils.locMoveCheckLocType(sourceLoc, loc);
- return crnControl(command)?R.ok():R.error();
+
+ boolean result = crnOperaUtils.crnStockMove(param);
+ return result ? R.ok() : R.error();
}
@ManagerAuth(memo = "绔欏埌绔�")
@@ -451,18 +414,9 @@
// 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.getSourceStaNo()); // 婧愬簱浣嶆帓
- command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
- command.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰
- command.setDestinationPosX(param.getStaNo()); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
- return crnControl(command)?R.ok():R.error();
+
+ boolean result = crnOperaUtils.crnSiteMove(param);
+ return result ? R.ok() : R.error();
}
@ManagerAuth(memo = "鍥炲師鐐�")
@@ -472,18 +426,9 @@
// 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.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();
+
+ boolean result = crnOperaUtils.crnBacOrigin(param);
+ return result ? R.ok() : R.error();
}
@ManagerAuth(memo = "鍙嶅師鐐�")
@@ -493,18 +438,9 @@
// 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.GO_ORIGIN); // 浠诲姟妯″紡
- command.setSourcePosX((short) 0); // 婧愬簱浣嶆帓
- command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
- command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
- command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY((short) 22); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
- return crnControl(command)?R.ok():R.error();
+
+ boolean result = crnOperaUtils.reverseOrigin(param);
+ return result ? R.ok() : R.error();
}
// @ManagerAuth(memo = "鍧愭爣绉诲姩")
@@ -532,19 +468,8 @@
// 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) 1); // 浠诲姟瀹屾垚纭浣�
- command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
- command.setSourcePosX((short) 0); // 婧愬簱浣嶆帓
- command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
- command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
- command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
- command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
- command.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞�
- command.setCommand((short)0);
- return crnControl(command)?R.ok():R.error();
+ boolean result = crnOperaUtils.crnTaskComplete(param.getCrnNo());
+ return result ? R.ok() : R.error();
}
// @ManagerAuth(memo = "鏆傚仠")
@@ -569,18 +494,9 @@
if (param.getCrnNo() == null) {
throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�");
}
- CrnCommand command = new CrnCommand();
- command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
- command.setTaskNo((short) 0); // 宸ヤ綔鍙�
- command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
- 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();
+
+ boolean result = crnOperaUtils.crnClearCommand(param);
+ return result ? R.ok() : R.error();
}
@ManagerAuth(memo = "鎵嬪姩澶嶄綅")
--
Gitblit v1.9.1