From 2c799e6d26c726e3943f24e61c84f7d562087cfc Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 26 六月 2025 10:20:12 +0800
Subject: [PATCH] #增加堆垛机12物料衔接类型

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

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 2ac0161..6115bfe 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -199,6 +199,14 @@
         return R.ok("缁勬墭鎴愬姛");
     }
 
+    @RequestMapping("/combAuto/auth")
+    @ManagerAuth(memo = "缁勬墭")
+    public R combAuto(@RequestBody CombParam combParam){
+//        mobileService.comb(combParam, getUserId());
+        mobileService.comb(combParam, getUserId());
+        return R.ok("缁勬墭鎴愬姛");
+    }
+
     @RequestMapping("/kitting/query/auth")
     @ManagerAuth(memo = "榻愬鍏ュ簱鏌ヨ")
     public R kittingQuery(@RequestBody CombParam combParam){
@@ -218,7 +226,7 @@
         return R.ok("榻愬鍏ュ簱鍛煎彨鎴愬姛");
     }
 
-    @RequestMapping("/kitting/call/all/auth")
+    @RequestMapping("/kitting/call/all/auth")//瀵�  鍓嶇鏀逛笉浜嗕竴鐐�
     @ManagerAuth(memo = "榻愬鍏ュ簱鍛煎彨")
     public R kittingCall(@RequestBody CombParam combParam){
         List<CombParam.CombMat> combMats = combParam.getCombMats();
@@ -227,6 +235,17 @@
         }
         return R.ok("榻愬鍏ュ簱鍛煎彨鎴愬姛");
     }
+    @RequestMapping("/loc/origin/query/auth")
+    @ManagerAuth(memo = "搴撳瓨鏌ヨ")
+    public R locOriginQuery(@RequestParam("barcode") String barcode){
+        List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("zpallet", barcode));
+        return R.ok("鍦ㄥ簱鏍囪淇敼鎴愬姛").add(locDetlList);
+    }
+    @RequestMapping("/loc/origin/in/out/auth")
+    @ManagerAuth(memo = "鍦ㄥ簱鏍囪淇敼")
+    public R locOriginInOut(@RequestBody LocDetl locDetl){
+        return mobileService.locOriginInOut(locDetl, getUserId());
+    }
 
     @RequestMapping("/pack/get/auth")
     @ManagerAuth

--
Gitblit v1.9.1