diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 0c9e0f240..f3a9c1e98 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -1818,27 +1818,30 @@ public class OpenOrderServiceImpl implements IOpenOrderService { hasOrderPackageCodeList.addAll(hasOrderPackageCodes); }); - List updateMaterialList = new ArrayList<>(); - //把importStandardOuPaiDTOS转化成orderPackageCode为key的Map - Map importStandardOuPaiDTOMap = importStandardOuPaiDTOS.stream().collect(Collectors.toMap(ImportStandardOuPaiDTO::getOrderPackageCode, Function.identity(), (a, b) -> a)); - List hasAdvanceDetailList = advanceDetailService.findListByOrderPackageCodeList(hasOrderPackageCodeList); - hasAdvanceDetailList.forEach(advanceDetailEntity -> { - Long waybillId = advanceDetailEntity.getWaybillId(); - if(Objects.isNull(waybillId)){ - ImportStandardOuPaiDTO importStandardOuPaiDTO = importStandardOuPaiDTOMap.get(advanceDetailEntity.getOrderPackageCode()); - TrunklineAdvanceDetailEntity updateMaterialEntity = new TrunklineAdvanceDetailEntity(); - updateMaterialEntity.setId(advanceDetailEntity.getId()); - updateMaterialEntity.setMaterialCode(importStandardOuPaiDTO.getMaterialCode()); - updateMaterialEntity.setMaterialName(importStandardOuPaiDTO.getMaterialName()); - updateMaterialEntity.setFirstPackName(importStandardOuPaiDTO.getFirstsName()); - updateMaterialEntity.setSecondPackName(importStandardOuPaiDTO.getSencodsName()); - updateMaterialEntity.setThirdPackName(importStandardOuPaiDTO.getThirdsName()); - updateMaterialList.add(updateMaterialEntity); + if(CollUtil.isNotEmpty(hasOrderPackageCodeList)){ + List updateMaterialList = new ArrayList<>(); + //把importStandardOuPaiDTOS转化成orderPackageCode为key的Map + Map importStandardOuPaiDTOMap = importStandardOuPaiDTOS.stream().collect(Collectors.toMap(ImportStandardOuPaiDTO::getOrderPackageCode, Function.identity(), (a, b) -> a)); + List hasAdvanceDetailList = advanceDetailService.findListByOrderPackageCodeList(hasOrderPackageCodeList); + hasAdvanceDetailList.forEach(advanceDetailEntity -> { + Long waybillId = advanceDetailEntity.getWaybillId(); + if(Objects.isNull(waybillId)){ + ImportStandardOuPaiDTO importStandardOuPaiDTO = importStandardOuPaiDTOMap.get(advanceDetailEntity.getOrderPackageCode()); + TrunklineAdvanceDetailEntity updateMaterialEntity = new TrunklineAdvanceDetailEntity(); + updateMaterialEntity.setId(advanceDetailEntity.getId()); + updateMaterialEntity.setMaterialCode(importStandardOuPaiDTO.getMaterialCode()); + updateMaterialEntity.setMaterialName(importStandardOuPaiDTO.getMaterialName()); + updateMaterialEntity.setFirstPackName(importStandardOuPaiDTO.getFirstsName()); + updateMaterialEntity.setSecondPackName(importStandardOuPaiDTO.getSencodsName()); + updateMaterialEntity.setThirdPackName(importStandardOuPaiDTO.getThirdsName()); + updateMaterialList.add(updateMaterialEntity); + } + }); + + if(CollUtil.isNotEmpty(updateMaterialList)){ + advanceDetailService.updateBatchById(updateMaterialList); } - }); - if(CollUtil.isNotEmpty(updateMaterialList)){ - advanceDetailService.updateBatchById(updateMaterialList); } //排除importStandardOuPaiDTOS中orderPackageCode在hasOrderPackageCodeList中存在的元素