From 973eed10d720c7dbd0020407c3b89fe1d385944f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 08 十二月 2025 09:42:20 +0800
Subject: [PATCH] wms功能完善
---
src/main/resources/mapper/OrderDetlPakinMapper.xml | 128 ++++++++++++++++++++++++++++--------------
1 files changed, 84 insertions(+), 44 deletions(-)
diff --git a/src/main/resources/mapper/OrderDetlPakinMapper.xml b/src/main/resources/mapper/OrderDetlPakinMapper.xml
index 7cd20a3..1103efc 100644
--- a/src/main/resources/mapper/OrderDetlPakinMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakinMapper.xml
@@ -28,7 +28,7 @@
<result column="item_num" property="itemNum" />
<result column="safe_qty" property="safeQty" />
<result column="weight" property="weight" />
- <result column="length" property="length" />
+ <result column="man_length" property="manLength" />
<result column="volume" property="volume" />
<result column="three_code" property="threeCode" />
<result column="supp" property="supp" />
@@ -47,22 +47,92 @@
<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" />
</resultMap>
+
+ <sql id="standbyAll">
+<!-- <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}
+ -- and specs = #{specs}
+ </sql>
<select id="selectItem" resultMap="BaseResultMap">
select * from man_order_detl_pakin
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 +140,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 +201,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 +210,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 +230,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 +239,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