From e012a72a5660566d698c93ca4f29b6e5ffe997b0 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 29 十月 2025 16:47:35 +0800
Subject: [PATCH] 3077,3106只有合格能出,2041 只有待判能出
---
src/main/java/com/zy/asrs/controller/OpenController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 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 93e089d..28a92e6 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -5,6 +5,7 @@
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.OutLocInfoParam;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.common.web.BaseController;
@@ -159,8 +160,7 @@
@RequestBody List<ProdCheckParam> param,
HttpServletRequest request) {
auth(appkey, param, request);
- openService.prodCheck(param);
- return R.ok();
+ return openService.prodCheck(param);
}
@PostMapping("/xhd")
@@ -199,6 +199,18 @@
HttpServletRequest request) {
auth(appkey, null, request);
return openService.getCrnLaneWayInfo();
+ }
+
+ @PostMapping("/getOutLocInfoByBarcode")
+ @AppAuth(memo = "鏍规嵁鎵樼洏鐮侊紝鑾峰彇鍑哄簱鐗╂枡淇℃伅杩涜澶у睆鏄剧ず")
+ public synchronized R getOutLocInfoByBarcode(@RequestHeader(required = false) String appkey,
+ @RequestBody OutLocInfoParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getBarcode())) {
+ return R.parse("鎵樼洏鐮佷笉鑳戒负绌�");
+ }
+ return openService.getOutLocInfoByBarcode(param.getBarcode());
}
@@ -305,7 +317,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;
@@ -464,6 +476,45 @@
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("/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