From cf6b965a86065a537a40c74f67e88a04447d2582 Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期一, 12 七月 2021 18:00:38 +0800 Subject: [PATCH] 修改导入申购 --- src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java index a36d097..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); @@ -68,7 +69,7 @@ boolean updateReagentStatus(OpeReagentStatus opeReagentStatus); boolean updateReagentStatus2(OpeReagentStatus opeReagentStatus); - boolean updateReagentStatus3(OpeReagentStatus opeReagentStatus); + boolean updateReagentStatus3(List<String> reagentCodes,String userId,String projectNum,String laboratoryId,String laboratoryContainerId); int getLogOpeReagentStatusTotalCount(String reagentLogId, Integer status, String userLogId, String loginId); @@ -103,8 +104,14 @@ List<String> generateReagentCode(String startReagentCode2, String endReagentCode2); - void updateOpeReagentStatus(OpeReagentStatus opeReagentStatus); + int updateOpeReagentStatus(OpeReagentStatus opeReagentStatus); 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