From 78ea95ba31e63279b46d47c5c9ca983f3e0c8d47 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 26 一月 2021 18:08:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.java |    8 ++++++++
 1 files changed, 8 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..b8b67db 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.java
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.java
@@ -18,6 +18,8 @@
     @SuppressWarnings("rawtypes")
     int getOpeWarehouseReserveTotalCount(Map params) throws DataAccessException;
 
+    List<OpeWarehouseReserve> getOpeWarehouseReserveList2(Map params) throws DataAccessException;
+
     void insertOpeWarehouseReserve(OpeWarehouseReserve opeWarehouseReserve);
 
     int updateOpeWarehouseReserve(OpeWarehouseReserve opeWarehouseReserve);
@@ -31,4 +33,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