From c825d67d652cc9fe3f476bab4da9fa6d1b709da7 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期三, 02 十一月 2022 12:45:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/bfasrs' into bfasrs
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 8 +++++++-
1 files changed, 7 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 50b548b..b848faa 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -30,13 +30,14 @@
@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' ORDER BY lm.modi_time ASC")
List<String> selectSameDetl(@Param("matnr") String matnr, @Param("start") Integer start, @Param("end") Integer end);
@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.modi_time, getdate()) = 0) ORDER BY lm.modi_time ASC")
List<String> selectSameDetlToday(@Param("matnr") String matnr, @Param("start") Integer start, @Param("end") Integer end);
List<LocDetl> getStockStatis(Map<String, Object> map);
+
+ List<LocDetl> getStockStatis2(Map<String, Object> map);
Integer getStockStatisCount(Map<String, Object> map);
@@ -66,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