From 13812c31cf964e42e81c776207e131446efe8cfe Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 02 二月 2021 18:05:00 +0800
Subject: [PATCH] update

---
 src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 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..25b2cd3 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml
@@ -223,7 +223,6 @@
     from ope_reagent_status as oa
    <include refid="queryJoins3"/>
     where oa.valid_flag = 1
-    	  and (oa.status = -1 or oa.status = 0 )
     <include refid="queryWhereSql3"/>
 	<if	test="applyPerson != null and applyPerson != ''"  >
 		and su.name like concat("%",#{applyPerson},"%")
@@ -263,7 +262,6 @@
    <include refid="queryJoins2"/>
    left  join sys_user su on su.id = oa.user_id
     where oa.valid_flag = 1
-   		 and (oa.status = -1 or oa.status = 0 )
     <include refid="queryWhereSql2"/>
 	  <if	test="applyPerson != null and applyPerson != ''"  >
 		  and su.name like concat("%",#{applyPerson},"%")
@@ -427,11 +425,29 @@
 	<update id="updateByReId" parameterType="java.util.Map">
         update ope_reagent_status set reagent_id=#{newReId} where reagent_id=#{oldReId}
     </update>
+    <update id="updateArticleNumberByRCode">
+		update ope_reagent_status set article_number = #{1}
+		where reagent_code = #{0}
+	</update>
 
-<select id="selectReagentCodesByReId" parameterType="java.lang.String" resultType="java.lang.String">
+    <select id="selectReagentCodesByReId" parameterType="java.lang.String" resultType="java.lang.String">
 	select reagent_code from ope_reagent_status WHERE
 	reagent_id = #{reagentId}
 	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