From 43a34e5651ed0530baa25694e4757cd568d06b20 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期五, 24 四月 2026 16:15:57 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/ViewWorkInMapper.xml | 55 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 17 deletions(-)
diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index 0f5d0cd..5c4b1de 100644
--- a/src/main/resources/mapper/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/ViewWorkInMapper.xml
@@ -14,6 +14,24 @@
<if test="anfme != null and anfme != ''">
and anfme = #{anfme}
</if>
+ <if test="standby1!=null and standby1!='' ">
+ and standby1 like '%' + #{standby1} + '%'
+ </if>
+ <if test="standby2!=null and standby2!='' ">
+ and standby2 like '%' + #{standby2} + '%'
+ </if>
+ <if test="standby3!=null and standby3!='' ">
+ and standby3 like '%' + #{standby3} + '%'
+ </if>
+ <if test="boxType1!=null and boxType1!='' ">
+ and box_type1 like '%' + #{boxType1} + '%'
+ </if>
+ <if test="boxType2!=null and boxType2!='' ">
+ and box_type2 like '%' + #{boxType2} + '%'
+ </if>
+ <if test="boxType3!=null and boxType3!='' ">
+ and box_type3 like '%' + #{boxType3} + '%'
+ </if>
<!-- <if test="maktx!=null and maktx!='' ">-->
<!-- and (maktx like '%' + #{maktx} + '%'-->
<!-- or matnr like '%' + #{maktx} + '%'-->
@@ -57,20 +75,23 @@
<if test="matnr!=null and matnr!='' ">
and matnr like '%' + #{matnr} + '%'
</if>
- <if test="maktx!=null and maktx!='' ">
- and (maktx like '%' + #{maktx} + '%'
- or matnr like '%' + #{maktx} + '%'
- or lgnum like '%' + #{maktx} + '%'
- or tbnum like '%' + #{maktx} + '%'
- or tbpos like '%' + #{maktx} + '%'
- or zmatid like '%' + #{maktx} + '%'
- or maktx like '%' + #{maktx} + '%'
- or werks like '%' + #{maktx} + '%'
- or anfme like '%' + #{maktx} + '%'
- or altme like '%' + #{maktx} + '%'
- or zpallet like '%' + #{maktx} + '%'
- or bname like '%' + #{maktx} + '%'
- )
+ <if test="standby1!=null and standby1!='' ">
+ and standby1 like '%' + #{standby1} + '%'
+ </if>
+ <if test="standby2!=null and standby2!='' ">
+ and standby2 like '%' + #{standby2} + '%'
+ </if>
+ <if test="standby3!=null and standby3!='' ">
+ and standby3 like '%' + #{standby3} + '%'
+ </if>
+ <if test="boxType1!=null and boxType1!='' ">
+ and box_type1 like '%' + #{boxType1} + '%'
+ </if>
+ <if test="boxType2!=null and boxType2!='' ">
+ and box_type2 like '%' + #{boxType2} + '%'
+ </if>
+ <if test="boxType3!=null and boxType3!='' ">
+ and box_type3 like '%' + #{boxType3} + '%'
</if>
<if test="begin_date!=null and begin_date!='' ">
<![CDATA[
@@ -135,7 +156,7 @@
select *
from asr_wrkout_view
where 1=1
- <include refid="viewWorkInConditionSql"></include>
+ <include refid="viewWorkOutConditionSql"></include>
) t
) a where 1=1 and a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
@@ -145,7 +166,7 @@
select count(1)
from asr_wrkout_view a
where 1=1
- <include refid="viewWorkInConditionSql"></include>
+ <include refid="viewWorkOutConditionSql"></include>
</select>
<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
@@ -153,7 +174,7 @@
select *
from asr_wrkout_view a
where 1=1
- <include refid="viewWorkInConditionSql"></include>
+ <include refid="viewWorkOutConditionSql"></include>
Order by a.io_time desc
</select>
--
Gitblit v1.9.1