From 760e53aeef80c287ced8b6716336733867fc7565 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期四, 07 三月 2024 08:30:57 +0800
Subject: [PATCH] 新增需求
---
src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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..42c2adb 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);
@@ -66,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);
@@ -109,7 +109,12 @@
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);
+
+ List<OpeReagentStatus> getOpeReagentStatusList22(String reagentId, String articleNumber, Integer status,
+ String reagentCode, String userId, Integer first, Integer pageSize);
}
--
Gitblit v1.9.2