From 59166bd9627ce8d66b85b6af168bd55be71c14c1 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 11 三月 2026 15:29:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 42ea5ea..4832b1e 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -140,6 +140,42 @@
}
/**
+ * 鎵ц璁㈠崟鍑哄簱
+ */
+ @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);
+ }
+
+ /**
* 鍑哄簱鍗曞洖鍐�
*/
// @PostMapping("/order/pakout/complete/default/v1")
@@ -448,7 +484,7 @@
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
eq("zpallet", mesToCombParam.getPalletId()).eq("io_status", "N")) > 0) {
- return R.error(mesToCombParam.getPalletId()+"-璇ユ墭鐩樼爜宸茬粡瀛樺湪缁勬墭妗ｄ腑");
+ waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", mesToCombParam.getPalletId()));
}
if (mesToCombParam.getPalletId().length() != 8) {
@@ -483,7 +519,5 @@
}
return R.ok();
}
-
-
-
}
+
--
Gitblit v1.9.1