From a1e90c3da21d88f994bac9c1feb91bf40e53a44d Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 18 八月 2021 13:01:21 +0800
Subject: [PATCH] 耗材无供应商也显示,申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材

---
 src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java
index 3b30d16..e32eaf2 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java
@@ -35,9 +35,9 @@
 			String userId);
 
 	public List<OpeReagentStatus> getOpeReagentStatusListForLab(String name, String articleNumber, Integer status,
-																String reagentCode, String userId, Integer first, Integer pageSize);
+																String reagentCode, String userId, String labName, Integer first, Integer pageSize);
 	public int getOpeReagentStatusTotalCountForLab(String name, String articleNumber, Integer status, String reagentCode,
-												   String userId);
+												   String userId,String labName);
 	List<OpeReagentStatus> getOpeReagentStatusListByName(String reagentId, String articleNumber, Integer status,
 			String reagentCode, String userId, Integer first, Integer pageSize);
 
@@ -109,7 +109,9 @@
 	int getReagentNumInWarehouse(String id, String articleNumber, String warehouseId);
 
     List<Map> selectExportList(String name, String articleNumber, Integer status,
-							   String reagentCode, String userId);
+							   String reagentCode, String userId,String labName);
 
 	void exportLabStock2Excel(List<Map> list) throws Exception;
+
+    OpeReagentStatus getStatus(String reagentId, String reagentCode);
 }

--
Gitblit v1.9.2