From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: Mon, 01 Jul 2024 10:58:35 +0800
Subject: [PATCH] change

---
 src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java |   74 +++++++++++++++++++-----------------
 1 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java
index a8eca2e..e2f8741 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java
@@ -28,30 +28,32 @@
 	 * @param pageSize
 	 * @return
 	 */
-	List<OpeReagentStatus> getOpeReagentStatusList(String reagentId, String articleNumber, Integer status,
-			String reagentCode, String userId, Integer first, Integer pageSize);
+	List<OpeReagentStatus> getOpeReagentStatusList(Long reagentId, String articleNumber, Integer status,
+			String reagentCode, Long userId, Integer first, Integer pageSize);
 
-	int getOpeReagentStatusTotalCount(String reagentId, String articleNumber, Integer status, String reagentCode,
-			String userId);
+	int getOpeReagentStatusTotalCount(Long reagentId, String articleNumber, Integer status, String reagentCode,
+									  Long userId);
 
-	public List<OpeReagentStatus> getOpeReagentStatusListForLab(String name, String articleNumber, Integer status,
-																String reagentCode, String userId, String labName, Integer first, Integer pageSize);
-	public int getOpeReagentStatusTotalCountForLab(String name, String articleNumber, Integer status, String reagentCode,
-												   String userId,String labName);
-	List<OpeReagentStatus> getOpeReagentStatusListByName(String reagentId, String articleNumber, Integer status,
-			String reagentCode, String userId, Integer first, Integer pageSize);
+	public List<OpeReagentStatus> getOpeReagentStatusListForLab(Long reagentId,String name, String articleNumber, Integer status,
+																String reagentCode, Long userId, String labName, Integer first, Integer pageSize);
+	public int getOpeReagentStatusTotalCountForLab(Long reagentId,String name, String articleNumber, Integer status, String reagentCode,
+												   Long userId,String labName);
+	List<OpeReagentStatus> getOpeReagentStatusListByName(Long reagentId, String articleNumber, Integer status,
+			String reagentCode, Long userId, Integer first, Integer pageSize);
 
-	int getOpeReagentStatusTotalCountByName(String reagentId, String articleNumber, Integer status, String reagentCode,
-			String userId);
-	List<OpeReagentStatus> getPersonReagentStatusListByName(String reagentId, String articleNumber,
-			String reagentCode, String userId,String applyPerson,Date startTime,Date endTime, Integer first, Integer pageSize);
+	int getOpeReagentStatusTotalCountByName(Long reagentId, String articleNumber, Integer status, String reagentCode,
+			Long userId);
+	List<OpeReagentStatus> getPersonReagentStatusListByName(Long reagentId, String articleNumber,
+			String reagentCode, Long userId,String applyPerson,Date startTime,Date endTime, Integer first, Integer pageSize);
 
-	int getPersonReagentStatusTotalCountByName(String reagentId, String articleNumber, String reagentCode,
-											   String userId, String applyPerson, Date startTime, Date endTime);
+	int getPersonReagentStatusTotalCountByName(Long reagentId, String articleNumber, String reagentCode,
+											   Long userId, String applyPerson, Date startTime, Date endTime);
 
 	OpeReagentStatus insertOpeReagentStatus(OpeReagentStatus opeReagentStatus);
 
-	OpeReagentStatus getOpeReagentStatus(String id);
+	int batchInsertOpeReagentStatus(List<OpeReagentStatus> OpeReagentStatusList);
+
+	OpeReagentStatus getOpeReagentStatusById(Long id);
 
 	OpeReagentStatus getOpeReagentStatusByReagentCode(String reagentCode);
 
@@ -64,23 +66,23 @@
 
 	boolean isAllowWarehouseUse(OpeReagentStatus opeReagentStatus);
 
-	boolean isAllowWarehouseUseByIds(List<String> ids);
+	boolean isAllowWarehouseUseByIds(List<Long> 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,Long userId,Long projectId,Long laboratoryId,Long laboratoryContainerId,String receiptNumber);
 
-	int getLogOpeReagentStatusTotalCount(String reagentLogId, Integer status, String userLogId, String loginId);
+	int getLogOpeReagentStatusTotalCount(Long reagentLogId, Integer status, Long userLogId, Long loginId);
 
-	List<OpeReagentStatus> getLogOpeReagentStatusList(String reagentLogId, Integer status, String userLogId,
-			String loginId, Integer first, Integer pageSize);
+	List<OpeReagentStatus> getLogOpeReagentStatusList(Long reagentLogId, Integer status, Long userLogId,
+													  Long loginId, Integer first, Integer pageSize);
 
-	void putReagentInLaboratory(String reagentCode, String barCode, String containerCode, SysUser sysUser);
+	void putReagentInLaboratory(String reagentCode, Long labId, Long labContainerId, Long userId);
 
-	boolean store(List<OpeReagentStatus> selectedStoreList, String laboratoryId, String laboratoryContainerId);
+	boolean store(List<OpeReagentStatus> selectedStoreList, Long laboratoryId, Long laboratoryContainerId);
 
-	public List<OpeReagentStatus> getOpeReagentStatusInfoList(String startTime,String endTime, String containerid, String status);
+	public List<OpeReagentStatus> getOpeReagentStatusInfoList(String startTime,String endTime, Long containerid, String status);
 
 	public void syncOpeReagentStatus(List<LinkedHashMap> reagentStatusList);
 
@@ -92,13 +94,13 @@
 
 	void batchUpdateStatusByCode(List<PersonUseDetail> list) throws Exception;
 
-	public List<OpeReagentStatus> selectByReId(String id);
-	public void updateByReId(String newReId,String oldReId);
+	public List<OpeReagentStatus> selectByReId(Long id);
+	public void updateByReId(Long newReId,Long oldReId);
 
 
-	List<String> getReagentCodes(String reagentId);
+	List<String> getReagentCodes(Long reagentId);
 	//订单入库 新增试剂状态表 和流向
-    void orderInputWarehouseReagentStatusAndUseFlow(OpeApplyReserve opeApplyReserve, String userId, List<String> reagentCodeList , OpeOrder opeOrder);
+    void orderInputWarehouseReagentStatusAndUseFlow(OpeApplyReserve opeApplyReserve, Long userId, List<String> reagentCodeList , OpeOrder opeOrder);
 
 	List<String> checkReagentCode(String startReagentCode2, String endReagentCode2,Integer arrivalNum) throws BusinessException;
 
@@ -106,15 +108,17 @@
 
 	int updateOpeReagentStatus(OpeReagentStatus opeReagentStatus);
 
-	int getReagentNumInWarehouse(String id, String articleNumber, String warehouseId);
+	int getReagentNumInWarehouse(Long id, String articleNumber, Long warehouseId);
 
     List<Map> selectExportList(String name, String articleNumber, Integer status,
-							   String reagentCode, String userId,String labName);
+							   String reagentCode, Long userId,String labName);
 
 	void exportLabStock2Excel(List<Map> list) throws Exception;
 
-    OpeReagentStatus getStatus(String reagentId, String reagentCode);
+    OpeReagentStatus getStatus(Long reagentId, String reagentCode);
 
-	List<OpeReagentStatus> getOpeReagentStatusList22(String reagentId, String articleNumber, Integer status,
-															String reagentCode, String userId, Integer first, Integer pageSize);
+	List<OpeReagentStatus> getOpeReagentStatusList22(Long reagentId, String articleNumber, Integer status,
+															String reagentCode, Long userId,String applyCode, Integer first, Integer pageSize);
+
+	Integer getReagentStatusCountByApplyCode(String applyCode);
 }

--
Gitblit v1.9.2