From d3bf3d3917d8201d64e8e2c66e99afb7099487f9 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 17:01:23 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/OpenController.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index e8f1218..77292c6 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -40,20 +40,33 @@
@Autowired
private WrkMastService wrkMastService;
- @GetMapping("/order/delete/v1")
+ @GetMapping("/pakout/order/delete/v1")
@AppAuth(memo = "璁㈠崟淇℃伅鍒犻櫎")
- public synchronized R orderDelete(@RequestHeader(required = false) String appkey,
- @RequestParam String orderNo,
- HttpServletRequest request) {
+ public synchronized R orderPakinDelete(@RequestHeader(required = false) String appkey,
+ @RequestParam String orderNo,
+ HttpServletRequest request) {
auth(appkey, orderNo, request);
if (Cools.isEmpty(orderNo)) {
return R.parse(BaseRes.PARAM);
}
- openService.orderDelete(orderNo);
+ openService.orderPakinDelete(orderNo);
return R.ok();
}
+ @GetMapping("/pakin/order/delete/v1")
+ @AppAuth(memo = "鍏ュ簱璁㈠崟淇℃伅鍒犻櫎")
+ public synchronized R orderPakoutDelete(@RequestHeader(required = false) String appkey,
+ @RequestParam String orderNo,
+ HttpServletRequest request) {
+ auth(appkey, orderNo, request);
+ if (Cools.isEmpty(orderNo)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ openService.orderPakoutDelete(orderNo);
+ return R.ok();
+
+ }
@PostMapping("/tagSync/v1")
@AppAuth(memo = "鐗╂枡鍒嗙被鍚屾")
@@ -96,7 +109,11 @@
}
} else {
if (!Cools.isEmpty(param.getMsgType()) && param.getMsgType().equalsIgnoreCase("task_complete")) {
- wrkMast.setWrkSts(14L);
+ if (wrkMast.getStaNo() == 1031) {
+ wrkMast.setWrkSts(106L);
+ } else {
+ wrkMast.setWrkSts(14L);
+ }
}
}
wrkMast.setModiTime(new Date());
@@ -186,7 +203,7 @@
if (Cools.isEmpty(param.getOrderType())) {
return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getOrderDetails())) {
+ if (Cools.isEmpty(param.getDetails())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
openService.pakinOrderCreate(param);
@@ -228,7 +245,7 @@
if (Cools.isEmpty(param.getOrderType())) {
return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param.getOrderDetails())) {
+ if (Cools.isEmpty(param.getDetails())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
openService.pakoutOrderCreate(param);
--
Gitblit v1.9.1