From 7dd4ffa405be3d4aaf23b328b5db2b9d485a17d1 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 30 一月 2026 09:00:58 +0800
Subject: [PATCH] 添加移库接口 修改自动下发任务 添加条码入库申请

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

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 2679d9f..61011cb 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -63,9 +63,23 @@
     @PostMapping("/agv/collectionPakin/view")
     @ManagerAuth
     public R pdaAgvCollectionPakinView(@RequestBody CollectionPakinParams params) {
+        if (Objects.isNull(params.getOrgBarcode())) {
+            return R.error("婧愭墭鐩樹笉鑳戒负绌猴紒");
+        }
+        if (Objects.isNull(params.getMatnr())) {
+            return R.error("鐗╂枡缂栫爜涓嶈兘涓虹┖锛侊紒");
+        }
+
         return mobileService.collectionPakinView(params);
     }
 
+    /**
+     * SO/EO 鍖虹粍鎵�
+     * @author Ryan
+     * @date 2025/12/18 15:19
+     * @param params
+     * @return com.core.common.R
+     */
     @PostMapping("/agv/collectionPakin/auth")
     @ManagerAuth
     public R pdaAgvCollectionPakin(@RequestBody CollectionPakinParams params) {
@@ -320,14 +334,14 @@
         return R.ok().add(combParams);
     }
 
-    @ManagerAuth(memo = "缁勬墭")
+    @ManagerAuth(memo = "缂撳啿搴撳叆搴撶粍鎵�")
     @RequestMapping("/comb/auth")
     public R comb(@RequestBody CombParam combParam) {
         mobileService.comb(combParam, getUserId());
         return R.ok("缁勬墭鎴愬姛");
     }
 
-    @ManagerAuth(memo = "缂撳啿搴撳叆搴撶粍鎵�")
+    @ManagerAuth(memo = "缁勬墭")
     @RequestMapping("/cache/comb/auth")
     public R onlineComb(@RequestBody CombParam combParam) {
         if (Objects.isNull(combParam)) {
@@ -337,14 +351,29 @@
         return R.ok("缁勬墭鎴愬姛");
     }
 
+    /**
+     * @author Ryan
+     * @date 2025/9/24
+     * @description: 鍛煎彨AGV杩斿洖
+     * @version 1.0
+     */
+    @ManagerAuth(memo = "鍛煎彨AGV杩斿洖")
+    @RequestMapping("/agv/call/back")
+    public R callAgvBack(@RequestBody AgvCallParams callAgvBackParam) {
+        if (Objects.isNull(callAgvBackParam.getOrgSite())) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖!!");
+        }
+       return mobileService.agvCallback(callAgvBackParam, getUserId());
+    }
+
+
     @ManagerAuth(memo = "缂撳啿搴撶‘璁や笂鏋�(妯℃嫙鐗╃悊鎸夐挳)")
     @RequestMapping("/cache/comb/pub")
     public R cacheCombPub(@RequestBody CompleteParam combParam) {
         if (Objects.isNull(combParam)) {
             return R.error("鍙傛暟涓嶈兘涓虹┖!!");
         }
-        mobileService.combInPub(combParam, 10031L);
-        return R.ok("涓婃灦鎴愬姛");
+       return mobileService.combInPub(combParam, 10031L);
     }
 
     @RequestMapping("/pack/get/auth")

--
Gitblit v1.9.1