From feffb217f48212aa3f8fb8a0e2d3181b1db8ac73 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期日, 01 二月 2026 17:19:16 +0800
Subject: [PATCH] no message

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

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 1ca86a6..61011cb 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -63,6 +63,13 @@
     @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);
     }
 
@@ -327,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)) {
@@ -356,7 +363,6 @@
         if (Objects.isNull(callAgvBackParam.getOrgSite())) {
             return R.error("鍙傛暟涓嶈兘涓虹┖!!");
         }
-    
        return mobileService.agvCallback(callAgvBackParam, getUserId());
     }
 
@@ -367,8 +373,7 @@
         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