From 0569f1be55ce85097d33e5c2f7815deb99a4702c Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 24 四月 2026 16:17:09 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/ViewWorkInMapper.xml | 78 +++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index 5c4b1de..38567e9 100644
--- a/src/main/resources/mapper/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/ViewWorkInMapper.xml
@@ -4,6 +4,29 @@
<mapper namespace="com.zy.asrs.mapper.ReportQueryMapper">
<!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
+<resultMap id="ViewWorkInResultMap" type="com.zy.asrs.entity.ViewWorkInBean">
+ <result column="row" property="row"/>
+ <result column="io_time" property="io_time"/>
+ <result column="loc_no" property="loc_no"/>
+ <result column="zpallet" property="zpallet"/>
+ <result column="anfme" property="anfme"/>
+ <result column="matnr" property="matnr"/>
+ <result column="maktx" property="maktx"/>
+ <result column="batch" property="batch"/>
+ <result column="order_no" property="orderNo"/>
+ <result column="specs" property="specs"/>
+ <result column="units" property="units"/>
+ <result column="weight" property="weight"/>
+ <result column="manu" property="manu"/>
+ <result column="memo" property="memo"/>
+ <result column="standby1" property="standby1"/>
+ <result column="standby2" property="standby2"/>
+ <result column="standby3" property="standby3"/>
+ <result column="box_type1" property="boxType1"/>
+ <result column="box_type2" property="boxType2"/>
+ <result column="box_type3" property="boxType3"/>
+</resultMap>
+
<sql id="viewWorkInConditionSql">
<if test="loc_no!=null and loc_no!='' ">
and loc_no like '%' + #{loc_no} + '%'
@@ -13,24 +36,6 @@
</if>
<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} + '%'-->
@@ -75,23 +80,20 @@
<if test="matnr!=null and matnr!='' ">
and matnr like '%' + #{matnr} + '%'
</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 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[
@@ -107,7 +109,7 @@
<!-- 鍏ュ簱缁熻 -->
<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
-<select id="queryViewWorkInList" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
+<select id="queryViewWorkInList" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultMap="ViewWorkInResultMap">
select
*
from (
@@ -131,7 +133,7 @@
</select>
<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
-<select id="getViewWorkInAll" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
+<select id="getViewWorkInAll" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultMap="ViewWorkInResultMap">
<!-- select count(1)-->
<!-- from asr_wrkin_view a-->
<!-- where 1=1-->
@@ -144,8 +146,6 @@
<!-- 鍑哄簱缁熻 -->
<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
<select id="queryViewWorkOutList" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
-
-
select
*
from (
--
Gitblit v1.9.1