From 64126dfd00ed90af484fbf7b173e00fcebc4f9fa Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 24 五月 2023 15:56:11 +0800
Subject: [PATCH] 入库通知档和历史档增加mat_type物料类型，组托增加mat_type
---
src/main/resources/mapper/LocMastMapper.xml | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index ffd3a10..192e341 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -198,6 +198,25 @@
order by loc_sts desc ,lev1 asc,bay1 asc
</select>
+ <select id="queryFreeLocMastEnd1" resultMap="BaseResultMap">
+ select *
+ from asr_loc_mast
+ where row1=#{row}
+ and loc_sts='O'
+ <if test="locType1 != null">
+ and loc_type1 = #{locType1}
+ </if>
+ <choose>
+ <when test="inoutEveryday != null and inoutEveryday">
+ AND bay1 < 11 </when>
+ <otherwise>
+ AND bay1 >= 11
+ </otherwise>
+ </choose>
+ and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401')
+ order by loc_sts desc ,lev1 asc,bay1 asc
+ </select>
+
<select id="queryFreeLocMastEnd0" resultMap="BaseResultMap">
select *
from asr_loc_mast
@@ -237,7 +256,7 @@
<select id="queryFreeLocMast2" resultMap="BaseResultMap">
select *
from asr_loc_mast
- where row1=#{row}
+ where 1=1
and loc_sts='O'
<if test="locType1 != null">
and loc_type1 = #{locType1}
--
Gitblit v1.9.1