|
|
@ -84,10 +84,10 @@ public class QualityDeliverServiceImpl extends BaseServiceImpl<QualityDeliverMap |
|
|
|
// 按签收车次+签收车次分组封装为map
|
|
|
|
// 按签收车次+签收车次分组封装为map
|
|
|
|
Map<String, List<QualityDeliverEntity>> collect = new HashMap<>(); |
|
|
|
Map<String, List<QualityDeliverEntity>> collect = new HashMap<>(); |
|
|
|
for (QualityDeliverEntity entity : entities) { |
|
|
|
for (QualityDeliverEntity entity : entities) { |
|
|
|
if (!collect.containsKey(entity.getSignCarNumber() + entity.getSignTrainNumber())) { |
|
|
|
if (!collect.containsKey(entity.getSignCarNumber() + entity.getPlanTrainNumber())) { |
|
|
|
collect.put(entity.getSignCarNumber() + entity.getSignTrainNumber(), CollUtil.newArrayList(entity)); |
|
|
|
collect.put(entity.getSignCarNumber() + entity.getPlanTrainNumber(), CollUtil.newArrayList(entity)); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
collect.get(entity.getSignCarNumber() + entity.getSignTrainNumber()).add(entity); |
|
|
|
collect.get(entity.getSignCarNumber() + entity.getPlanTrainNumber()).add(entity); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -115,7 +115,7 @@ public class QualityDeliverServiceImpl extends BaseServiceImpl<QualityDeliverMap |
|
|
|
trainDetailEntity.setTotalOrderQuantity(qualityDeliverEntity.getOrderNumber()); |
|
|
|
trainDetailEntity.setTotalOrderQuantity(qualityDeliverEntity.getOrderNumber()); |
|
|
|
trainDetailEntity.setDeliveryVehicle(qualityDeliverEntity.getSignCarNumber()); |
|
|
|
trainDetailEntity.setDeliveryVehicle(qualityDeliverEntity.getSignCarNumber()); |
|
|
|
trainDetailEntity.setDistributionModel(qualityDeliverEntity.getSignCarType()); |
|
|
|
trainDetailEntity.setDistributionModel(qualityDeliverEntity.getSignCarType()); |
|
|
|
trainDetailEntity.setTrainNumber(qualityDeliverEntity.getSignTrainNumber()); |
|
|
|
trainDetailEntity.setTrainNumber(qualityDeliverEntity.getPlanTrainNumber()); |
|
|
|
// 签收车次号 = 配送任务车次号 取配送时间
|
|
|
|
// 签收车次号 = 配送任务车次号 取配送时间
|
|
|
|
Date deliveryTime = qualityDeliverEntity.getDeliveryTime(); |
|
|
|
Date deliveryTime = qualityDeliverEntity.getDeliveryTime(); |
|
|
|
if (ObjectUtil.isNotEmpty(deliveryTime)) { |
|
|
|
if (ObjectUtil.isNotEmpty(deliveryTime)) { |
|
|
|