From 002f10f7d38dc6791d26a69d061e6b17f9980fd0 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 24 三月 2025 19:41:36 +0800
Subject: [PATCH] 1

---
 src/main/resources/mapper/ViewWorkInMapper.xml |  330 ++++++++++++++++++++++++++++++------------------------
 1 files changed, 181 insertions(+), 149 deletions(-)

diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index b8c0865..848ea9d 100644
--- a/src/main/resources/mapper/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/ViewWorkInMapper.xml
@@ -1,161 +1,193 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zy.asrs.mapper.ReportQueryMapper">
 
-<!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
-<sql id="viewWorkInConditionSql">	
-		<if test="loc_no!=null and loc_no!='' ">
-			and loc_no like '%' + #{loc_no} + '%'
-		</if>
-		<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>
-		<if test="begin_date!=null and begin_date!='' ">
-			<![CDATA[
-			and io_time >= #{begin_date} 			
-			]]>			
-		</if>	
-		<if test="end_date!=null and end_date!='' ">
-			<![CDATA[
-			and io_time <= #{end_date} 			
-			]]>			
-		</if>
-</sql>
+    <!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
+    <sql id="viewWorkInConditionSql">
+        <if test="loc_no!=null and loc_no!='' ">
+            and loc_no like '%' + #{loc_no} + '%'
+        </if>
+        <if test="supp_code!=null and supp_code!='' ">
+            and supp_code like '%' + #{supp_code} + '%'
+        </if>
+        <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>
+        <if test="begin_date!=null and begin_date!='' ">
+            <![CDATA[
+			and io_time >= #{begin_date}
+			]]>
+        </if>
+        <if test="end_date!=null and end_date!='' ">
+            <![CDATA[
+			and io_time <= #{end_date}
+			]]>
+        </if>
+        <if test="loc_type1!=null ">
+            and loc_type1 =#{loc_type1}
+        </if>
+        <if test="floor!=null">
+            and floor =#{floor}
+        </if>
+    </sql>
 
-<sql id="viewWorkOutConditionSql">	
-		<if test="loc_no!=null and loc_no!='' ">
-			and loc_no like '%' + #{loc_no} + '%'
-		</if>
-		<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>
-		<if test="begin_date!=null and begin_date!='' ">
-			<![CDATA[
-			and crn_str_time >= #{begin_date} 			
-			]]>			
-		</if>	
-		<if test="end_date!=null and end_date!='' ">
-			<![CDATA[
-			and crn_str_time <= #{end_date} 			
-			]]>			
-		</if>
-</sql>
+    <sql id="viewWorkOutConditionSql">
+        <if test="loc_no!=null and loc_no!='' ">
+            and loc_no like '%' + #{loc_no} + '%'
+        </if>
+        <if test="supp_code!=null and supp_code!='' ">
+            and supp_code like '%' + #{supp_code} + '%'
+        </if>
+        <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>
+        <if test="begin_date!=null and begin_date!='' ">
+            <![CDATA[
+			and crn_str_time >= #{begin_date}
+			]]>
+        </if>
+        <if test="end_date!=null and end_date!='' ">
+            <![CDATA[
+			and crn_str_time <= #{end_date}
+			]]>
+        </if>
+        <if test="loc_type1!=null ">
+            and loc_type1 =#{loc_type1}
+        </if>
+        <if test="floor!=null">
+            and floor =#{floor}
+        </if>
+    </sql>
 
-<!-- 鍏ュ簱缁熻 -->
-<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
-<select id="queryViewWorkInList" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
-select * from ( 
-select *,ROW_NUMBER() OVER(Order by io_time desc) as rowid
- from asr_wrkin_view
-<where>
-	1=1
- 	<include refid="viewWorkInConditionSql"></include>
-</where>
- ) as a
-<where>
-	rowid between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
-	<![CDATA[
-		order by io_time desc
-	]]>
-</where>
-</select>
+    <!-- 鍏ュ簱缁熻 -->
+    <!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
+    <select id="queryViewWorkInList" parameterType="com.zy.asrs.entity.ViewWorkInBean"
+            resultType="com.zy.asrs.entity.ViewWorkInBean">
+        select
+        *
+        from (
+        select
+        ROW_NUMBER() OVER(Order by t.io_time desc) as row
+        , *
+        from (
+        select *
+        from asr_wrkin_view
+        where 1=1
+        <include refid="viewWorkInConditionSql"></include>
+        ) t
+        ) a where 1=1
+        <if test="pageNumber!=null and pageSize!=null">
+            and a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+        </if>
+    </select>
 
