From a3de8fe47c3eddc8cb086803db68c1bd0cd7c1b7 Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期三, 03 二月 2021 16:10:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master --- src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java index c3ab8f4..33cd818 100644 --- a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java +++ b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java @@ -9,6 +9,7 @@ import com.google.common.collect.ImmutableMap; import com.nanometer.smartlab.dao.*; import com.nanometer.smartlab.entity.*; +import com.nanometer.smartlab.entity.dto.PersonUseDetail; import com.nanometer.smartlab.entity.enumtype.ValidFlag; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; @@ -806,15 +807,15 @@ */ @Override @Transactional - public void batchUpdateStatusByCode(List<OpeReagentStatus> list) throws Exception { - if(list == null || list.size() <1){ - throw new Exception("没有选择试剂"); - } + public void batchUpdateStatusByCode(List<PersonUseDetail> applyList) throws Exception { - for (OpeReagentStatus opeReagentStatus : list) { + + + for (PersonUseDetail pu : applyList) { + //变更试剂状态为入库 Map<String, Object> params1 = new HashMap<>(); - String reagentCode = opeReagentStatus.getReagentCode(); + String reagentCode = pu.getReagentCode(); params1.put("code", reagentCode); params1.put("status",ArrivalStatus.WAREHOUSE); opeReagentStatusDao.updateStatusByCode(params1); @@ -828,8 +829,8 @@ //增加数据库存 Map<String, Object> params3 = new HashMap<>(); - String reagentId = opeReagentStatus.getReagentId(); - String articleNumber = opeReagentStatus.getArticleNumber(); + String reagentId = pu.getReagentId(); + String articleNumber = pu.getArticleNumber(); params3.put("reagentId", reagentId); params3.put("articleNumber", articleNumber); opeWarehouseReserveDao.updateCount(params3); -- Gitblit v1.9.2