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

---
 src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java
index a96607c..a193774 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java
@@ -67,6 +67,8 @@
 	boolean updateReagentStatus(OpeReagentStatus opeReagentStatus);
 	boolean updateReagentStatus2(OpeReagentStatus opeReagentStatus);
 
+	boolean updateReagentStatus3(OpeReagentStatus opeReagentStatus);
+
 	int getLogOpeReagentStatusTotalCount(String reagentLogId, Integer status, String userLogId, String loginId);
 
 	List<OpeReagentStatus> getLogOpeReagentStatusList(String reagentLogId, Integer status, String userLogId,
@@ -98,6 +100,10 @@
 
 	List<String> checkReagentCode(String startReagentCode2, String endReagentCode2,Integer arrivalNum) throws BusinessException;
 
+	List<String> generateReagentCode(String startReagentCode2, String endReagentCode2);
 
 	void updateOpeReagentStatus(OpeReagentStatus opeReagentStatus);
+
+	int getReagentNumInWarehouse(String id, String articleNumber, String warehouseId);
+
 }

--
Gitblit v1.9.2