From 648449c0dc1db4531889a4689d45f0a442032d3a Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期二, 26 十月 2021 17:05:35 +0800
Subject: [PATCH] 申购管理的审批者--》如果申购人有课题组查到的审批者为申购人所在部门+所在课题组+是审批者+人员有效的以及申购人所在部门+无课题组+是审批者+人员有效的。如果申购人没有课题组查到的是申购人所在部门+是审批者+人员有效的

---
 src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java |   11 ++++++++---
 1 files changed, 8 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 e1dcab6..7f3b285 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java
@@ -33,18 +33,23 @@
 
 	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);
 
-	void btWarehouseReserveReduce(List<OpeApplyReserve> opeList,String userId);
+	void btWarehouseReserveReduce(List<OpeApplyReserve> opeList);
 
 	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