From d887f786e04e32e286afa35aa9e7d5f79c73384c Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期一, 02 三月 2026 15:32:40 +0800
Subject: [PATCH] no message

---
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 38b96af..1ac3184 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -60,14 +60,14 @@
         LocDetl locDetl = this.selectOne(new EntityWrapper<LocDetl>()
                 .eq(!Cools.isEmpty(locNo),"loc_no", locNo)
                 .eq(!Cools.isEmpty(locNo),"matnr", matnr)
-                .eq(!Cools.isEmpty(locNo),"batch", batch)
+//                .eq(!Cools.isEmpty(locNo),"batch", batch)
                 .eq(!Cools.isEmpty(brand),"brand", brand)
                 .eq(!Cools.isEmpty(standby1),"standby1", standby1)
-                .eq(!Cools.isEmpty(standby2),"standby2", standby2)
-                .eq(!Cools.isEmpty(standby3),"standby3", standby3)
-                .eq(!Cools.isEmpty(boxType1),"box_type1", boxType1)
-                .eq(!Cools.isEmpty(boxType2),"box_type2", boxType2)
-                .eq(!Cools.isEmpty(boxType3),"box_type3", boxType3)
+//                .eq(!Cools.isEmpty(standby2),"standby2", standby2)
+//                .eq(!Cools.isEmpty(standby3),"standby3", standby3)
+//                .eq(!Cools.isEmpty(boxType1),"box_type1", boxType1)
+//                .eq(!Cools.isEmpty(boxType2),"box_type2", boxType2)
+//                .eq(!Cools.isEmpty(boxType3),"box_type3", boxType3)
         );
         if (Cools.isEmpty(locDetl)) {
             return false;
@@ -131,8 +131,13 @@
 
 
     @Override
-    public List<LocDetl> queryStockAll(String orderNo, Set<String> locNos,String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
-        return this.baseMapper.queryStockAll(orderNo,locNos, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
+    public List<LocDetl> queryStockAll(String orderNo, Set<String> locNos,String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3,List<Long> areaIds) {
+        return this.baseMapper.queryStockAll(orderNo,locNos, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, areaIds);
+    }
+
+    @Override
+    public List<LocDetl> queryStockAllCache(String orderNo, Set<String> locNos,String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3,List<Long> areaIds) {
+        return this.baseMapper.queryStockAllCache(orderNo,locNos, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, areaIds);
     }
 
     @Override

--
Gitblit v1.9.1