From 8ce4dcbd701b40165b0dbf365f667932cf2a8916 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 06 三月 2026 08:21:15 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/MobileController.java |   10 ++++++++--
 1 files changed, 8 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 b83a1e6..26f6987 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -60,6 +60,13 @@
     @Resource
     private StaDescService staDescService;
 
+    @RequestMapping("/comb/auth")
+    @ManagerAuth(memo = "缁勬墭")
+    public R comb(@RequestBody CombParam combParam){
+        mobileService.comb(combParam, getUserId());
+        return R.ok("缁勬墭鎴愬姛");
+    }
+
 
 
     @RequestMapping("/pda/WarehouseOut/v1")
@@ -103,6 +110,7 @@
     @ManagerAuth(memo = "鑾峰彇鍦ㄥ簱搴撲綅")
     public R locNoF(@RequestParam(required = false) String locNo) {
         Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>()
+                .eq("frozen", 0).eq("deleted", 0)
                 .eq("loc_sts", "F");
         if (!Cools.isEmpty(locNo)) {
             wrapper.like("loc_no", locNo);
@@ -158,8 +166,6 @@
     }
 
 
-
-    
     @RequestMapping("/order/search/orderNo/auth")
     @ManagerAuth
     public R orderSearchByBarcode(@RequestParam String orderNo) {

--
Gitblit v1.9.1