From ab290efb7df666e173fcd88c32f066f333825c5e Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期六, 18 十月 2025 08:50:01 +0800
Subject: [PATCH] 联调
---
src/main/resources/mapper/ViewWorkInMapper.xml | 76 ++++++++++++++++++++++++--------------
1 files changed, 48 insertions(+), 28 deletions(-)
diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index 703625f..3104cb0 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}
@@ -36,6 +39,21 @@
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>
+ <if test="outOrderNo != null and outOrderNo != ''">
+ and out_order_no like concat('%',#{outOrderNo},'%')
+ </if>
+ <if test="sPgNO != null and sPgNO != ''">
+ and pg_no like concat('%',#{sPgNO},'%')
+ </if>
</sql>
<sql id="viewWorkOutConditionSql">
@@ -76,7 +94,7 @@
<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
<select id="queryViewWorkInList" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
select
- *
+ *,out_order_no outOrderNo,pg_no sPgNO
from (
select
ROW_NUMBER() OVER(Order by t.io_time desc) as row
@@ -99,11 +117,13 @@
<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
<select id="getViewWorkInAll" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
- select count(1)
- from asr_wrkin_view a
+<!-- select count(1)-->
+<!-- from asr_wrkin_view a-->
+<!-- where 1=1-->
+<!-- <include refid="viewWorkInConditionSql"></include>-->
+ select * from asr_wrkin_view
where 1=1
<include refid="viewWorkInConditionSql"></include>
- order by io_time desc
</select>
<!-- 鍑哄簱缁熻 -->
@@ -112,17 +132,17 @@
select
- *
+ *,out_order_no outOrderNo,pg_no sPgNO
from (
- select
- ROW_NUMBER() OVER(Order by t.io_time desc) as row
- , *
- from (
- select *
- from asr_wrkout_view
- where 1=1
- <include refid="viewWorkInConditionSql"></include>
- ) t
+ select
+ ROW_NUMBER() OVER(Order by t.io_time desc) as row
+ , *
+ from (
+ select *
+ from asr_wrkout_view
+ where 1=1
+ <include refid="viewWorkInConditionSql"></include>
+ ) t
) a where 1=1 and a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
--
Gitblit v1.9.1