From 58b23d18daa51a9837306fb0a8c03285fbd80e99 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 08 十二月 2025 09:16:49 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderDetlPakinMapper.xml | 87 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 78 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/OrderDetlPakinMapper.xml b/src/main/resources/mapper/OrderDetlPakinMapper.xml
index 85639b1..770bb40 100644
--- a/src/main/resources/mapper/OrderDetlPakinMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakinMapper.xml
@@ -53,18 +53,77 @@
<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}
+ <choose>
+ <when test="batch != null and batch != ''">
+ and batch = #{batch}
+ </when>
+ <otherwise>
+ and (batch IS NULL OR batch = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="brand != null and brand != ''">
+ and brand = #{brand}
+ </when>
+ <otherwise>
+ and (brand IS NULL OR brand = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="standby1 != null and standby1 != ''">
+ and standby1 = #{standby1}
+ </when>
+ <otherwise>
+ and (standby1 IS NULL OR standby1 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="standby2 != null and standby2 != ''">
+ and standby2 = #{standby2}
+ </when>
+ <otherwise>
+ and (standby2 IS NULL OR standby2 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="standby3 != null and standby3 != ''">
+ and standby3 = #{standby3}
+ </when>
+ <otherwise>
+ and (standby3 IS NULL OR standby3 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="boxType1 != null and boxType1 != ''">
+ and box_type1 = #{boxType1}
+ </when>
+ <otherwise>
+ and (box_type1 IS NULL OR box_type1 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="boxType2 != null and boxType2 != ''">
+ and box_type2 = #{boxType2}
+ </when>
+ <otherwise>
+ and (box_type2 IS NULL OR box_type2 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="boxType3 != null and boxType3 != ''">
+ and box_type3 = #{boxType3}
+ </when>
+ <otherwise>
+ and (box_type3 IS NULL OR box_type3 = '')
+ </otherwise>
+ </choose>
</sql>
<sql id="standbyAllMemo">
-- and line_number = #{lineNumber}
@@ -76,7 +135,7 @@
where 1=1
and order_id = #{orderId}
and matnr = #{matnr}
- <include refid="standbyAll"></include>
+<!-- <include refid="standbyAll"></include>-->
</select>
<select id="selectItemByOrderNo" resultMap="BaseResultMap">
@@ -186,4 +245,14 @@
<include refid="standbyAll"></include>
</update>
+ <select id="selectOrderDetls" resultMap="BaseResultMap">
+ SELECT *
+ FROM man_order_detl_pakin
+ where 1=1
+ and box_type3 = #{orderNo}
+ and standby3 = #{sku}
+ and standby2 = #{upc}
+ order by update_time
+ </select>
+
</mapper>
--
Gitblit v1.9.1