From 06ea3e5721995a4a4e1ae0db93d7f7dac1bfa162 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 11 三月 2026 15:20:05 +0800
Subject: [PATCH] 1.成品灌装完成后采集plc反馈的是否贴标信息随工作任务存入数据库中 2.库存查询界面以及出库提取界面新增是否贴标搜索筛选功能

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

diff --git a/src/main/resources/mapper/ViewStockUseMapper.xml b/src/main/resources/mapper/ViewStockUseMapper.xml
index 7f04cf5..cb6440b 100644
--- a/src/main/resources/mapper/ViewStockUseMapper.xml
+++ b/src/main/resources/mapper/ViewStockUseMapper.xml
@@ -57,12 +57,30 @@
 			ROW_NUMBER() OVER(Order by a.oneday desc) as row
 		, *
 		FROM(
-		SELECT * FROM asr_wrkin_count_view) a ) b
+		SELECT * FROM asr_wrkin_count_view
+		         WHERE
+		         1 = 1 AND
+		         (oneday > #{start}
+		         AND
+				oneday &lt; #{end})
+
+		         <if test="matnr != null and matnr !=''">
+					 and matnr = #{matnr}
+				 </if>
+
+		        ) a ) b
 		WHERE 1=1 and b.row between ((#{curr}-1)*#{limit}+1) and (#{curr}*#{limit})
 
 	</select>
 	<select id="selectWorkCountInTotal" resultType="java.lang.Integer">
 		SELECT COUNT(*) FROM asr_wrkin_count_view
+		WHERE 1= 1 AND
+		(oneday > #{start}
+		AND
+		oneday &lt; #{end})
+		<if test="matnr != null and matnr !='' ">
+			and matnr = #{matnr}
+		</if>
 	</select>
 	<select id="selectWorkCountOut" resultType="com.zy.asrs.entity.ViewWorkCountInView">
 		SELECT *
@@ -71,11 +89,28 @@
 					 ROW_NUMBER() OVER(Order by a.oneday desc) as row
 		, *
 				 FROM(
-						 SELECT * FROM asr_wrkout_count_view) a ) b
+						 SELECT * FROM asr_wrkout_count_view
+		WHERE
+		1 = 1 AND
+		(oneday > #{start}
+		AND
+		oneday &lt; #{end})
+
+		<if test="matnr != null and matnr !=''">
+			and matnr = #{matnr}
+		</if>
+		) a ) b
 		WHERE 1=1 and b.row between ((#{curr}-1)*#{limit}+1) and (#{curr}*#{limit})
 	</select>
 	<select id="selectWorkCountOutTotal" resultType="java.lang.Integer">
 		SELECT COUNT(*) FROM asr_wrkout_count_view
+		WHERE 1= 1 AND
+		(oneday > #{start}
+		AND
+		oneday &lt; #{end})
+		<if test="matnr != null and matnr !='' ">
+			and matnr = #{matnr}
+		</if>
 	</select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1