From 3729897e1b92b28a4f6d0ee612cf3bb9465c807d Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 14 四月 2025 15:29:49 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/MobileController.java |   33 +++++++++++++++++++++++++++++++--
 1 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 81c633e..ed791d8 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -272,13 +272,42 @@
     }
 
     @RequestMapping("/comb/auth")
-//    @ManagerAuth(memo = "缁勬墭")
+    @ManagerAuth(memo = "缁勬墭")
     public R comb(@RequestBody CombParam combParam){
 //        mobileService.comb(combParam, getUserId());
-        mobileService.comb(combParam, 9999L);
+        mobileService.comb(combParam, getUserId());
         return R.ok("缁勬墭鎴愬姛");
     }
 
+    @RequestMapping("/kitting/query/auth")
+    @ManagerAuth(memo = "榻愬鍏ュ簱鏌ヨ")
+    public R kittingQuery(@RequestBody CombParam combParam){
+        try {
+            return mobileService.kittingQuery(combParam, getUserId());
+        } catch (Exception e){
+
+        }
+//        return R.ok("榻愬鍏ュ簱鏌ヨ鎴愬姛");
+        return R.error("榻愬鍏ュ簱鏌ヨ澶辫触");
+    }
+
+    @RequestMapping("/kitting/call/auth")
+    @ManagerAuth(memo = "榻愬鍏ュ簱鍛煎彨")
+    public R kittingCall(@RequestParam("locNo") String locNo){
+        mobileService.kittingCall(locNo, getUserId());
+        return R.ok("榻愬鍏ュ簱鍛煎彨鎴愬姛");
+    }
+
+    @RequestMapping("/kitting/call/all/auth")
+    @ManagerAuth(memo = "榻愬鍏ュ簱鍛煎彨")
+    public R kittingCall(@RequestBody CombParam combParam){
+        List<CombParam.CombMat> combMats = combParam.getCombMats();
+        for (CombParam.CombMat locDetl : combMats) {
+            mobileService.kittingCall(locDetl.getMemo(), getUserId());
+        }
+        return R.ok("榻愬鍏ュ簱鍛煎彨鎴愬姛");
+    }
+
     @RequestMapping("/pack/get/auth")
     @ManagerAuth
     public R packGet(@RequestParam String barcode){

--
Gitblit v1.9.1