From 82bcd0328dddbaad65933e2fada22bc68e82b3d5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 26 八月 2023 10:07:46 +0800
Subject: [PATCH] # 导入订单增加单据类型

---
 src/main/resources/mapper/ViewStockUseMapper.xml |   38 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/ViewStockUseMapper.xml b/src/main/resources/mapper/ViewStockUseMapper.xml
index cb6440b..2362f2e 100644
--- a/src/main/resources/mapper/ViewStockUseMapper.xml
+++ b/src/main/resources/mapper/ViewStockUseMapper.xml
@@ -60,7 +60,7 @@
 		SELECT * FROM asr_wrkin_count_view
 		         WHERE
 		         1 = 1 AND
-		         (oneday > #{start}
+		         (oneday >= #{start}
 		         AND
 				oneday &lt; #{end})
 
@@ -75,7 +75,7 @@
 	<select id="selectWorkCountInTotal" resultType="java.lang.Integer">
 		SELECT COUNT(*) FROM asr_wrkin_count_view
 		WHERE 1= 1 AND
-		(oneday > #{start}
+		(oneday >= #{start}
 		AND
 		oneday &lt; #{end})
 		<if test="matnr != null and matnr !='' ">
@@ -112,5 +112,39 @@
 			and matnr = #{matnr}
 		</if>
 	</select>
+	<sql id="checkReportCondition">
+		<if test="matnr!=null and matnr!='' ">
+			and matnr like '%' + #{matnr} + '%'
+		</if>
+		<if test="maktx!=null and maktx!='' ">
+			and maktx like '%' + #{maktx} + '%'
+		</if>
+		<if test="specs!=null and specs!='' ">
+			and specs like '%' + #{specs} + '%'
+		</if>
+		<if test="batch!=null and batch!='' ">
+			and batch like '%' + #{batch} + '%'
+		</if>
+		<if test="zpallet!=null and zpallet!='' ">
+			and zpallet like '%' + #{zpallet} + '%'
+		</if>
+		<if test="locNo!=null and locNo!='' ">
+			and locNo like '%' + #{locNo} + '%'
+		</if>
+		<if test="staNo!=null and staNo!='' ">
+			and staNo like '%' + #{staNo} + '%'
+		</if>
+
+	</sql>
+    <select id="selectCheckReport" resultType="com.zy.asrs.entity.result.CheckReport">
+		SELECT  * FROM (
+		SELECT ROW_NUMBER() OVER(Order by appeTime desc ) as row , * FROM asr_check_report WHERE 1 = 1
+		<include refid="checkReportCondition"></include>  ) as a WHERE a.row between #{curr} and #{limit}
+	</select>
+	<select id="selectCheckReportCount" resultType="java.lang.Integer">
+
+		SELECT COUNT(*) FROM asr_check_report WHERE 1 = 1
+		<include refid="checkReportCondition"></include>
+	</select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1