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 | 52 +++++++++++++++-------------------------------------
1 files changed, 15 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 4a5ae1b..60af588 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -116,16 +116,7 @@
- /**
- * 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);
- }
+
/**
* 鍑哄簱鍗曞洖鍐�
@@ -433,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());
// }
@@ -451,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) {
@@ -473,26 +463,14 @@
}
/**
- * 娣诲姞鍑哄簱鍗�
+ * pause out order
*/
- @PostMapping("/order/pakout/default/v1")
-// @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
- public synchronized R pakoutOrderCreate(@RequestBody OpenOrderPakoutParam param) {
-// auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
+ @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");
}
- 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();
+ return openService.pakoutOrderPause(param);
}
}
--
Gitblit v1.9.1