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 |   80 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 79 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index aa3488a..8e6b7de 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -44,6 +44,7 @@
         <result column="appe_user" property="appeUser" />
         <result column="appe_time" property="appeTime" />
         <result column="memo" property="memo" />
+        <result column="stock_freeze" property="stockFreeze" />
     </resultMap>
 
     <sql id="batchSeq">
@@ -63,6 +64,14 @@
         where 1=1
         and loc_no = #{locNo}
         and matnr = #{matnr}
+        <choose>
+            <when test="suppCode != null and suppCode != ''">
+                and supp_code = #{suppCode}
+            </when>
+<!--            <otherwise>-->
+<!--                and (supp_code IS NULL OR supp_code = '')-->
+<!--            </otherwise>-->
+        </choose>
         <include refid="batchSeq"></include>
     </select>
 
@@ -72,6 +81,7 @@
         and loc_no = #{locNo}
         and matnr = #{matnr}
         <include refid="batchSeq"></include>
+        <include refid="locdetlCondition"></include>
     </delete>
 
     <update id="updateAnfme">
@@ -81,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!='' ">
@@ -315,11 +338,66 @@
         ) dual on dual.loc_no = lm.loc_no
         WHERE 1 = 1
         AND ld.matnr = #{matnr}
-        AND (lm.row1 >= #{start} AND lm.row1 &lt;= #{end})
         AND (lm.loc_sts = 'F')
         AND dual.count = 1
         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
+        where
+        1 = 1
+        <if test="orderNo != null and orderNo != ''">
+            and order_no like '%' + #{orderNo} + '%'
+        </if>
+        <if test="locNo != null and locNo != ''">
+            and loc_no like '%' + #{locNo} + '%'
+        </if>
+        <if test="specs != null and specs != ''">
+            and specs like '%' + #{specs} + '%'
+        </if>
+        <if test="matnr != null and matnr != ''">
+            and matnr like '%' + #{matnr} + '%'
+        </if>
+        <if test="maktx != null and maktx != ''">
+            and maktx like '%' + #{maktx} + '%';
+        </if>
+    </select>
+
+    <select id="selectByLocNo" resultMap="BaseResultMap">
+        select * from asr_loc_detl
+        where 1=1
+        and loc_no = #{locNo}
+    </select>
+
+    <update id="updateStockFreeze">
+        update asr_loc_detl
+        set stock_freeze = #{stockFreeze}
+        , modi_time = getdate()
+        where 1=1
+        and loc_no = #{locNo}
+        and matnr = #{matnr}
+    </update>
 </mapper>

--
Gitblit v1.9.1