From a1844a7fc934ca943db810b1bd2a450f948607cd Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期四, 03 六月 2021 14:23:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/htasrs0' into htasrs0
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 16 +++++++++++++++-
1 files changed, 15 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 b646905..a789797 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -25,7 +25,21 @@
@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.modi_time, getdate()) = 0) ORDER BY lm.modi_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, 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);
+
+ Integer getStockStatisCount(Map<String, Object> map);
+
+ List<LocDetl> getStockStatisExcel();
+
+ @Select("select sum(anfme) as sum from asr_loc_detl where matnr = #{matnr}")
+ Double selectSumAnfmeByMatnr(@Param("matnr") String matnr);
+
+ List<LocDetl> selectPakoutByRule(String matnr);
+
+ List<LocDetl> getAsrsLocDetl(String matnr);
+
+ Integer countLocNoNum(String locNo);
}
--
Gitblit v1.9.1