From 1cbac7aa20a183a9a893651bf0cef24b1909eb5c Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期一, 01 二月 2021 10:19:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' 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 853a862..da2cb69 100644 --- a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java +++ b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java @@ -1,6 +1,7 @@ package com.nanometer.smartlab.service; import com.nanometer.smartlab.entity.*; +import com.nanometer.smartlab.exception.BusinessException; import java.util.Date; import java.util.LinkedHashMap; @@ -66,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, @@ -97,6 +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