From ab41622d30946f83b34e5a5d881741237628f6f1 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 14:26:39 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/OpenController.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 27a4246..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,9 +109,9 @@
}
} else {
if (!Cools.isEmpty(param.getMsgType()) && param.getMsgType().equalsIgnoreCase("task_complete")) {
- if (wrkMast.getStaNo()==1031){
+ if (wrkMast.getStaNo() == 1031) {
wrkMast.setWrkSts(106L);
- }else {
+ } else {
wrkMast.setWrkSts(14L);
}
}
--
Gitblit v1.9.1