From af607e09de61badbaef57bc0d38002e48a44ac4c Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期五, 12 十一月 2021 12:48:50 +0800 Subject: [PATCH] 订单领取申领人被删除报错 --- src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java index 700b8c3..e32eaf2 100644 --- a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java +++ b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java @@ -7,6 +7,7 @@ import java.util.Date; import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; /** * Created by maweiqing on 17/12/12. @@ -34,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); @@ -107,4 +108,10 @@ int getReagentNumInWarehouse(String id, String articleNumber, String warehouseId); + List<Map> selectExportList(String name, String articleNumber, Integer status, + String reagentCode, String userId,String labName); + + void exportLabStock2Excel(List<Map> list) throws Exception; + + OpeReagentStatus getStatus(String reagentId, String reagentCode); } -- Gitblit v1.9.2