From a1e90c3da21d88f994bac9c1feb91bf40e53a44d Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Wed, 18 Aug 2021 13:01:21 +0800
Subject: [PATCH] 耗材无供应商也显示，申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材
---
src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
index 0a2d528..2c693b9 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
@@ -200,7 +200,9 @@
LEFT JOIN sys_reagent sr2 on sr2.id = ouf.user_id
</if>
WHERE
- LENGTH(trim(ouf.receipt_number))>0
+ (ouf.operatestate = #{operatestate}
+ or ouf.operatestate = #{operatestate1})
+ and LENGTH(trim(ouf.receipt_number))>0
and ouf.valid_flag = 1
<if test="reagentCode !=null and reagentCode != ''">
and ouf.reagent_code like concat("%",#{reagentCode},"%")
@@ -249,7 +251,10 @@
<if test="userId !=null and userId != ''">
LEFT JOIN sys_reagent sr2 on sr2.id = ouf.user_id
</if>
- WHERE LENGTH(trim(ouf.receipt_number))>0
+ WHERE
+ (ouf.operatestate = #{operatestate}
+ or ouf.operatestate = #{operatestate1})
+ and LENGTH(trim(ouf.receipt_number))>0
and ouf.valid_flag = 1
<if test="reagentCode !=null and reagentCode != ''">
and ouf.reagent_code like concat("%",#{reagentCode},"%")
@@ -300,7 +305,9 @@
LEFT JOIN base_meta bm2 on bm2.id = sr.product_home
LEFT JOIN base_meta bm3 on bm3.id = sr.control_products
WHERE
- ouf.receipt_number = #{receiptNumber}
+ (ouf.operatestate = #{operatestate}
+ or ouf.operatestate = #{operatestate1})
+ and ouf.receipt_number = #{receiptNumber}
and ouf.valid_flag = 1
</select>
@@ -315,7 +322,8 @@
LEFT JOIN base_meta bm1 on bm1.id = sr.reagent_unit
LEFT JOIN base_meta bm2 on bm2.id = sr.product_home
LEFT JOIN base_meta bm3 on bm3.id = sr.control_products
- WHERE ouf.operatestate = #{operatestate}
+ WHERE (ouf.operatestate = #{operatestate}
+ or ouf.operatestate = #{operatestate})
and ouf.receipt_number = #{receiptNumber}
and ouf.valid_flag = 1
</select>
@@ -356,8 +364,9 @@
<if test="userId !=null and userId != ''">
LEFT JOIN sys_reagent sr2 on sr2.id = ouf.user_id
</if>
- WHERE
- LENGTH(trim(ouf.receipt_number))>0
+ WHERE (ouf.operatestate = #{operatestate}
+ or ouf.operatestate = #{operatestate1})
+ and LENGTH(trim(ouf.receipt_number))>0
and ouf.valid_flag = 1
and ouf.receipt_number = #{receiptNumber}
group by ouf.receipt_number
--
Gitblit v1.9.2