From 78ea95ba31e63279b46d47c5c9ca983f3e0c8d47 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 26 一月 2021 18:08:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml
index 5025194..e1e86dc 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml
@@ -434,4 +434,18 @@
 	and valid_flag = 1
 	ORDER BY update_time
 </select>
+    <select id="countReagentByArticleAndWarehouse" resultType="java.lang.Integer">
+		select count(*)
+		from ope_reagent_status
+		WHERE status = 1
+		<if test="reagentId != null and reagentId !=''">
+			and reagent_id = #{reagentId}
+		</if>
+		<if test="articleNumber != null and articleNumber !=''">
+			and article_number = #{articleNumber}
+		</if>
+		<if test="warehouseId != null and warehouseId !=''">
+			and house_id = #{warehouseId}
+		</if>
+	</select>
 </mapper>

--
Gitblit v1.9.2