diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/QualityDeliverEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/QualityDeliverEntity.java index bd1d52134..88b91a2c2 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/QualityDeliverEntity.java +++ b/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 = "计划配送单号 包含配送车次和自提车次 直发商家 对应干线车次 三方中转 三方中转车次号") private String planTrainNumber; - /** - * 服务类型 - */ - @ApiModelProperty(value = "服务类型") - private String serviceType; /** * 配送日期 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReservationPlanReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReservationPlanReportListener.java index b0802bf1d..c766ac9e6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReservationPlanReportListener.java +++ b/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::getPlanReservationUser, null) .set(QualityDeliverEntity::getPlanNum, null) - .set(QualityDeliverEntity::getServiceType, null) + // .set(QualityDeliverEntity::getServiceType, null) .set(QualityDeliverEntity::getReservationConsignee, null) .set(QualityDeliverEntity::getReservationConsigneePhone, null) .set(QualityDeliverEntity::getReservationConsigneeAddr, null) @@ -93,7 +93,7 @@ public class ReservationPlanReportListener { .planReservationTime(vo.getReservationDate()) .planReservationUser(bean.getOperator()) .planNum(detail.getNumber()) - .serviceType(vo.getDeliveryType()) + // .serviceType(vo.getDeliveryType()) .reservationConsignee(vo.getConsignee()) .reservationConsigneePhone(vo.getDeliveryPhone()) .reservationConsigneeAddr(vo.getDeliveryAddress()) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/SignforReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/SignforReportListener.java index 34c9ace3b..04faee4e6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/SignforReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/SignforReportListener.java @@ -74,6 +74,7 @@ public class SignforReportListener { .signCarNumber(vo.getVehicleName()) .signTrainNumber(vo.getTrainNumber()) .signReservationCode(vo.getReservationCode()) + .signType(vo.getOperatMode()) .bizStatus(90) .build(); if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.CMP)) {