From 102c5b8101dc3ee8d2c011cbe8826152abd57106 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 27 十二月 2024 08:41:31 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/LocDetlMapper.xml |   85 +++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 83 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index dc9f9e8..2a54395 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -48,15 +48,74 @@
         <result column="standby1" property="standby1" />
         <result column="standby2" property="standby2" />
         <result column="standby3" property="standby3" />
+        <result column="box_type1" property="boxType1" />
+        <result column="box_type2" property="boxType2" />
+        <result column="box_type3" property="boxType3" />
     </resultMap>
 
     <sql id="batchSeq">
         <choose>
             <when test="batch != null and batch != ''">
-                and batch = #{batch}
+                and d.batch = #{batch}
             </when>
             <otherwise>
-                and (batch IS NULL OR batch = '')
+                and (d.batch IS NULL OR d.batch = '')
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="brand != null and brand != ''">
+                and d.brand = #{brand}
+            </when>
+            <otherwise>
+                and (d.brand IS NULL OR d.brand = '')
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="standby1 != null and standby1 != ''">
+                and d.standby1 = #{standby1}
+            </when>
+            <otherwise>
+                and (d.standby1 IS NULL OR d.standby1 = '')
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="standby2 != null and standby2 != ''">
+                and d.standby2 = #{standby2}
+            </when>
+            <otherwise>
+                and (d.standby2 IS NULL OR d.standby2 = '')
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="standby3 != null and standby3 != ''">
+                and d.standby3 = #{standby3}
+            </when>
+            <otherwise>
+                and (d.standby3 IS NULL OR d.standby3 = '')
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="boxType1 != null and boxType1 != ''">
+                and d.box_type1 = #{boxType1}
+            </when>
+            <otherwise>
+                and (d.box_type1 IS NULL OR d.box_type1 = '')
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="boxType2 != null and boxType2 != ''">
+                and d.box_type2 = #{boxType2}
+            </when>
+            <otherwise>
+                and (d.box_type2 IS NULL OR d.box_type2 = '')
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="boxType3 != null and boxType3 != ''">
+                and d.box_type3 = #{boxType3}
+            </when>
+            <otherwise>
+                and (d.box_type3 IS NULL OR d.box_type3 = '')
             </otherwise>
         </choose>
     </sql>
@@ -449,6 +508,28 @@
         and lm.row1 in (31,32)
         order by row1
     </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="getStockStatis2" resultType="com.zy.asrs.entity.LocDetl">
         select * from
         (

--
Gitblit v1.9.1