From 7e5e4b43f4bcd7248325e1e1a5f10c61d64e93d3 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期六, 03 十二月 2022 13:12:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs

---
 src/main/java/com/zy/asrs/mapper/LocDetlMapper.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index a0e6b4a..ab04539 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();
@@ -54,7 +56,7 @@
 
     List<QueryStockPreDo> queryStockPre(@Param("matnr")String matnr);
 
-    List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("no") Integer no, @Param("bay") Integer bay);
+    List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("no") Integer no, @Param("orderBy") String orderBy, @Param("bay") Integer bay);
 
     Double queryStockAnfme(String matnr, String batch);
 
@@ -65,4 +67,9 @@
 
     List<LocDetl> unreason();
 
+    Double selectSumByMatnr(@Param("matnr") String matnr);
+
+    List<LocDetl> selectGroupPage(Map<String, Object> param);
+
+    List<LocDetl> selectByLocNo(@Param("locNo") String locNo);
 }

--
Gitblit v1.9.1