From 1123d12eb51d23edcd4a39660ef8cd47802b931d Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期二, 30 一月 2024 11:06:32 +0800
Subject: [PATCH] change config

---
 src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java b/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java
index 71b4738..8ae6466 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java
@@ -16,8 +16,8 @@
                                                          Integer pageSize);
 	int getOpeWarehouseReserveTotalCount(String reagentId, String supplierId);
 	List<OpeWarehouseReserve> getOpeWarehouseReserveListByName(String reagentId, String supplierId, Integer first,
-			Integer pageSize,String productSn);
-	int getOpeWarehouseReserveTotalCountByName(String reagentId, String supplierId,String productSn);
+			Integer pageSize,String productSn,String warehouseName);
+	int getOpeWarehouseReserveTotalCountByName(String reagentId, String supplierId,String productSn,String warehouseName);
 	OpeWarehouseReserve getOpeWarehouseReserve(String reagentId, String articleNumber);
 	OpeWarehouseReserve getOpeWarehouseReserve2(String reagentId, String articleNumber,String warehouseId);
 
@@ -26,19 +26,19 @@
 
 	OpeWarehouseReserve insertOpeWarehouseReserve(OpeWarehouseReserve opeWarehouseReserve);
 	boolean updateOpeWarehouseReserve(OpeWarehouseReserve opeWarehouseReserve);
-	void claim(List<OpeWarehouseReserve> selectedList, String userId,String projectNum);
-	void claimForPerson(List<OpeApplyReserve> selectedListForPerson, String userId,String projectNum,String laboratoryId,String laboratoryContainerId);
+	void claim(List<OpeWarehouseReserve> selectedList, String userId,String projectNum,String receiptNumber);
+	void claimForPerson(List<OpeApplyReserve> selectedListForPerson, String userId,String projectNum,String laboratoryId,String laboratoryContainerId,String receiptNumber);
 	void reagentDStore(List<OpeApply> reagentDStoreList, String loginUserId);
 	void reagentDStore2(List<OpeApply> reagentDStoreList, String loginUserId);
 
 	void reagentDStore3(List<OpeApply> reagentDStoreList, String loginUserId);
 
-	void reagentDStore4(List<OpeApply> reagentDStoreList, String loginUserId);
+	void reagentDStore4(List<OpeApply> reagentDStoreList, String loginUserId,String receiptNumber);
 
 	public List<OpeWarehouseReserve> selectByReId(String id);
 	public void updateByReId(String newReId,String oldReId);
 
-	void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo);
+	void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo,String consigneeId);
 
 	List<OpeWarehouseReserve> selectWarehouseByReagentIdAndArticleNumber(String id,String articleNumber,boolean flag);
 
@@ -47,4 +47,9 @@
 	List<OpeWarehouseReserve> selectWarehouseByRidAndArticleNumberAndWarehouse(String id, String articleNumber, String warehouseId);
 
 	void updateBtReserve(String id,Integer useNum);
+
+	//根据试剂Id查找当前库存
+    int countByReagentId(String id);
+
+    OpeWarehouseReserve getRowData(String rowKey);
 }

--
Gitblit v1.9.2