Browse Source

feat(all): 修改配送明细报表问题

dist.1.3.0
zhaoqiaobo 4 months ago
parent
commit
51c737945d
  1. 5
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/QualityDeliverEntity.java
  2. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReservationPlanReportListener.java
  3. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/SignforReportListener.java

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

@ -304,11 +304,6 @@ public class QualityDeliverEntity extends TenantEntity {
*/ */
@ApiModelProperty(value = "计划配送单号 包含配送车次和自提车次 直发商家 对应干线车次 三方中转 三方中转车次号") @ApiModelProperty(value = "计划配送单号 包含配送车次和自提车次 直发商家 对应干线车次 三方中转 三方中转车次号")
private String planTrainNumber; private String planTrainNumber;
/**
* 服务类型
*/
@ApiModelProperty(value = "服务类型")
private String serviceType;
/** /**
* 配送日期 * 配送日期
*/ */

4
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReservationPlanReportListener.java

@ -74,7 +74,7 @@ public class ReservationPlanReportListener {
.set(QualityDeliverEntity::getPlanReservationTime, null) .set(QualityDeliverEntity::getPlanReservationTime, null)
.set(QualityDeliverEntity::getPlanReservationUser, null) .set(QualityDeliverEntity::getPlanReservationUser, null)
.set(QualityDeliverEntity::getPlanNum, null) .set(QualityDeliverEntity::getPlanNum, null)
.set(QualityDeliverEntity::getServiceType, null) // .set(QualityDeliverEntity::getServiceType, null)
.set(QualityDeliverEntity::getReservationConsignee, null) .set(QualityDeliverEntity::getReservationConsignee, null)
.set(QualityDeliverEntity::getReservationConsigneePhone, null) .set(QualityDeliverEntity::getReservationConsigneePhone, null)
.set(QualityDeliverEntity::getReservationConsigneeAddr, null) .set(QualityDeliverEntity::getReservationConsigneeAddr, null)
@ -93,7 +93,7 @@ public class ReservationPlanReportListener {
.planReservationTime(vo.getReservationDate()) .planReservationTime(vo.getReservationDate())
.planReservationUser(bean.getOperator()) .planReservationUser(bean.getOperator())
.planNum(detail.getNumber()) .planNum(detail.getNumber())
.serviceType(vo.getDeliveryType()) // .serviceType(vo.getDeliveryType())
.reservationConsignee(vo.getConsignee()) .reservationConsignee(vo.getConsignee())
.reservationConsigneePhone(vo.getDeliveryPhone()) .reservationConsigneePhone(vo.getDeliveryPhone())
.reservationConsigneeAddr(vo.getDeliveryAddress()) .reservationConsigneeAddr(vo.getDeliveryAddress())

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

@ -74,6 +74,7 @@ public class SignforReportListener {
.signCarNumber(vo.getVehicleName()) .signCarNumber(vo.getVehicleName())
.signTrainNumber(vo.getTrainNumber()) .signTrainNumber(vo.getTrainNumber())
.signReservationCode(vo.getReservationCode()) .signReservationCode(vo.getReservationCode())
.signType(vo.getOperatMode())
.bizStatus(90) .bizStatus(90)
.build(); .build();
if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.CMP)) { if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.CMP)) {

Loading…
Cancel
Save