java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge remote-tracking branch 'origin/dev' into pre-production

master
zhenghaoyu 7 months ago
parent
36fdc9d3e9 1e2573208a
commit
ff820248dd
1 changed files with 22 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 41
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

41
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
Unescape View File

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

Write Preview
Loading…
Cancel
Save