From 57ba7234c7abfe11a5160f0500b62d481ac5185c Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期三, 14 十二月 2022 16:11:28 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OpenController.java |   54 +++++++++++-------------------------------------------
 1 files changed, 11 insertions(+), 43 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cb34a46..8992331 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -46,23 +46,6 @@
         return R.ok();
     }
 
-    /****************************************************************************/
-    /********************************* 鎵撳寘涓婄嚎 **********************************/
-    /****************************************************************************/
-
-//    @PostMapping("/order/pakin/new/package/v1")
-//    @AppAuth(memo = "鎵撳寘涓婄嚎鎺ュ彛")
-//    public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
-//                                            @RequestBody(required = false) PackParam param,
-//                                            HttpServletRequest request) {
-//        auth(appkey, param, request);
-//        if (Cools.isEmpty(param)) {
-//            return R.parse(BaseRes.PARAM);
-//        }
-//        openService.packageUp(param);
-//        return R.ok();
-//    }
-
     /**
      * 娣诲姞鍏ュ簱鍗�
      */
@@ -87,16 +70,6 @@
         return R.ok();
     }
 
-    /**
-     * 鍏ュ簱鍗曞洖鍐�
-     */
-    @PostMapping("/order/pakin/complete/default/v1")
-    public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
-                                             @RequestBody(required = false) OpenOrderCompleteParam param,
-                                             HttpServletRequest request) {
-        auth(appkey, param, request);
-        return R.ok().add(openService.pakinOrderComplete(param));
-    }
 
     /**
      * 娣诲姞鍑哄簱鍗�
@@ -109,12 +82,6 @@
         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]涓嶈兘涓虹┖");
@@ -129,16 +96,6 @@
         return R.ok();
     }
 
-    /**
-     * 鍑哄簱鍗曞洖鍐�
-     */
-    @PostMapping("/order/pakout/complete/default/v1")
-    public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
-                                              @RequestBody(required = false) OpenOrderCompleteParam param,
-                                              HttpServletRequest request) {
-        auth(appkey, param, request);
-        return R.ok().add(openService.pakoutOrderComplete(param));
-    }
 
 
     /**
@@ -163,6 +120,13 @@
         if (!APP_KEY_LIST.contains(appkey)) {
             throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
         }
+    }
+
+    /*******************************************************    鏁板瓧瀛敓    *******************************************************/
+
+    @PostMapping("/wrkdetl")
+    public R getInOutDetl(){
+        return openService.getInOutDetl();
     }
 
     public static void main(String[] args) {
@@ -204,4 +168,8 @@
         System.out.println(JSON.toJSONString(param1));
     }
 
+
+
+
+
 }

--
Gitblit v1.9.1