From 17f5d5ef7f8fb0f26d68331c012d2ca251a4f386 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 24 四月 2026 16:21:56 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/ViewWorkInMapper.xml |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index 38567e9..90c4fcc 100644
--- a/src/main/resources/mapper/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/ViewWorkInMapper.xml
@@ -8,6 +8,8 @@
 	<result column="row" property="row"/>
 	<result column="io_time" property="io_time"/>
 	<result column="loc_no" property="loc_no"/>
+	<result column="crn_str_time" property="crn_str_time"/>
+	<result column="crn_end_time" property="crn_end_time"/>
 	<result column="zpallet" property="zpallet"/>
 	<result column="anfme" property="anfme"/>
 	<result column="matnr" property="matnr"/>
@@ -80,20 +82,17 @@
 		<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="standby1 != null and standby1 != ''">
+			and standby1 like concat('%',#{standby1},'%')
+		</if>
+		<if test="standby3 != null and standby3 != ''">
+			and standby3 like concat('%',#{standby3},'%')
+		</if>
+		<if test="zpallet != null and zpallet != ''">
+			and zpallet like concat('%',#{zpallet},'%')
 		</if>
 		<if test="begin_date!=null and begin_date!='' ">
 			<![CDATA[
@@ -145,7 +144,7 @@
 
 <!-- 鍑哄簱缁熻 -->
 <!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
-<select id="queryViewWorkOutList" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
+<select id="queryViewWorkOutList" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultMap="ViewWorkInResultMap">
 	select
 	*
 	from (
@@ -170,7 +169,7 @@
 </select>
 
 <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
-<select id="getViewWorkOutAll" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
+<select id="getViewWorkOutAll" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultMap="ViewWorkInResultMap">
 	select *
 	from asr_wrkout_view a
 	where 1=1

--
Gitblit v1.9.1