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

---
 src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java |    7 +++++++
 1 files changed, 7 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 423d54f..da2cb69 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,4 +100,9 @@
 
 	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