From 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 12 十一月 2021 12:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.java | 15 +++++++++++++++
1 files changed, 15 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..cbd8380 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.java
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.java
@@ -4,6 +4,7 @@
import java.util.Map;
import com.nanometer.smartlab.entity.OpeApply;
+import org.apache.ibatis.annotations.Param;
import org.springframework.dao.DataAccessException;
import com.nanometer.smartlab.entity.OpeWarehouseReserve;
@@ -18,9 +19,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 +36,14 @@
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);
+
+ Integer countByReagentId(String id);
+
+ OpeWarehouseReserve getRowData(@Param("id") String rowKey);
}
--
Gitblit v1.9.2