From 9c0dbc95b469f9f28184afa83fedaaba7a0b8d49 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 12 三月 2026 13:51:43 +0800
Subject: [PATCH] erp出库作业完善 1.出库任务下发给wcs之前会先卡住，等erp发立即出库时再给wcs下发（补丁，后需要删掉） 2.给wcs自动下发出库任务 3.新增出库任务完成后上报erp接口（三次上报失败后直接转历史档这个地方有点问题）
---
src/main/java/com/zy/asrs/controller/OpenController.java | 93 +++++++++++-----------------------------------
1 files changed, 23 insertions(+), 70 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 4832b1e..60af588 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -114,66 +114,9 @@
return R.ok().add(openService.pakinOrderComplete(param));
}
- /**
- * 娣诲姞鍑哄簱鍗�
- */
- @PostMapping("/order/pakout/default/v1")
- @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
- public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakoutParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getOrderNo())) {
- return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrderType())) {
- return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrderDetails())) {
- return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
- }
- openService.pakoutOrderCreate(param);
- return R.ok();
- }
- /**
- * 鎵ц璁㈠崟鍑哄簱
- */
- @PostMapping("/order/pakout/execute/default/v1")
- @AppAuth(memo = "鎵ц璁㈠崟鍑哄簱")
- public synchronized R pakoutOrderExecute(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakoutExecuteParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getOrderId())) {
- return R.error("鍑哄簱鍗曞彿[orderId]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getExecute())) {
- return R.error("鎵ц鍔ㄤ綔[execute]涓嶈兘涓虹┖");
- }
- return openService.pakoutOrderExecute(param);
- }
- /**
- * pause out order
- */
- @PostMapping("/order/pakout/pause/default/v1")
- @AppAuth(memo = "pause out order")
- public synchronized R pakoutOrderPause(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakoutPauseParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param) || Cools.isEmpty(param.getOrderNo())) {
- return R.error("orderNo is empty");
- }
- return openService.pakoutOrderPause(param);
- }
+
/**
* 鍑哄簱鍗曞洖鍐�
@@ -365,7 +308,7 @@
* 鎵樼洏灏辩华鐘舵�佹煡璇�
*/
@PostMapping("/arm/task/loc_status")
- @AppAuth(memo = "鎵樼洏灏辩华鐘舵�佹煡璇�")
+// @AppAuth(memo = "鎵樼洏灏辩华鐘舵�佹煡璇�")
public synchronized R TaskArmLocStatus(@RequestHeader(required = false) String appkey,
@RequestBody ArmOKParam param,
HttpServletRequest request) {
@@ -392,7 +335,7 @@
* 寮傚父涓婃姤
*/
@PostMapping("/armAbnormalOperation")
- @AppAuth(memo = "寮傚父涓婃姤")
+// @AppAuth(memo = "寮傚父涓婃姤")
public synchronized R ArmAbnormalOperation(@RequestHeader(required = false) String appkey,
@RequestBody TaskArmErrorParam param,
HttpServletRequest request) {
@@ -412,7 +355,7 @@
* 璁㈠崟瀹屾垚涓婃姤
*/
@PostMapping("/arm/task/order_result")
- @AppAuth(memo = "璁㈠崟瀹屾垚涓婃姤")
+// @AppAuth(memo = "璁㈠崟瀹屾垚涓婃姤")
public synchronized R TaskArmWorkOrderStatus(@RequestHeader(required = false) String appkey,
@RequestBody OrderArmEndParam param,
HttpServletRequest request) {
@@ -481,15 +424,9 @@
@PostMapping("/comb/auth")
public synchronized R comb(@RequestBody ArrayList<MesToCombParam> param){
for (MesToCombParam mesToCombParam : param) {
- // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
- if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", mesToCombParam.getPalletId()).eq("io_status", "N")) > 0) {
- waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", mesToCombParam.getPalletId()));
- }
-
- if (mesToCombParam.getPalletId().length() != 8) {
- return R.error(mesToCombParam.getPalletId()+"-璇ユ墭鐩樼爜涓嶄负8浣�");
- }
+// if (mesToCombParam.getPalletId().length() != 8) {
+// return R.error(mesToCombParam.getPalletId()+"-璇ユ墭鐩樼爜涓嶄负8浣�");
+// }
// if (param.getCombMats().size()>1){
// throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
// }
@@ -499,6 +436,11 @@
// int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getPalletId()));
if (countLoc > 0 || countWrk > 0) {
return R.error(mesToCombParam.getPalletId()+"-宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�");
+ }
+ // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+ if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+ eq("zpallet", mesToCombParam.getPalletId()).eq("io_status", "N")) > 0) {
+ waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", mesToCombParam.getPalletId()));
}
}
for (MesToCombParam mesToCombParam : param) {
@@ -519,5 +461,16 @@
}
return R.ok();
}
+
+ /**
+ * pause out order
+ */
+ @PostMapping("/order/pakout/pause/default/v1")
+ public synchronized R pakoutOrderPause(@RequestBody OpenOrderPakoutPauseParam param){
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getOrderId())) {
+ return R.error("orderNo is empty");
+ }
+ return openService.pakoutOrderPause(param);
+ }
}
--
Gitblit v1.9.1