From 03cb278f103ad389c049332b9ba7fe7d840ebbe6 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 18 十月 2025 17:12:38 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 1f8ee39..fe63e27 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -13,10 +13,17 @@
@Repository
public interface LocMastMapper extends BaseMapper<LocMast> {
- @Select("select distinct row1 from asr_loc_mast where crn_no = #{crnNo}")
+// @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 " +
+ "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()")
List<Integer> queryDistinctRow(@Param("crnNo")Integer crnNo);
LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType1") Short locType1);
+
+ LocMast queryFreeLocMast2(@Param("row") Integer row, @Param("locType1") Short locType1,@Param("bay") Integer bay);
+
@Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
List<String> queryGroupEmptyStock(Integer crnNo);
@@ -26,6 +33,9 @@
LocMast queryDemoSourceLoc(@Param("crnNo") Integer crnNo);
- LocMast queryDemoLoc(@Param("crnNo") Integer crnNo);
+ LocMast queryDemoLoc(@Param("crnNo") Integer crnNo,@Param("locType1") Short locType1);
+
+ @Select("select count(*) as count from 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);
}
--
Gitblit v1.9.1