From 69c4fd1134f598dd2a7d46b5d25a541fd566b275 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 09 十二月 2022 14:17:09 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OpenController.java |   46 +++++++++++++++++++++++++++++++---------------
 1 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 19883d4..50f219f 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -7,6 +7,7 @@
 import com.zy.asrs.entity.param.OpenOrderCompleteParam;
 import com.zy.asrs.entity.param.OpenOrderPakinParam;
 import com.zy.asrs.entity.param.OpenOrderPakoutParam;
+import com.zy.asrs.entity.param.PackParam;
 import com.zy.asrs.service.OpenService;
 import com.zy.common.model.DetlDto;
 import com.zy.common.web.BaseController;
@@ -14,6 +15,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -44,12 +46,13 @@
     @PostMapping("/order/pakin/new/package/v1")
     @AppAuth(memo = "鎵撳寘涓婄嚎鎺ュ彛")
     public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
-                                            @RequestParam(required = false) String barcode) {
-        auth(appkey, barcode);
-        if (Cools.isEmpty(barcode)) {
+                                            @RequestBody(required = false) PackParam param,
+                                            HttpServletRequest request) {
+        auth(appkey, param, request);
+        if (Cools.isEmpty(param)) {
             return R.parse(BaseRes.PARAM);
         }
-        openService.packageUp(barcode);
+        openService.packageUp(param);
         return R.ok();
     }
 
@@ -60,8 +63,9 @@
      */
     @PostMapping("/order/pakin/new/default/v1")
     public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
-                                           @RequestBody OpenOrderPakinParam param) {
-        auth(appkey, param);
+                                           @RequestBody OpenOrderPakinParam param,
+                                           HttpServletRequest request) {
+        auth(appkey, param, request);
         if (Cools.isEmpty(param)) {
             return R.parse(BaseRes.PARAM);
         }
@@ -83,8 +87,9 @@
      */
     @PostMapping("/order/pakin/complete/default/v1")
     public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
-                                        @RequestBody(required = false) OpenOrderCompleteParam param) {
-        auth(appkey, param);
+                                             @RequestBody(required = false) OpenOrderCompleteParam param,
+                                             HttpServletRequest request) {
+        auth(appkey, param, request);
         return R.ok().add(openService.pakinOrderComplete(param));
     }
 
@@ -92,11 +97,19 @@
      * 娣诲姞鍑哄簱鍗�
      */
     @PostMapping("/order/pakout/new/default/v1")
+    @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
     public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
-                                           @RequestBody OpenOrderPakoutParam param) {
-        auth(appkey, param);
+                                            @RequestBody OpenOrderPakoutParam param,
+                                            HttpServletRequest request) {
+        auth(appkey, param, request);
         if (Cools.isEmpty(param)) {
             return R.parse(BaseRes.PARAM);
+        }
+        if (Cools.isEmpty(param.getLgort())) {
+            return R.error("鍗曟嵁缂栧彿[lgort]涓嶈兘涓虹┖");
+        }
+        if (!param.getLgort().equals("5006")) {
+            return R.ok();
         }
         if (Cools.isEmpty(param.getOrderNo())) {
             return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
@@ -116,8 +129,9 @@
      */
     @PostMapping("/order/pakout/complete/default/v1")
     public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
-                                        @RequestBody(required = false) OpenOrderCompleteParam param) {
-        auth(appkey, param);
+                                              @RequestBody(required = false) OpenOrderCompleteParam param,
+                                              HttpServletRequest request) {
+        auth(appkey, param, request);
         return R.ok().add(openService.pakoutOrderComplete(param));
     }
 
@@ -126,14 +140,16 @@
      * 搴撳瓨缁熻
      */
     @RequestMapping("/stock/default/v1")
-    public R queryStock(@RequestHeader(required = false) String appkey) {
-        auth(appkey, null);
+    public R queryStock(@RequestHeader(required = false) String appkey,
+                        HttpServletRequest request) {
+        auth(appkey, null, request);
         return R.ok().add(openService.queryStock());
     }
 
 
-    private void auth(String appkey, Object obj) {
+    private void auth(String appkey, Object obj, HttpServletRequest request) {
         log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+        request.setAttribute("cache", obj);
         if (!auth) {
             return;
         }

--
Gitblit v1.9.1