From 2a0dc2ba812aff257fc6460823f2bdcdd35d3a05 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 29 五月 2023 15:57:39 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 6ff917e..45d64ec 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -17,6 +17,10 @@
 @Repository
 public interface LocDetlMapper extends BaseMapper<LocDetl> {
 
+    List<LocDetl> listByPage(Map<String, Object> map);
+
+    Integer listByPageCount(Map<String, Object> map);
+
     LocDetl selectItem(@Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch);
 
     int deleteItem(@Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch);
@@ -27,10 +31,14 @@
 
     Integer getStockOutPageCount(Map<String, Object> map);
 
+    List<LocDetl> getStockOutPage2(Map<String, Object> map);
+
+    Integer getStockOutPageCount2(Map<String, Object> map);
+
     @Update("update asr_loc_detl set loc_no = #{newLocNo}, modi_time=getDate() where loc_no = #{oldLocNo}")
     int updateLocNo(String newLocNo, String oldLocNo);
 
-    @Select("SELECT ld.loc_no FROM asr_loc_detl ld LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no WHERE (1 = 1 AND ld.matnr = #{matnr} AND (lm.row1 >= #{start} AND lm.row1 <= #{end})  AND lm.loc_sts = 'F' AND DateDiff(dd, lm.appe_time, getdate()) = 0) ORDER BY lm.appe_time ASC")
+    @Select("SELECT ld.loc_no FROM asr_loc_detl ld LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no WHERE (1 = 1 AND ld.matnr = #{matnr} AND (lm.row1 >= #{start} AND lm.row1 <= #{end})  AND lm.loc_sts = 'F' AND DateDiff(dd, ld.appe_time, getdate()) = 0) ORDER BY ld.appe_time ASC")
     List<String> selectSameDetlToday(@Param("matnr") String matnr, @Param("start") Integer start, @Param("end") Integer end);
 
     List<LocDetl> getStockStatis(Map<String, Object> map);
@@ -50,15 +58,24 @@
 
     // -------------------------------------------------
 
-    List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos);
+    List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("owner")int owner);
+
+    List<LocDetl> queryStockViewMerge(@Param("locNo")String locNo);
 
     Double queryStockAnfme(String matnr, String batch);
 
-    List<StockVo> queryStockTotal();
+    List<StockVo> queryStockTotal(@Param("matnr")String matnr,@Param("batch")String batch);
 
 
     Integer sum();
 
     List<LocDetl> unreason();
 
+    Double selectLocDetlSumQty(String locNo);
+
+    Integer queryStockViewMergeCount(@Param("row")int row,@Param("lev")int lev);
+
+    //閫氳繃璁㈠崟鍙枫�佺墿鏂欏彿銆佺墿鏂欏悕绉般�佽鏍笺�佸簱浣嶅彿杩涜妯$硦鎼滅储
+    List<LocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo);
+
 }

--
Gitblit v1.9.1