From afe9f011522d1511019fe4e0471c686438845e11 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 09 十二月 2025 19:22:37 +0800
Subject: [PATCH] 入库功能

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

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index cca516c..8f9c84c 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -64,7 +64,7 @@
     @PostMapping("/agv/callEmptyCar")
     @ManagerAuth
     public R pdaAgvFinishedCall(@RequestBody AgvCallParams params){
-        return mobileService.callEmptyCar(params);
+        return mobileService.callEmptyCar(params, getUserId());
     }
 
     @RequestMapping("/pda/WarehouseOut/v1")
@@ -173,11 +173,21 @@
         return mobileService.callAgvMove(params, getUserId());
     }
 
+    @PostMapping("/collection/agv/call")
+    @ApiOperation("闆嗚揣鍖哄叆搴�")
+    @ManagerAuth
+    public R CollectionInCall(@RequestBody AgvCallParams params) {
+        if (Objects.isNull(params)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        return mobileService.collectionInCall(params, getUserId());
+    }
+
 
     /**
      * @author Ryan
      * @date 2025/11/3
-     * @description: 鍛煎彨AGV鎼繍缂撳瓨鍖�/EO/SO
+     * @description: 鍛煎彨AGV鎼繍鍏ュ簱缂撳瓨鍖�/EO/SO
      * @version 1.0
      */
     @PostMapping("/cache/out/call")
@@ -189,6 +199,42 @@
         }
         return mobileService.OutCallAgv(params, getUserId());
     }
+
+    /**
+     * 缂撳瓨鍖哄嚭搴撶粍鎵樹笂鏋�
+     * @author Ryan
+     * @date 2025/12/8 13:45
+     * @param params
+     * @return com.core.common.R
+     */
+    @ManagerAuth
+    @ApiOperation("缂撳瓨鍑哄簱涓婃灦")
+    @PostMapping("/commb/task/pub")
+    public R combPub(@RequestBody AgvCallParams params) {
+        if (Objects.isNull(params)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        return mobileService.combOutPub(params);
+    }
+
+
+    /**
+     * 缂撳瓨鍖哄嚭搴撶粍鎵樹笂鏋�
+     * @author Ryan
+     * @date 2025/12/8 13:45
+     * @param params
+     * @return com.core.common.R
+     */
+    @ManagerAuth
+    @ApiOperation("缂撳瓨鍑哄簱鍒楄〃")
+    @PostMapping("/cache/task/list")
+    public R combCacehList(@RequestBody AgvCallParams params) {
+        if (Objects.isNull(params)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        return mobileService.combCacehList(params);
+    }
+
 
 
     // 缁勬墭 ----------------------------------------------------------------------------------------------------
@@ -264,13 +310,38 @@
         return R.ok().add(combParams);
     }
 
-    @RequestMapping("/comb/auth")
+
+
     @ManagerAuth(memo = "缁勬墭")
+    @RequestMapping("/comb/auth")
     public R comb(@RequestBody CombParam combParam){
         mobileService.comb(combParam, getUserId());
         return R.ok("缁勬墭鎴愬姛");
     }
 
+
+    @ManagerAuth(memo = "缂撳啿搴撳叆搴撶粍鎵�")
+    @RequestMapping("/cache/comb/auth")
+    public R onlineComb(@RequestBody CombParam combParam) {
+        if (Objects.isNull(combParam)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        mobileService.cacheComb(combParam, getUserId());
+        return R.ok("缁勬墭鎴愬姛");
+    }
+
+
+    @ManagerAuth(memo = "缂撳啿搴撶‘璁や笂鏋�(妯℃嫙鐗╃悊鎸夐挳)")
+    @RequestMapping("/cache/comb/pub")
+    public R cacheCombPub(@RequestBody CompleteParam combParam) {
+        if (Objects.isNull(combParam)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖!!");
+        }
+        mobileService.combInPub(combParam, getUserId());
+        return R.ok("涓婃灦鎴愬姛");
+    }
+
+
     @RequestMapping("/pack/get/auth")
     @ManagerAuth
     public R packGet(@RequestParam String barcode){

--
Gitblit v1.9.1