From 0cb44badbe4d0d6b58c6324d29d3c7193be687f2 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 12 三月 2026 10:53:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lggslasrs' into lggslasrs
---
src/main/java/com/zy/asrs/controller/OpenController.java | 12 +++---------
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 18 +++++++++---------
src/main/resources/application.yml | 2 +-
src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutPauseParam.java | 2 +-
4 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index e8b656c..4a5ae1b 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -120,12 +120,8 @@
* 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())) {
+ 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);
@@ -481,9 +477,7 @@
*/
@PostMapping("/order/pakout/default/v1")
// @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
- public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakoutParam param,
- HttpServletRequest request) {
+ public synchronized R pakoutOrderCreate(@RequestBody OpenOrderPakoutParam param) {
// auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutPauseParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutPauseParam.java
index 7e45467..d08d62b 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutPauseParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutPauseParam.java
@@ -5,7 +5,7 @@
@Data
public class OpenOrderPakoutPauseParam {
- private String orderNo;
+ private String orderId;
private String reason;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 707bbb7..97badcc 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -374,18 +374,18 @@
@Override
@Transactional
public R pakoutOrderPause(OpenOrderPakoutPauseParam param) {
- if (param == null || Cools.isEmpty(param.getOrderNo())) {
+ if (param == null || Cools.isEmpty(param.getOrderId())) {
throw new CoolException("orderNo is empty");
}
- Order order = orderService.selectByNo(param.getOrderNo());
+ Order order = orderService.selectByNo(param.getOrderId());
if (order == null) {
- order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, param.getOrderNo());
+ order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, param.getOrderId());
}
if (order == null) {
- throw new CoolException("order not found: " + param.getOrderNo());
+ throw new CoolException("order not found: " + param.getOrderId());
}
- List<WrkMast> activeTasks = findActiveOutboundTasks(param.getOrderNo());
+ List<WrkMast> activeTasks = findActiveOutboundTasks(param.getOrderId());
if (activeTasks.isEmpty()) {
return R.ok("no active out tasks");
}
@@ -420,7 +420,7 @@
}
Map<String, Object> result = new HashMap<>();
- result.put("orderNo", param.getOrderNo());
+ result.put("orderNo", param.getOrderId());
result.put("pausedCount", pausedCount);
result.put("wcsStopCount", issuedTasks.size());
return R.ok("pause out success").add(result);
@@ -440,8 +440,8 @@
}
if (Objects.equals(param.getExecute(), 2)) {
OpenOrderPakoutPauseParam pauseParam = new OpenOrderPakoutPauseParam();
- pauseParam.setOrderNo(param.getOrderId());
- pauseParam.setReason("OPEN_API_PAUSE");
+// pauseParam.getOrderId(param.getOrderId());
+// pauseParam.setReason("OPEN_API_PAUSE");
return pakoutOrderPause(pauseParam);
}
throw new CoolException("execute only supports 1 or 2");
@@ -582,7 +582,7 @@
private StopOutTaskParams buildStopOutTaskParams(OpenOrderPakoutPauseParam param, List<WrkMast> wrkMasts) {
StopOutTaskParams stopParams = new StopOutTaskParams();
- stopParams.setOrderNo(param.getOrderNo());
+ stopParams.setOrderNo(param.getOrderId());
stopParams.setReason(param.getReason());
for (WrkMast wrkMast : wrkMasts) {
StopOutTaskParams.TaskItem item = new StopOutTaskParams.TaskItem();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5eafde0..e8c6db2 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8081
+ port: 18080
servlet:
context-path: /@pom.build.finalName@
--
Gitblit v1.9.1