From fef99d0c89fcd59c766f2cfe96c59dd3e72f4da7 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 24 十二月 2025 17:17:02 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/resources/mapper/ViewWorkInMapper.xml | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index e63997b..043a29e 100644
--- a/src/main/resources/mapper/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/ViewWorkInMapper.xml
@@ -5,27 +5,30 @@
<!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
<sql id="viewWorkInConditionSql">
- <if test="loc_no!=null and loc_no!='' ">
- and loc_no like '%' + #{loc_no} + '%'
+ <if test="locNo!=null and locNo!='' ">
+ and loc_no like '%' + #{locNo} + '%'
</if>
<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="anfme != null and anfme != ''">
+ and anfme = #{anfme}
</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>-->
<if test="begin_date!=null and begin_date!='' ">
<![CDATA[
and io_time >= #{begin_date}
@@ -36,6 +39,15 @@
and io_time <= #{end_date}
]]>
</if>
+ <if test="batch != null and batch != ''">
+ and batch like concat('%',#{batch},'%')
+ </if>
+ <if test="zpallet != null and zpallet != ''">
+ and zpallet like concat('%',#{zpallet},'%')
+ </if>
+ <if test="specs != null and specs != ''">
+ and specs like concat('%',#{specs},'%')
+ </if>
</sql>
<sql id="viewWorkOutConditionSql">
--
Gitblit v1.9.1