From 51c737945d3ca113cd164562627714acad10e281 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Thu, 12 Sep 2024 15:29:34 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/distribution/entity/QualityDeliverEntity.java  | 5 -----
 .../receiver/report/ReservationPlanReportListener.java       | 4 ++--
 .../distribution/receiver/report/SignforReportListener.java  | 1 +
 3 files changed, 3 insertions(+), 7 deletions(-)

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)) {