From 051d84a86d86fbb71e0292a09a6d03874d4fb0e5 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 25 十一月 2025 13:51:12 +0800
Subject: [PATCH] #1

---
 src/main/java/com/zy/asrs/mapper/LocMastMapper.java |    8 ++++++--
 1 files changed, 6 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 2df1691..3670a2c 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -13,7 +13,11 @@
 @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);
@@ -26,7 +30,7 @@
 
     LocMast queryDemoSourceLoc(@Param("crnNo") Integer crnNo);
 
-    LocMast queryDemoLoc(@Param("crnNo") Integer crnNo);
+    LocMast queryDemoLoc(@Param("crnNo") Integer crnNo,@Param("loc_type2") String locType2);
 
     @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