diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdOneOutStorageServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdOneOutStorageServiceImpl.java index dc24d28..7ad29f7 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdOneOutStorageServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdOneOutStorageServiceImpl.java @@ -466,20 +466,22 @@ public class LdOneOutStorageServiceImpl extends ServiceImpl oneOutStorageDetails = oneOutStorageDetailService.list(Wrappers.lambdaQuery().eq(LdOneOutStorageDetail::getOneOutStorageId,id)); - //还原库存 - for (LdOneOutStorageDetail ldOneOutStorageDetail : oneOutStorageDetails) { - System.out.println(ldOneOutStorageDetail.getOneFormId()); - // 库存 - LdOneForm oneForm = oneFormService.getByMaterialCode(ldOneOutStorageDetail.getMaterialCode(),ldOneOutStorageDetail.getOneFormId()); - // 计算数量 金额 - BigDecimal result = oneForm.getNum().add(ldOneOutStorageDetail.getOutboundQuantity()); - oneForm.setNum(result); - oneFormService.updateById(oneForm); + if("2".equals(oneOutStorage.getStatus())){ + //已提交的还原库存 + for (LdOneOutStorageDetail ldOneOutStorageDetail : oneOutStorageDetails) { + System.out.println(ldOneOutStorageDetail.getOneFormId()); + // 库存 + LdOneForm oneForm = oneFormService.getByMaterialCode(ldOneOutStorageDetail.getMaterialCode(),ldOneOutStorageDetail.getOneFormId()); + // 计算数量 金额 + BigDecimal result = oneForm.getNum().add(ldOneOutStorageDetail.getOutboundQuantity()); + oneForm.setNum(result); + oneFormService.updateById(oneForm); + } } + List detailIdList = oneOutStorageDetails.stream().map(LdOneOutStorageDetail::getId).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(detailIdList)){ oneOutStorageDetailService.removeByIds(detailIdList); @@ -507,7 +509,8 @@ public class LdOneOutStorageServiceImpl extends ServiceImpl