From 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 12 十一月 2021 12:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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