From c3510da29a7974c6af7ff3de1ade3db429d6f848 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 18 八月 2021 14:27:59 +0800
Subject: [PATCH] 申购管理申请履历显示所有历史单据,提交时如有无效试剂耗材报错

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

diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
index 4522bcc..d79f0c2 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
@@ -208,6 +208,21 @@
 
         order by oa.update_time,oa.reserve
     </select>
+    <select id="countByReagentId" resultType="java.lang.Integer">
+        select ifnull(sum(owr.reserve),0)
+        from ope_warehouse_reserve as owr
+        where owr.reserve > 0
+        and owr.reagent_id = #{id}
+        and owr.valid_flag = 1
+        group by owr.reagent_id
+    </select>
+    <select id="getRowData" resultMap="OpeWarehouseReserve">
+
+        <include refid="queryColumns"/>
+        from ope_warehouse_reserve as oa
+        <include refid="queryJoins"/>
+        where oa.id = #{id}
+    </select>
 
     <update id="updateByReId" parameterType="java.util.Map">
         update ope_warehouse_reserve set reagent_id=#{newReId} where reagent_id=#{oldReId}
@@ -216,6 +231,7 @@
 
     <update id="updateCount" parameterType="java.util.Map">
         update ope_warehouse_reserve set reserve=reserve+1 where reagent_id=#{reagentId} and article_number=#{articleNumber}
+        and valid_flag = 1
     </update>
     <update id="updateBtReserve">
         UPDATE ope_warehouse_reserve

--
Gitblit v1.9.2