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/LocDetlMapper.xml | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index d95340d..8e6b7de 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -68,9 +68,9 @@
<when test="suppCode != null and suppCode != ''">
and supp_code = #{suppCode}
</when>
- <otherwise>
- and (supp_code IS NULL OR supp_code = '')
- </otherwise>
+<!-- <otherwise>-->
+<!-- and (supp_code IS NULL OR supp_code = '')-->
+<!-- </otherwise>-->
</choose>
<include refid="batchSeq"></include>
</select>
@@ -81,6 +81,7 @@
and loc_no = #{locNo}
and matnr = #{matnr}
<include refid="batchSeq"></include>
+ <include refid="locdetlCondition"></include>
</delete>
<update id="updateAnfme">
@@ -90,8 +91,21 @@
where 1=1
and loc_no = #{locNo}
and matnr = #{matnr}
+ <include refid="locdetlCondition"></include>
<include refid="batchSeq"></include>
</update>
+
+ <sql id="locdetlCondition">
+ <if test="threeCode!=null and threeCode!='' ">
+ and three_code = #{threeCode}
+ </if>
+ <if test="suppCode!=null and suppCode!='' ">
+ and supp_code = #{suppCode}
+ </if>
+ <if test="deadTime!=null and deadTime!='' ">
+ and dead_time = #{deadTime}
+ </if>
+ </sql>
<sql id="stockOutCondition">
<if test="loc_no!=null and loc_no!='' ">
@@ -329,6 +343,27 @@
ORDER BY lm.modi_time ASC
</select>
+ <select id="selectSameLevDetl" resultType="java.lang.String">
+ SELECT
+ ld.loc_no
+ FROM asr_loc_detl ld
+ LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no
+ LEFT JOIN (
+ select
+ loc_no,
+ count(1) as count
+ from asr_loc_detl
+ where 1=1
+ group by loc_no
+ ) dual on dual.loc_no = lm.loc_no
+ WHERE 1 = 1
+ AND ld.matnr = #{matnr}
+ AND (lm.loc_sts = 'F')
+ AND dual.count = 1
+ AND lm.lev1 = #{lev}
+ ORDER BY lm.modi_time ASC
+ </select>
+
<select id="searchByLike" resultMap="BaseResultMap">
select *
from asr_loc_detl
--
Gitblit v1.9.1