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 9bfe75ef7..83a34b82c 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 @@ -520,9 +520,9 @@ public class QualityDeliverEntity extends TenantEntity { @ApiModelProperty(value = "到达地址") private String arriveAddress; /** - * 签收人id + * 签收归属司机id */ - @ApiModelProperty(value = "签收人id") + @ApiModelProperty(value = "签收归属司机id") private String signUserId; /** * 签收人 @@ -564,6 +564,11 @@ public class QualityDeliverEntity extends TenantEntity { */ @ApiModelProperty(value = "签收车辆id") private Long signCarId; + /** + * 签收归属司机 + */ + @ApiModelProperty(value = "签收归属司机") + private String signDriverName; /** * 签收类型(按件签收 批量签收 补录) */ diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/ExpenseDispatchTrainDetailEntity.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/ExpenseDispatchTrainDetailEntity.java index 481933157..238494f66 100644 --- a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/ExpenseDispatchTrainDetailEntity.java +++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/ExpenseDispatchTrainDetailEntity.java @@ -45,6 +45,12 @@ public class ExpenseDispatchTrainDetailEntity extends TenantEntity { @ApiModelProperty(value = "配送车辆") @ExcelProperty("配送车辆") private String deliveryVehicle; + /** + * 配送司机 + */ + @ApiModelProperty(value = "配送司机") + @ExcelProperty("配送司机") + private String deliveryDriver; /** * 配送车型 */ @@ -106,11 +112,11 @@ public class ExpenseDispatchTrainDetailEntity extends TenantEntity { @ExcelIgnore private String carrierType; /** - * 配送司机 + * 配送备注 */ - @ApiModelProperty(value = "配送司机") - @ExcelProperty("配送司机") - private String deliveryDriver; + @ApiModelProperty(value = "配送备注") + @ExcelProperty("配送备注") + private String deliveryRemark; /** * 计划总件数 */ 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 466ac1398..e5f386619 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 @@ -89,6 +89,7 @@ public class SignforReportListener implements ReportService { .warehouseId(warehouseId) .orderPackageCode(detail.getPackageCode()) .signUserId(vo.getDriverId()) + .signDriverName(vo.getDriverName()) .signUserName(bean.getOperator()) .signTime(bean.getOperatorTime()) .signCarNumber(vo.getVehicleName()) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 86cf18451..2a46e08d6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -3205,7 +3205,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl