From ddc462832f99c124fbcc9653a0878e18768224cd Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 11 六月 2025 16:19:13 +0800
Subject: [PATCH] #修复bug,检索该排全部空库位进行判断

---
 src/main/java/com/zy/asrs/controller/LocDetlController.java |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 2f91219..c1bd3db 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -13,9 +13,11 @@
 import com.core.common.DateUtils;
 import com.core.common.R;
 import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.ManLocDetl;
 import com.zy.asrs.entity.Mat;
 import com.zy.asrs.mapper.LocDetlMapper;
 import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.ManLocDetlService;
 import com.zy.asrs.service.MatService;
 import com.zy.common.web.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +33,7 @@
 
     @Autowired
     private LocDetlService locDetlService;
+
     @Autowired
     private LocDetlMapper locDetlMapper;
     @Autowired
@@ -80,10 +83,14 @@
                 param.remove("modi_time");
             }
         }
-        return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
+        Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
+        if (stockOut.getRecords().size()==0){
+            stockOut = locDetlService.getStockOut(toPage(1, limit, param, LocDetl.class));
+        }
+        return R.ok(stockOut);
     }
 
-    @RequestMapping(value = "/locDetl/list/auth")
+    @RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 鎺ュ彛闂
     @ManagerAuth
     public R list(@RequestParam(defaultValue = "1")Integer curr,
                   @RequestParam(defaultValue = "10")Integer limit,
@@ -113,6 +120,7 @@
 //        }
         return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
     }
+
 
     private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
         for (Map.Entry<String, Object> entry : map.entrySet()){
@@ -267,4 +275,13 @@
         return R.ok(sum);
     }
 
+    @RequestMapping(value = "/stock/out/list/{locNo}/auth")
+    @ManagerAuth
+    public R stockOutList(@PathVariable("locNo") String locNo){
+        if (Cools.isEmpty(locNo)){
+            return R.error();
+        }
+        return R.ok(locDetlService.selectLocDetl(locNo));
+    }
+
 }

--
Gitblit v1.9.1