From 59d9ea33f503e363f2e2941c7c00cc9dd9d9d1c7 Mon Sep 17 00:00:00 2001 From: kongzy <kongzy> Date: 星期二, 28 十一月 2023 11:00:42 +0800 Subject: [PATCH] 修改课题管理bug --- src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java | 18 ++++++++++++++---- 1 files changed, 14 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 700b8c3..42c2adb 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); @@ -65,10 +66,10 @@ boolean isAllowWarehouseUseByIds(List<String> ids); - boolean updateReagentStatus(OpeReagentStatus opeReagentStatus); + boolean updateReagentStatus(OpeReagentStatus opeReagentStatus,String receiptNumber); boolean updateReagentStatus2(OpeReagentStatus opeReagentStatus); - boolean updateReagentStatus3(List<String> reagentCodes,String userId,String projectNum,String laboratoryId,String laboratoryContainerId); + boolean updateReagentStatus3(List<String> reagentCodes,String userId,String projectNum,String laboratoryId,String laboratoryContainerId,String receiptNumber); int getLogOpeReagentStatusTotalCount(String reagentLogId, Integer status, String userLogId, String loginId); @@ -107,4 +108,13 @@ 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); + + List<OpeReagentStatus> getOpeReagentStatusList22(String reagentId, String articleNumber, Integer status, + String reagentCode, String userId, Integer first, Integer pageSize); } -- Gitblit v1.9.2