From 7a9fd36cadbd5f0d8737955f0edd79e38ef19eaf Mon Sep 17 00:00:00 2001
From: 郑永安 <zyazyz250@sina.com>
Date: 星期二, 20 六月 2023 14:48:59 +0800
Subject: [PATCH] SQL异常修复

---
 src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java b/src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java
index 07a1fdd..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,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