From a5e6584d1363b6d2754bd3abd9e7d288a05330df Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 29 七月 2025 15:42:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

---
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |   16 ++++++++--------
 1 files changed, 8 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 f1d3231..735f7e6 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -83,23 +83,23 @@
     }
 
     @Override
-    public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos,String supp) {
-        return this.baseMapper.queryStock(matnr, batch, orderNo, locNos,supp);
+    public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2) {
+        return this.baseMapper.queryStock(matnr, batch, orderNo, locNos,supp,temp1,temp2);
     }
 
     @Override
-    public List<LocDetl> queryStockCrn(String matnr, String batch, String orderNo, Set<String> locNos,String supp) {
-        return this.baseMapper.queryStockCrn(matnr, batch, orderNo, locNos,supp);
+    public List<LocDetl> queryStockCrn(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2) {
+        return this.baseMapper.queryStockCrn(matnr, batch, orderNo, locNos,supp,temp1,temp2);
     }
 
     @Override
-    public List<LocDetl> queryStockFour(String matnr, String batch, String orderNo, Set<String> locNos,String supp) {
-        return this.baseMapper.queryStockFour(matnr, batch, orderNo, locNos,supp);
+    public List<LocDetl> queryStockFour(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2) {
+        return this.baseMapper.queryStockFour(matnr, batch, orderNo, locNos,supp,temp1,temp2);
     }
 
     @Override
-    public List<LocDetl> queryStockMinAnfme(String matnr, String batch, String orderNo, Set<String> locNos,String supp) {
-        return this.baseMapper.queryStockMinAnfme(matnr, batch, orderNo, locNos,supp);
+    public List<LocDetl> queryStockMinAnfme(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2) {
+        return this.baseMapper.queryStockMinAnfme(matnr, batch, orderNo, locNos,supp,temp1,temp2);
     }
 
     @Override

--
Gitblit v1.9.1