From 4768cb6ab3ab41b08cb55bed49fd7db80c544952 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 10 十二月 2025 16:56:03 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderDetlPakoutMapper.xml | 74 +++++++++++++++----------------------
1 files changed, 30 insertions(+), 44 deletions(-)
diff --git a/src/main/resources/mapper/OrderDetlPakoutMapper.xml b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
index 737b736..1d8f626 100644
--- a/src/main/resources/mapper/OrderDetlPakoutMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
@@ -47,22 +47,38 @@
<result column="memo" property="memo" />
<result column="pakin_pakout_status" property="pakinPakoutStatus" />
<result column="line_number" property="lineNumber" />
-
+ <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" />
+ <result column="width" property="width" />
+ <result column="height" property="height" />
+ <result column="erp_anfme" property="erpAnfme" />
</resultMap>
+
+ <sql id="standbyAll">
+ and batch = #{batch}
+ and brand = #{brand}
+ and standby1 = #{standby1}
+ and standby2 = #{standby2}
+ and standby3 = #{standby3}
+ and box_type1 = #{boxType1}
+ and box_type2 = #{boxType2}
+ and box_type3 = #{boxType3}
+ </sql>
+ <sql id="standbyAllMemo">
+ -- and line_number = #{lineNumber}
+ -- and specs = #{specs}
+ </sql>
<select id="selectItem" resultMap="BaseResultMap">
select * from man_order_detl_pakout
where 1=1
and order_id = #{orderId}
and matnr = #{matnr}
- <choose>
- <when test="batch != null and batch != ''">
- and batch = #{batch}
- </when>
- <otherwise>
- and (batch IS NULL OR batch = '')
- </otherwise>
- </choose>
+ <include refid="standbyAll"></include>
</select>
<select id="selectItemByOrderNo" resultMap="BaseResultMap">
@@ -70,9 +86,7 @@
where 1=1
and order_no = #{orderNo}
and matnr = #{matnr}
- <if test="batch!=null and batch!='' ">
- and batch = #{batch}
- </if>
+ <include refid="standbyAll"></include>
</select>
<select id="selectWorkingDetls" resultMap="BaseResultMap">
@@ -133,14 +147,7 @@
where 1=1
and order_id = #{orderId}
and matnr = #{matnr}
- <choose>
- <when test="batch != null and batch != ''">
- and batch = #{batch}
- </when>
- <otherwise>
- and (batch IS NULL OR batch = '')
- </otherwise>
- </choose>
+ <include refid="standbyAll"></include>
</update>
<update id="decrease">
@@ -149,14 +156,7 @@
where 1=1
and order_no = #{orderNo}
and matnr = #{matnr}
- <choose>
- <when test="batch != null and batch != ''">
- and batch = #{batch}
- </when>
- <otherwise>
- and (batch IS NULL OR batch = '')
- </otherwise>
- </choose>
+ <include refid="standbyAll"></include>
</update>
<update id="modifyStatus">
@@ -176,14 +176,7 @@
where 1=1
and order_no = #{orderNo}
and matnr = #{matnr}
- <choose>
- <when test="batch != null and batch != ''">
- and batch = #{batch}
- </when>
- <otherwise>
- and (batch IS NULL OR batch = '')
- </otherwise>
- </choose>
+ <include refid="standbyAll"></include>
</update>
<update id="increaseWorkQty">
@@ -192,14 +185,7 @@
where 1=1
and order_id = #{orderId}
and matnr = #{matnr}
- <choose>
- <when test="batch != null and batch != ''">
- and batch = #{batch}
- </when>
- <otherwise>
- and (batch IS NULL OR batch = '')
- </otherwise>
- </choose>
+ <include refid="standbyAll"></include>
</update>
</mapper>
--
Gitblit v1.9.1