Browse Source

feat(all): 车次成本明细报表

1 修改报表逻辑
master
zhaoqiaobo 1 month ago
parent
commit
cb69f7cdb9
  1. 5
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/QualityDeliverEntity.java
  2. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/PlanReportListener.java
  3. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

5
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/QualityDeliverEntity.java

@ -374,6 +374,11 @@ public class QualityDeliverEntity extends TenantEntity {
*/
@ApiModelProperty(value = "配送公司")
private String distributionCompany;
/**
* 配送备注
*/
@ApiModelProperty(value = "配送备注")
private String deliveryRemark;
/**
* 配送是否整车计费
*/

1
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/PlanReportListener.java

@ -127,6 +127,7 @@ public class PlanReportListener implements ReportService {
.bizCode(reservationVO.getReservationCode())
.ynWholeVehicle(vo.getYnWholeVehicle())
.deliveryFee(vo.getPrice())
.deliveryRemark(vo.getRemark())
.build();
if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.CMP)) {
qualityDeliverEntity.setConditions(1);

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@ -3741,7 +3741,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
distributionTaskVO.setPrice(Convert.toStr(distributionDeliveryListEntity.getPrice()));
}
distributionTaskVO.setTaskTime(distributionDeliveryListEntity.getTaskTime());
distributionTaskVO.setRemark(distributionDeliveryListEntity.getRemarks());
List<ReservationVO> reservationVOList = distributionDeliveryListService.getDeliveryreBroadcastData(distributionDeliveryListEntity.getId(), distributionDeliveryListEntity.getWarehouseId());
distributionTaskVO.setReservationVOList(reservationVOList);

Loading…
Cancel
Save