From d57b74a4c4d4450de42c28ff6573527474d2f11d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 06 二月 2026 08:58:22 +0800
Subject: [PATCH] 系统激活状态

---
 src/main/java/com/zy/asrs/controller/MobileController.java |    4 ++--
 1 files changed, 2 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 5befdc3..8756d2a 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -105,10 +105,10 @@
     @RequestMapping("/pda/WarehouseOutPickMerge/v1")
     @ManagerAuth(memo = "鎷f枡閫斾腑骞舵澘")
     public R WarehouseOutPickMergeV1(@RequestBody WarehouseOutPickMergeParam param) {
-        if (Cools.isEmpty(param,param.getLocNo(),param.getBarcode(),param.getCombMats())) {
+        if (Cools.isEmpty(param,param.getBarcode(),param.getCombMats())) {
             return R.parse("鍙傛暟涓嶈兘涓虹┖锛�");
         }
-        return mobileService.WarehouseOutPickMergeV1(param, getHostId(), getUserId());
+        return mobileService.WarehouseOutPickMergeV1(param, getUserId());
     }
 
     @RequestMapping("/pick/in")

--
Gitblit v1.9.1