From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/resources/mapper/LocMastMapper.xml | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 5d6b2cc..ee92255 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -119,7 +119,18 @@
<if test="locType1 != null">
and loc_type1 = #{locType1}
</if>
- ORDER BY lev1,bay1,row1
+ ORDER BY row1,bay1,lev1
+ </select>
+
+ <select id="selectAreaEmptyByLev" resultMap="BaseResultMap">
+ select * from asr_loc_mast
+ where loc_sts in ('O')
+ and loc_type3 = #{locType3}
+ <if test="locType1 != null">
+ and loc_type1 = #{locType1}
+ </if>
+ and lev1 = #{lev}
+ ORDER BY row1,bay1,lev1
</select>
<select id="selectEmptyByLocNos" resultMap="BaseResultMap">
--
Gitblit v1.9.1