From 4e02590562894bf6614bc3066f6689f1b00ea2ce Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 14 八月 2024 16:39:33 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml | 128 +++++++++++++++++++++++++++++-------------
1 files changed, 89 insertions(+), 39 deletions(-)
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml
index 5e24305..258045c 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml
@@ -3,56 +3,106 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.common.wms.mapper.ReportQueryMapper">
-<!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
-<sql id="viewWorkInConditionSql">
- <if test="viewWorkIn.locNo!=null and viewWorkIn.locNo!='' ">
- and loc_no like '%' + #{viewWorkIn.locNo} + '%'
+ <!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
+ <sql id="viewWorkInConditionSql">
+ <if test="viewWorkIn.locNo!=null and viewWorkIn.locNo!='' ">
+ and loc_no like '%' + #{viewWorkIn.locNo} + '%'
+ </if>
+ <if test="viewWorkIn.matnr!=null and viewWorkIn.matnr!='' ">
+ and matnr like '%' + #{viewWorkIn.matnr} + '%'
+ </if>
+ <if test="viewWorkIn.maktx!=null and viewWorkIn.maktx!='' ">
+ and (maktx like '%' + #{viewWorkIn.maktx} + '%'
+ or matnr like '%' + #{viewWorkIn.maktx} + '%'
+ or lgnum like '%' + #{viewWorkIn.maktx} + '%'
+ or tbnum like '%' + #{viewWorkIn.maktx} + '%'
+ or tbpos like '%' + #{viewWorkIn.maktx} + '%'
+ or zmatid like '%' + #{viewWorkIn.maktx} + '%'
+ or maktx like '%' + #{viewWorkIn.maktx} + '%'
+ or werks like '%' + #{viewWorkIn.maktx} + '%'
+ or anfme like '%' + #{viewWorkIn.maktx} + '%'
+ or altme like '%' + #{viewWorkIn.maktx} + '%'
+ or zpallet like '%' + #{viewWorkIn.maktx} + '%'
+ or bname like '%' + #{viewWorkIn.maktx} + '%'
+ )
+ </if>
+ <if test="viewWorkIn.beginDate!=null and viewWorkIn.beginDate!='' ">
+ <![CDATA[
+ and io_time >= #{viewWorkIn.beginDate}
+ ]]>
+ </if>
+ <if test="viewWorkIn.endDate!=null and viewWorkIn.endDate!='' ">
+ <![CDATA[
+ and io_time <= #{viewWorkIn.endDate}
+ ]]>
+ </if>
+ </sql>
+
+ <sql id="viewWorkInConditionMapSql">
+ <if test="locNo!=null and locNo!='' ">
+ and loc_no like '%' + #{locNo} + '%'
</if>
- <if test="viewWorkIn.matnr!=null and viewWorkIn.matnr!='' ">
- and matnr like '%' + #{viewWorkIn.matnr} + '%'
+ <if test="matnr!=null and matnr!='' ">
+ and matnr like '%' + #{matnr} + '%'
</if>
- <if test="viewWorkIn.maktx!=null and viewWorkIn.maktx!='' ">
- and (maktx like '%' + #{viewWorkIn.maktx} + '%'
- or matnr like '%' + #{viewWorkIn.maktx} + '%'
- or lgnum like '%' + #{viewWorkIn.maktx} + '%'
- or tbnum like '%' + #{viewWorkIn.maktx} + '%'
- or tbpos like '%' + #{viewWorkIn.maktx} + '%'
- or zmatid like '%' + #{viewWorkIn.maktx} + '%'
- or maktx like '%' + #{viewWorkIn.maktx} + '%'
- or werks like '%' + #{viewWorkIn.maktx} + '%'
- or anfme like '%' + #{viewWorkIn.maktx} + '%'
- or altme like '%' + #{viewWorkIn.maktx} + '%'
- or zpallet like '%' + #{viewWorkIn.maktx} + '%'
- or bname like '%' + #{viewWorkIn.maktx} + '%'
+ <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="viewWorkIn.beginDate!=null and viewWorkIn.beginDate!='' ">
+ <if test="beginDate!=null and beginDate!='' ">
<![CDATA[
- and io_time >= #{viewWorkIn.beginDate}
+ and io_time >= #{beginDate}
]]>
</if>
- <if test="viewWorkIn.endDate!=null and viewWorkIn.endDate!='' ">
+ <if test="endDate!=null and endDate!='' ">
<![CDATA[
- and io_time <= #{viewWorkIn.endDate}
+ and io_time <= #{endDate}
]]>
</if>
-</sql>
+ </sql>
-<!-- 鍏ュ簱缁熻 -->
-<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
-<select id="queryViewWorkInList" parameterType="com.zy.asrs.common.wms.entity.ViewWorkInBean" resultType="com.zy.asrs.common.wms.entity.ViewWorkInBean">
- select * from asr_wrkin_view
- where 1=1
- <include refid="viewWorkInConditionSql"></include>
-</select>
+ <!-- 鍏ュ簱缁熻 -->
+ <!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
+ <select id="queryViewWorkInList" parameterType="com.zy.asrs.common.wms.entity.ViewWorkInBean" resultType="com.zy.asrs.common.wms.entity.ViewWorkInBean">
+ select * from asr_wrkin_view
+ where 1=1
+ <include refid="viewWorkInConditionSql"></include>
+ </select>
-<!-- 鍑哄簱缁熻 -->
-<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
-<select id="queryViewWorkOutList" parameterType="com.zy.asrs.common.wms.entity.ViewWorkInBean" resultType="com.zy.asrs.common.wms.entity.ViewWorkInBean">
- select *
- from asr_wrkout_view
- where 1=1
- <include refid="viewWorkInConditionSql"></include>
-</select>
+ <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
+ <select id="getViewWorkInAll" parameterType="map" resultType="com.zy.asrs.common.wms.entity.ViewWorkInBean">
+ select * from asr_wrkin_view
+ where 1=1
+ <include refid="viewWorkInConditionMapSql"></include>
+ </select>
+
+ <!-- 鍑哄簱缁熻 -->
+ <!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
+ <select id="queryViewWorkOutList" parameterType="com.zy.asrs.common.wms.entity.ViewWorkInBean" resultType="com.zy.asrs.common.wms.entity.ViewWorkInBean">
+ select *
+ from asr_wrkout_view
+ where 1=1
+ <include refid="viewWorkInConditionSql"></include>
+ </select>
+
+ <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
+ <select id="getViewWorkOutAll" parameterType="map" resultType="com.zy.asrs.common.wms.entity.ViewWorkInBean">
+ select *
+ from asr_wrkout_view a
+ where 1=1
+ <include refid="viewWorkInConditionMapSql"></include>
+ Order by a.io_time desc
+ </select>
</mapper>
--
Gitblit v1.9.1