From 1cbac7aa20a183a9a893651bf0cef24b1909eb5c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 01 二月 2021 10:19:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master

---
 src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.java b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.java
index 52d826e..5c2db61 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.java
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.java
@@ -18,9 +18,13 @@
     @SuppressWarnings("rawtypes")
     int getOpeWarehouseReserveTotalCount(Map params) throws DataAccessException;
 
+    List<OpeWarehouseReserve> getOpeWarehouseReserveList2(Map params) throws DataAccessException;
+
     void insertOpeWarehouseReserve(OpeWarehouseReserve opeWarehouseReserve);
 
     int updateOpeWarehouseReserve(OpeWarehouseReserve opeWarehouseReserve);
+
+    int updateOpeWarehouseReserve2(OpeWarehouseReserve opeWarehouseReserve);
 
     OpeWarehouseReserve getOpeWarehouseReserve(OpeWarehouseReserve opeWarehouseReserve);
 
@@ -31,4 +35,10 @@
     void updateCount(Map<String ,Object> params);
 
     void insertOpeWarehouseReserve2(OpeWarehouseReserve ope);
+
+    List<OpeWarehouseReserve> selectWarehouseByReagentIdAndArticleNumber(Map params);
+
+    List<OpeWarehouseReserve> selectWarehouseByRidAndArtiNumberAndWid(Map params);
+
+    void updateBtReserve(String id, Integer useNum);
 }

--
Gitblit v1.9.2