From 6cd08fe4de88df0a21851f96bdc4e617c5d92e36 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 29 四月 2026 11:57:31 +0800
Subject: [PATCH] 工单相关功能完善
---
src/main/resources/mapper/OrderDetlPakinMapper.xml | 88 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 81 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/OrderDetlPakinMapper.xml b/src/main/resources/mapper/OrderDetlPakinMapper.xml
index 256bbd8..9b7e9dc 100644
--- a/src/main/resources/mapper/OrderDetlPakinMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakinMapper.xml
@@ -50,16 +50,81 @@
<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">
- and batch = #{batch}
- and line_number = #{lineNumber}
- and specs = #{specs}
- and standby1 = #{standby1}
- and standby2 = #{standby2}
- and standby3 = #{standby3}
+ <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">
@@ -129,6 +194,15 @@
and mdt.pakout = 1
<include refid="pakOutPageCondition"></include>
</select>
+ <select id="selectReportComplete" resultType="java.lang.Integer">
+ SELECT
+ CASE
+ WHEN COUNT(*) = SUM(CASE WHEN anfme = units THEN 1 ELSE 0 END) THEN 1
+ ELSE 0
+ END
+ FROM man_order_detl_pakin
+ WHERE order_id = #{orderId}
+ </select>
<update id="increase">
update man_order_detl_pakin
@@ -161,7 +235,7 @@
<update id="increaseQtyByOrderNo">
update man_order_detl_pakin
- set qty = qty + #{qty}
+ set qty = qty + #{qty},work_qty = work_qty - #{qty}
where 1=1
and order_no = #{orderNo}
and matnr = #{matnr}
--
Gitblit v1.9.1