From 59d9ea33f503e363f2e2941c7c00cc9dd9d9d1c7 Mon Sep 17 00:00:00 2001 From: kongzy <kongzy> Date: 星期二, 28 十一月 2023 11:00:42 +0800 Subject: [PATCH] 修改课题管理bug --- src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java index 962fcf0..c94b1cc 100644 --- a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java +++ b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java @@ -528,7 +528,7 @@ } @Override - public boolean updateReagentStatus3(List<String> reagentCodes,String userId,String projectNum,String laboratoryId,String laboratoryContainerId) { + public boolean updateReagentStatus3(List<String> reagentCodes,String userId,String projectNum,String laboratoryId,String laboratoryContainerId,String receiptNumber) { try { for (String opeReagentStatusId : reagentCodes) { OpeReagentStatus opeReagentStatus = this.getOpeReagentStatus(opeReagentStatusId); @@ -561,6 +561,7 @@ opeUseFlow.setUserId(opeReagentStatus.getUserId()); opeUseFlow.setPlace(opeReagentStatus.getPlace()); opeUseFlow.setRemainder(opeReagentStatus.getRemainder()); + opeUseFlow.setReceiptNumber(receiptNumber); Map<String, String> metaMap = new HashMap<>(); metaMap.put("groupId", "operate_status"); @@ -589,9 +590,12 @@ } @Transactional(propagation = Propagation.REQUIRED) - public boolean updateReagentStatus(OpeReagentStatus opeReagentStatus) { + public boolean updateReagentStatus(OpeReagentStatus opeReagentStatus,String receiptNumber) { try { - + if(StringUtils.isBlank(receiptNumber)){ + throw new BusinessException(ExceptionEnumCode.PARAM_NO_EXIST, + MessageUtil.getMessageByCode(ExceptionEnumCode.PARAM_NO_EXIST.getCode(), "领用单号为空")); + } if (isAllowWarehouseUse(opeReagentStatus)) { // 减少库存 OpeWarehouseReserve opeWarehouseReserve = this.opeWarehouseReserveService.getOpeWarehouseReserve( @@ -612,6 +616,7 @@ opeUseFlow.setUserId(opeReagentStatus.getUserId()); opeUseFlow.setPlace(opeReagentStatus.getPlace()); opeUseFlow.setRemainder(opeReagentStatus.getRemainder()); + opeUseFlow.setReceiptNumber(receiptNumber); Map<String, String> metaMap = new HashMap<>(); metaMap.put("groupId", "operate_status"); -- Gitblit v1.9.2