From 808d32829a61f6f1de0b989b2c818327d3bf74ef Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期一, 28 四月 2025 09:20:56 +0800 Subject: [PATCH] * --- src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 40 +++++++++++++++++++++++++++++++++++----- 1 files changed, 35 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java index d7f0f90..fff410c 100644 --- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java +++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java @@ -13,8 +13,38 @@ @Repository public interface LocMastMapper extends BaseMapper<LocMast> { -// @Select("select distinct row1 from asr_loc_mast where crn_no = #{crnNo}") - @Select("select row1 from ( select distinct row1 from asr_loc_mast where crn_no = #{crnNo} ) a " + + + /** + * 搴撲綅妯$硦鏌ヨ搴撲綅鍙� + */ + List<LocMast> selectLocMastListSix(@Param("locNo") String locNo, + @Param("whsType") Long whsType, + @Param("crnNo") Integer crnNo, + @Param("row1") Integer row1, + @Param("bay1") Integer bay1, + @Param("lev1") Integer lev1, + @Param("pageNumber") Integer curr, + @Param("pageSize") Integer limit); + + /** + * 鍫嗗灈鏈哄搴旂殑鎺掑彿闆嗗悎 + */ + Long selectLocMastListTotalSix(@Param("locNo") String locNo, + @Param("whsType") Long whsType, + @Param("crnNo") Integer crnNo, + @Param("row1") Integer row1, + @Param("bay1") Integer bay1, + @Param("lev1") Integer lev1); + + + List<LocMast> selectLocMastList(@Param("locNo") String locNo, + @Param("pageNumber") Integer curr, + @Param("pageSize") Integer limit); + + Long selectLocMastListTotal(@Param("locNo") String locNo); + +// @Select("select distinct row1 from "SOURCE"."asr_loc_mast" where crn_no = #{crnNo}") + @Select("select row1 from ( select distinct row1 from \"SOURCE\".\"asr_loc_mast\" where crn_no = #{crnNo} ) a " + "order by case row1 when 1 then 1 when 2 then 0 when 3 then 0 when 4 then 1 " + "when 5 then 1 when 6 then 0 when 7 then 0 when 8 then 1 when 9 then 1 when 10 then 0 " + "when 11 then 0 when 12 then 1 when 13 then 1 when 14 then 0 when 15 then 0 when 16 then 1 end desc,newid()") @@ -22,17 +52,17 @@ LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType1") Short locType1); - @Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}") + @Select("select loc_no from \"SOURCE\".\"asr_loc_mast\" where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}") List<String> queryGroupEmptyStock(Integer crnNo); - @Select("select top 1 bay1 from asr_loc_mast order by bay1 desc") + @Select("select top 1 bay1 from \"SOURCE\".\"asr_loc_mast\" order by bay1 desc") Short selectTotalBay(); LocMast queryDemoSourceLoc(@Param("crnNo") Integer crnNo); LocMast queryDemoLoc(@Param("crnNo") Integer crnNo); - @Select("select count(*) as count from asr_loc_mast where 1=1 and loc_sts = 'O' and loc_type1 = #{locType1} and crn_no = #{crnNo}") + @Select("select count(*) as count from \"SOURCE\".\"asr_loc_mast\" where 1=1 and loc_sts = 'O' and loc_type1 = #{locType1} and crn_no = #{crnNo}") Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("crnNo") Integer crnNo); LocMast selectByLocNo(String locNo); -- Gitblit v1.9.1