From 74b35955ebfd42f8a9b31f56a3a9ac5181c96443 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期日, 21 十二月 2025 09:29:49 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OpenController.java | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 0281bfa..42998de 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -7,6 +7,8 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.OutLocInfoParam;
import com.zy.asrs.entity.param.*;
+import com.zy.asrs.mapper.LocDetlMapper;
+import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.OpenService;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -33,6 +35,9 @@
@Autowired
private OpenService openService;
+
+ @Autowired
+ private LocDetlMapper locDetlMapper;
@PostMapping("/scrk")
@AppAuth(memo = "GWMS璋冪敤鐢熸垚鍏ュ簱宸ヤ綔妗�")
@@ -160,8 +165,7 @@
@RequestBody List<ProdCheckParam> param,
HttpServletRequest request) {
auth(appkey, param, request);
- openService.prodCheck(param);
- return R.ok();
+ return openService.prodCheck(param);
}
@PostMapping("/xhd")
@@ -318,7 +322,7 @@
}*/
private void auth(String appkey, Object obj, HttpServletRequest request) {
- log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ log.info("OpenController绫�:銆恵}銆戞帴鍙ｈ璁块棶;appkey:銆恵}銆�;璇锋眰鏁版嵁锛氥�恵}銆�", request.getRequestURI(), appkey, JSON.toJSONString(obj));
request.setAttribute("cache", obj);
if (!auth) {
return;
@@ -477,6 +481,63 @@
return R.ok(param);
}
+ /**
+ * 璁″垝缁勮揣鍗�
+ */
+ @PostMapping("/groupOrderConfirm/auth/v1")
+ @AppAuth(memo = "璁″垝鍗曟嵁涓嬪彂")
+ public synchronized R groupOrderConfirm(@RequestHeader(required = false) String appkey,
+ @RequestBody GroupOrderConfirmParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.groupOrderConfirm(param);
+ return R.ok(param);
+ }
+
+ /**
+ * 閫�搴撳崟锛堝嚭搴擄級
+ */
+ @PostMapping("/returnOrder/auth/v1")
+ @AppAuth(memo = "姝ｅ父閫�搴撳崟鍗曟嵁涓嬪彂")
+ public synchronized R returnOrder(@RequestHeader(required = false) String appkey,
+ @RequestBody ReturnOrderConfirmParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.returnOrder(param);
+ return R.ok(param);
+ }
+
+ /**
+ * 鏄惁鍚堟牸
+ */
+ @PostMapping("/check/auth/v1")
+ @AppAuth(memo = "妫�楠屾槸鍚﹀悎鏍�")
+ public synchronized R check(@RequestHeader(required = false) String appkey,
+ @RequestBody UnQualifiedOrderConfirmParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ List<UnQualifiedOrderConfirmParam.VolumeNumber> volumeNumbers = param.getVolumeNumbers();
+ for (UnQualifiedOrderConfirmParam.VolumeNumber v :volumeNumbers){
+ if (!Cools.isEmpty(v.getVolumeNumber())&&!Cools.isEmpty(param.getQualified())){
+ locDetlMapper.updateQualifiedByBrand(v.getVolumeNumber(), param.getQualified());
+ }
+ }
+ return R.ok(param);
+ }
+
+ /**
+ * 閫�搴撳崟锛堝嚭搴擄級
+ */
+ @PostMapping("/unQualifiedOrder/auth/v1")
+ @AppAuth(memo = "涓嶅悎鏍煎搧閫�搴撳崟鍗曟嵁涓嬪彂")
+ public synchronized R unqualifiedOrder(@RequestHeader(required = false) String appkey,
+ @RequestBody UnQualifiedOrderConfirmParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.unQualifiedOrder(param);
+ return R.ok(param);
+ }
+
/*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
}
--
Gitblit v1.9.1