-<select id="getViewWorkInCount" parameterType="com.zy.asrs.entity.ViewWorkInBean"	resultType="Integer">
-select count(1) from asr_wrkin_view a
-<where>
-<![CDATA[
-	1=1
-]]>
-<include refid="viewWorkInConditionSql"></include>
-</where>
-</select>
+    <select id="getViewWorkInCount" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="Integer">
+        select count(1)
+        from asr_wrkin_view a
+        where 1=1
+        <include refid="viewWorkInConditionSql"></include>
+    </select>
 
-<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
-<select id="getViewWorkInAll" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
-select * from asr_wrkin_view a
-<where>
-	<![CDATA[
- 		1=1
- 	]]>
-	<include refid="viewWorkInConditionSql"></include>
-	<![CDATA[
-		order by io_time desc
-	]]>
-</where>
-</select>
+    <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
+    <select id="getViewWorkInAll" parameterType="com.zy.asrs.entity.ViewWorkInBean"
+            resultType="com.zy.asrs.entity.ViewWorkInBean">
+        <!--	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>
+    </select>
 
-<!-- 鍑哄簱缁熻 -->
-<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
-<select id="queryViewWorkOutList" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
-select * from ( 
-select *,ROW_NUMBER() OVER(Order by io_time desc) as rowid
- from asr_wrkout_view
-<where>
-	1=1
- 	<include refid="viewWorkOutConditionSql"></include>
-</where>
- ) as a
-<where>
-	rowid between ((#{pageNumber}-1)*#{pageSize}) and (#{pageNumber}*#{pageSize})
-	<![CDATA[
-		order by io_time desc
-	]]>
-</where>
-</select>
+    <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝ERP璋冪敤 -->
+    <select id="getViewWorkInERP" parameterType="com.zy.asrs.entity.ViewWorkInBean"
+            resultType="com.zy.asrs.entity.ViewWorkInBean">
+        select top 100 *
+        from asr_wrkin_view
+        where 1 = 1
+        Order by io_time desc
+    </select>
 
-<select id="getViewWorkOutCount" parameterType="com.zy.asrs.entity.ViewWorkInBean"	resultType="Integer">
-select count(1) from asr_wrkout_view a
-<where>
-<![CDATA[
-	1=1
-]]>
-<include refid="viewWorkOutConditionSql"></include>
-</where>
-</select>
+    <!-- 鍑哄簱缁熻 -->
+    <!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
+    <select id="queryViewWorkOutList" parameterType="com.zy.asrs.entity.ViewWorkInBean"
+            resultType="com.zy.asrs.entity.ViewWorkInBean">
 
-<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
-<select id="getViewWorkOutAll" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
-select * from asr_wrkout_view a
-<where>
-	<![CDATA[
- 		1=1
- 	]]>
-	<include refid="viewWorkOutConditionSql"></include>
-	<![CDATA[
-		order by io_time desc
-	]]>
-</where>
-</select>
 
-</mapper>
\ No newline at end of file
+        select
+        *
+        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
+        ) a where 1=1
+        <if test="pageNumber!=null and pageSize!=null">
+            and a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+        </if>
+    </select>
+
+    <select id="getViewWorkOutCount" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="Integer">
+        select count(1)
+        from asr_wrkout_view a
+        where 1=1
+        <include refid="viewWorkInConditionSql"></include>
+    </select>
+
+    <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
+    <select id="getViewWorkOutAll" parameterType="com.zy.asrs.entity.ViewWorkInBean"
+            resultType="com.zy.asrs.entity.ViewWorkInBean">
+        select *
+        from asr_wrkout_view a
+        where 1=1
+        <include refid="viewWorkInConditionSql"></include>
+        Order by a.io_time desc
+    </select>
+
+    <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝ERP璋冪敤 -->
+    <select id="getViewWorkOutERP" parameterType="com.zy.asrs.entity.ViewWorkInBean"
+            resultType="com.zy.asrs.entity.ViewWorkInBean">
+        select top 100 *
+        from asr_wrkout_view
+        where 1 = 1
+        Order by io_time desc
+    </select>
+
+</mapper>

--
Gitblit v1.9.1