|
|
|
@ -687,10 +687,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
|
|
|
|
|
List<TrunklineAdvanceDetailVO> list = advanceDetailService.findListByAdvanceIds(advanceIds); |
|
|
|
|
trunklineWaybillPackageService.saveList(list, waybillEntity); |
|
|
|
|
|
|
|
|
|
//把updateAdvanceDetailList转化成以id为key的Map
|
|
|
|
|
Map<Long, TrunklineAdvanceDetailVO> updateAdvanceDetailMap = list.stream() |
|
|
|
|
.collect(Collectors.toMap(TrunklineAdvanceDetailVO::getId, detail -> detail)); |
|
|
|
|
|
|
|
|
|
List<TrunklineAdvanceDetailEntity> updateAdvanceDetailList = openOrderDTO.getUpdateAdvanceDetailList(); |
|
|
|
|
|
|
|
|
|
List<String> orderPackageCodes = new ArrayList<>(); |
|
|
|
@ -698,13 +694,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
|
|
|
|
|
|
|
|
|
|
updateAdvanceDetailList.forEach(detail -> { |
|
|
|
|
Long id = detail.getId(); |
|
|
|
|
TrunklineAdvanceDetailEntity trunklineAdvanceDetailEntity = updateAdvanceDetailMap.get(id); |
|
|
|
|
detail.setWaybillId(waybillId); |
|
|
|
|
detail.setWaybillNo(finalWaybillNo); |
|
|
|
|
detail.setCostCategoryId(trunklineAdvanceDetailEntity.getCostCategoryId()); |
|
|
|
|
detail.setCostCategoryName(trunklineAdvanceDetailEntity.getCostCategoryName()); |
|
|
|
|
detail.setIncomeCategoryId(trunklineAdvanceDetailEntity.getIncomeCategoryId()); |
|
|
|
|
detail.setIncomeCategoryName(trunklineAdvanceDetailEntity.getIncomeCategoryName()); |
|
|
|
|
orderPackageCodes.add(detail.getOrderPackageCode()); |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|