From 7b72d43503aa5df4c152b777777085d3cd5e2132 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 06 十二月 2025 15:49:25 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

---
 src/main/java/com/zy/asrs/controller/MobileController.java |   14 ++++++++++++--
 1 files changed, 12 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 cca516c..dfd728c 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")

--
Gitblit v1.9.1