From 4a09820519af817c7423abee62da3bd70a7f1afd Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期六, 19 四月 2025 12:58:38 +0800
Subject: [PATCH] qw
---
src/main/java/com/zy/asrs/controller/OpenController.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 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 232f521..9789baa 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2022/4/8
@@ -38,17 +39,37 @@
@Autowired
private WrkMastService wrkMastService;
+ @GetMapping("/order/delete/v1")
+ @AppAuth(memo = "璁㈠崟淇℃伅鍒犻櫎")
+ public synchronized R orderDelete(@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);
+ return R.ok();
+
+ }
+
@PostMapping("/tagSync/v1")
@AppAuth(memo = "鐗╂枡鍒嗙被鍚屾")
public synchronized R tagSync(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) List<TagParam> param,
+ @RequestBody(required = false) List<Map<String,String>> param,
HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- openService.syncTag(param);
+ ArrayList<TagParam> params = new ArrayList<>();
+ for (Map<String,String> map : param) {
+ TagParam tagParam = new TagParam(map);
+ params.add(tagParam);
+ }
+
+ openService.syncTag(params);
return R.ok();
}
@@ -59,22 +80,22 @@
public synchronized R wrkMastFinish(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) ShuttleFinishParam param,
HttpServletRequest request) {
- auth(appkey, param, request);
+ //auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
try {
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getTaskNo()).eq("crn_no",7));
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getSuperTaskNo()).eq("crn_no",7));
if (Cools.isEmpty(wrkMast)) {
throw new CoolException("鍥涘悜搴撲换鍔℃湭鎵惧埌");
}
- if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 53 || wrkMast.getIoType() == 54 || wrkMast.getIoType() == 57) {
+ if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10|| wrkMast.getIoType() == 11 || wrkMast.getIoType() == 53 || wrkMast.getIoType() == 54 || wrkMast.getIoType() == 57) {
wrkMast.setWrkSts(4L);
}else {
wrkMast.setWrkSts(14L);
}
if (!wrkMastService.updateById(wrkMast)){
- return R.error();
+ return R.error("鏇存柊澶辫触");
}
}catch (Exception e) {
throw new CoolException(e);
@@ -87,7 +108,6 @@
@PostMapping("/locDetl/select/time/v1")
- @AppAuth(memo = "鏃堕棿鑾峰彇搴撳瓨淇℃伅")
public synchronized R locDetlSelect(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) TimeSelectParam param,
HttpServletRequest request) {
--
Gitblit v1.9.1