From b49472f96cd9b545036cdf28fb4e5111737b080e Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 14 三月 2023 12:57:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 8386e2e..8b0f93a 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -37,6 +37,8 @@
List<LocDetl> getStockStatis(Map<String, Object> map);
+ List<LocDetl> getStockStatis2(Map<String, Object> map);
+
Integer getStockStatisCount(Map<String, Object> map);
List<LocDetl> getStockStatisExcel();
@@ -52,9 +54,9 @@
// -------------------------------------------------
- List<QueryStockPreDo> queryStockPre(@Param("matnr")String matnr);
+ List<QueryStockPreDo> queryStockPre(@Param("matnr")String matnr, @Param("batch")String batch);
- List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("no") Integer no, @Param("bay") Integer bay);
+ List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("no") Integer no, @Param("orderBy") String orderBy, @Param("bay") Integer bay);
Double queryStockAnfme(String matnr, String batch);
--
Gitblit v1.9.1