From 374fb9d9369271b9b858e11a8612850ad3560936 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期三, 11 十月 2023 10:22:40 +0800
Subject: [PATCH] 新增试剂供应商变更需求

---
 src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 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..7f3b285 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);
 
@@ -33,12 +33,12 @@
 
 	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