From 3bc79850da426a40002a5d07ceb63fcbcdc2d93d Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期三, 16 六月 2021 09:39:51 +0800
Subject: [PATCH] 危废处理取消和恢复

---
 src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 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..051266e 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);
 
@@ -38,7 +38,7 @@
 	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,7 @@
 	List<OpeWarehouseReserve> selectWarehouseByRidAndArticleNumberAndWarehouse(String id, String articleNumber, String warehouseId);
 
 	void updateBtReserve(String id,Integer useNum);
+
+	//根据试剂Id查找当前库存
+    int countByReagentId(String id);
 }

--
Gitblit v1.9.2