From 2ff79b71d902e733a0cf0d70052ace24fa1c479e Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 06 八月 2024 13:50:27 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OpenController.java |   72 +++++++++++++++---------------------
 1 files changed, 30 insertions(+), 42 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 16fe9b4..d3cd4a7 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -34,6 +34,36 @@
     @Autowired
     private OpenService openService;
 
+    @PostMapping("/agv/allowWarehousing")
+    @AppAuth(memo = "鏄惁鍏佽agv鐢宠鍏ュ簱鎺ュ彛")
+    public synchronized R synCallowWarehousing(@RequestHeader(required = false) String appkey,
+                                               @RequestBody(required = false) Map<String,Object> param,
+                                               HttpServletRequest request){
+        auth(appkey, param, request);
+        return openService.synCallowWarehousing();
+    }
+
+    @PostMapping("/agv/warehousing")
+    @AppAuth(memo = "agv鐢宠鍏ュ簱鎺ュ彛")
+    public synchronized R syncWarehousing(@RequestHeader(required = false) String appkey,
+                                          @RequestBody CombParam param,
+                                          HttpServletRequest request){
+        auth(appkey, param, request);
+        return openService.syncWarehousing(param);
+    }
+
+    @PostMapping("/agv/agvAskOpen")
+    @AppAuth(memo = "agv鍑哄叆搴撹姹倃ms寮�闂�")
+    public synchronized R agvAskOpen(@RequestHeader(required = false) String appkey,
+                                     @RequestBody AgvAskOpenParam param,
+                                     HttpServletRequest request) {
+        auth(appkey, param, request);
+        if(Cools.isEmpty(param)) {
+            throw new CoolException("璇锋娴嬪叆搴撳弬鏁帮細" + param);
+        }
+        return openService.agvAskOpen(param);
+    }
+
     @PostMapping("/order/matSync/default/v1")
     @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
     public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@@ -45,48 +75,6 @@
         }
         openService.syncMat(param);
         return R.ok();
-    }
-
-    @PostMapping("/agv/allowWarehousing")
-    @AppAuth(memo = "鏄惁鍏佽agv鐢宠鍏ュ簱鎺ュ彛")
-    public synchronized R synCallowWarehousing(@RequestHeader(required = false) String appkey,
-                                      @RequestBody(required = false) Map<String,Object> param,
-                                      HttpServletRequest request){
-        auth(appkey, param, request);
-        if (Cools.isEmpty(param)) {
-            return R.parse("璇锋眰鍙傛暟涓虹┖");
-        }
-        Object flag = param.get("flag");
-        if(Cools.isEmpty(flag)) {
-            return R.parse("鍙傛暟flag涓嶈兘涓虹┖");
-        }
-
-        return openService.synCallowWarehousing((String) flag);
-    }
-
-    @PostMapping("/agv/warehousing")
-    @AppAuth(memo = "agv鐢宠鍏ュ簱鎺ュ彛")
-    public synchronized R syncWarehousing(@RequestHeader(required = false) String appkey,
-                                          @RequestBody FullStoreParam param,
-                                          HttpServletRequest request){
-        auth(appkey, param, request);
-        return openService.syncWarehousing(param);
-    }
-
-    @PostMapping("/agv/getOutboundMaterials")
-    @AppAuth(memo = "agv鑾峰彇鍑哄簱鐗╂枡淇℃伅")
-    public synchronized R syncGetOutboundMaterials(@RequestHeader(required = false) String appkey,
-                                          @RequestBody Map<String,Object> param,
-                                          HttpServletRequest request){
-        auth(appkey, param, request);
-        if (Cools.isEmpty(param)) {
-            return R.parse("璇锋眰鍙傛暟涓虹┖");
-        }
-        Object flag = param.get("flag");
-        if(Cools.isEmpty(flag)) {
-            return R.parse("鍙傛暟flag涓嶈兘涓虹┖");
-        }
-        return openService.getOutboundMaterials((String) flag);
     }
 
     /****************************************************************************/

--
Gitblit v1.9.1