From 56e96066dd6595085703b25fe2dc317590fb06f2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 10 七月 2025 16:55:37 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/mapper/LocMastMapper.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index c7e3491..e0ee323 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -13,6 +13,11 @@
 @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 " +
+        "order by case row1 when 31 then 1 when 32 then 0 when 33 then 0 when 34 then 1 end desc,newid()")
+    List<Integer> queryDistinctRow(@Param("crnNo")Integer crnNo);
+
     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}")
@@ -25,4 +30,7 @@
 
     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}")
+    Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("crnNo") Integer crnNo);
+
 }

--
Gitblit v1.9.1