From 00ecb40e3882df465f70f715531796912bd3c29c Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期日, 13 七月 2025 16:54:27 +0800
Subject: [PATCH] 增加空托出库条件(堆垛机自动+无报警码)
---
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..44fa72a 100644
--- a/src/main/resources/mapper/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/ViewWorkInMapper.xml
@@ -11,21 +11,24 @@
<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}
@@ -35,6 +38,15 @@
<![CDATA[
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>
@@ -82,7 +94,7 @@
ROW_NUMBER() OVER(Order by t.io_time desc) as row
, *
from (
- select *
+ select manu_date manuDate,man_length manLength,*
from asr_wrkin_view
where 1=1
<include refid="viewWorkInConditionSql"></include>
@@ -120,7 +132,7 @@
ROW_NUMBER() OVER(Order by t.io_time desc) as row
, *
from (
- select *
+ select manu_date manuDate,man_length manLength,*
from asr_wrkout_view
where 1=1
<include refid="viewWorkInConditionSql"></include>
--
Gitblit v1.9.1