From 178788d231d7d891c1874635b8e11dd951fc4230 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 25 六月 2021 18:10:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.java b/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.java
index 08b49ff..7493206 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.java
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.java
@@ -37,7 +37,7 @@
 
     List<OpeReagentStatus> getOpeReagentStatusInfoList(Map params) throws DataAccessException;
 
-    void syncOpeReagentStatus(Map params) throws DataAccessException;
+    int syncOpeReagentStatus(Map params) throws DataAccessException;
 
     int updateOpeReagentStatusForInterface(OpeReagentStatus opeReagentStatus);
 
@@ -51,4 +51,15 @@
     public int updateByReId(Map params);
 
     List<String> selectReagentCodesByReId(String reagentId);
+
+    void insertOpeReagentStatus2(OpeReagentStatus ors);
+
+    int countReagentByArticleAndWarehouse(Map params);
+
+    void updateArticleNumberByRCode(String code, String articleNumber);
+
+    List<Map> selectExportList(Map params);
+
+    OpeReagentStatus getStatus(@Param("reagentId") String reagentId,@Param("reagentCode") String reagentCode);
+
 }

--
Gitblit v1.9.2