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/ManLocDetlServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
index e6b362b..9be4095 100644
--- a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
@@ -90,8 +90,8 @@
}
@Override
- public List<ManLocDetl> 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
--
Gitblit v1.9.1