From 8f0d649d83de955cfcbf38ebdbfc90a70c6ac547 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 11 十月 2023 10:24:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6

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

diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 0d488d4..1dd7771 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -38,8 +38,14 @@
     List<LocDetl> getStockStatis(Map<String, Object> map);
 
     List<LocDetl> getStockStatis2(Map<String, Object> map);
+    List<LocDetl> getStockStatisDate(Map<String, Object> map);
+
+    List<LocDetl> getStockStatisOut(Map<String, Object> map);
 
     Integer getStockStatisCount(Map<String, Object> map);
+    Integer getStockStatisDateCount(Map<String, Object> map);
+
+    Integer getStockStatisOutCount(Map<String, Object> map);
 
     List<LocDetl> getStockStatisExcel();
 
@@ -73,5 +79,10 @@
 
     List<LocDetl> selectByLocNo(@Param("locNo") String locNo);
 
+    List<LocDetl> selectByLocNosAndMatnr(@Param("locNos") List<String> locNos, String matnr);
+
     List<LocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo);//閫氳繃璁㈠崟鍙枫�佺墿鏂欏彿銆佺墿鏂欏悕绉般�佽鏍笺�佸簱浣嶅彿杩涜妯$硦鎼滅储
+
+    List<LocDetl> findAreaByMatnr(String matnr,Integer locType2);
+
 }

--
Gitblit v1.9.1