From 76fe27b7b098cda720198aaa157edee4482351b8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 12 十一月 2025 13:08:16 +0800
Subject: [PATCH] 成品判料改待判
---
src/main/resources/mapper/WrkDetlLogMapper.xml | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index eea3275..14db210 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -45,11 +45,16 @@
<result column="appe_user" property="appeUser"/>
<result column="appe_time" property="appeTime"/>
<result column="memo" property="memo"/>
+ <result column="roll_up" property="rollUp" />
+
</resultMap>
<sql id="batchSeq">
<if test="wrkNo != null and wrkNo != ''">
and a.wrk_no = #{wrkNo}
+ </if>
+ <if test="anfme != null and anfme != ''">
+ and a.anfme = #{anfme}
</if>
<if test="modiTimeStart != null ">
<if test="modiTimeEnd != null ">
@@ -57,11 +62,28 @@
</if>
</if>
<if test="orderNo != null and orderNo != ''">
- and ( a.order_no like concat('%',#{orderNo},'%')
- or a.batch like concat('%',#{orderNo},'%')
- or a.matnr like concat('%',#{orderNo},'%')
- or a.zpallet like concat('%',#{orderNo},'%')
- )
+ and a.order_no like concat('%',#{orderNo},'%')
+ </if>
+ <if test="batch != null and batch != ''">
+ and a.batch like concat('%',#{batch},'%')
+ </if>
+ <if test="model != null and model != ''">
+ and a.model like concat('%',#{model},'%')
+ </if>
+ <if test="matnr != null and matnr != ''">
+ and a.matnr like concat('%',#{matnr},'%')
+ </if>
+ <if test="zpallet != null and zpallet != ''">
+ and a.zpallet like concat('%',#{zpallet},'%')
+ </if>
+ <if test="specs != null and specs != ''">
+ and a.specs like concat('%',#{specs},'%')
+ </if>
+ <if test="unit != null and unit != ''">
+ and a.unit like concat('%',#{unit},'%')
+ </if>
+ <if test="brand != null and brand != ''">
+ and a.brand like concat('%',#{brand},'%')
</if>
</sql>
@@ -82,7 +104,7 @@
</select>
<select id="selectWrkDetlLogsTotal" resultType="Long">
- select count(*) from asr_wrk_detl_log as a ,asr_wrk_mast_log as b
+ select count(1) from asr_wrk_detl_log as a ,asr_wrk_mast_log as b
where 1=1
and a.io_time=b.io_time
and a.wrk_no=b.wrk_no
--
Gitblit v1.9.1