From a484168b903a919b24d65a5d95dea88a04d8f34c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 26 十二月 2024 13:50:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs
---
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 2a882be..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,8 +83,23 @@
}
@Override
- public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
- return this.baseMapper.queryStock(matnr, batch, orderNo, locNos);
+ 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,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,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,String temp1,String temp2) {
+ return this.baseMapper.queryStockMinAnfme(matnr, batch, orderNo, locNos,supp,temp1,temp2);
}
@Override
@@ -99,11 +114,11 @@
/**
* 鑾峰彇搴撳瓨鎬绘暟
+ *
* @return
*/
@Override
- public Integer sum() {
-
+ public Double sum() {
return this.baseMapper.sum();
}
--
Gitblit v1.9.1