From 3cc43725fa2e4b8ed4b4b00b845a7dc83f99f39a Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期二, 23 二月 2021 16:53:35 +0800 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master --- src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 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..a36d097 100644 --- a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java +++ b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java @@ -1,6 +1,8 @@ package com.nanometer.smartlab.service; import com.nanometer.smartlab.entity.*; +import com.nanometer.smartlab.entity.dto.PersonUseDetail; +import com.nanometer.smartlab.exception.BusinessException; import java.util.Date; import java.util.LinkedHashMap; @@ -66,6 +68,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, @@ -85,7 +89,7 @@ void updateTimeByCode(String code); - void batchUpdateStatusByCode(List<OpeReagentStatus> list) throws Exception; + void batchUpdateStatusByCode(List<PersonUseDetail> list) throws Exception; public List<OpeReagentStatus> selectByReId(String id); public void updateByReId(String newReId,String oldReId); @@ -97,6 +101,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