diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliverySelfEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliverySelfEntity.java index c96d2eaee..c8803fe59 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliverySelfEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliverySelfEntity.java @@ -61,6 +61,17 @@ public class DistributionDeliverySelfEntity extends TenantEntity { */ @ApiModelProperty(value = "配送ID") private Long deliveryId; + /** + * 司机电话 + */ + @ApiModelProperty(value = "司机电话") + private String driverPhone; + + /** + * 司机名称 + */ + @ApiModelProperty(value = "司机名称") + private String driverName; /** * 预留1 */ @@ -87,4 +98,5 @@ public class DistributionDeliverySelfEntity extends TenantEntity { @ApiModelProperty(value = "预留5") private String reserve5; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliverySelfMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliverySelfMapper.xml index 8421bfc28..6085d72ad 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliverySelfMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliverySelfMapper.xml @@ -18,6 +18,8 @@ + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index c26b97029..03412216c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -696,6 +696,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl{ DistributionReservationPackageEntity distributionReservationPackageEntity = new DistributionReservationPackageEntity(); distributionReservationPackageEntity.setReservationId(distributionReservationDTO.getId()); + distributionReservationPackageEntity.setPacketBarCode(p.getPacketBarCode()); distributionReservationPackageEntity.setParceListId(p.getId()); distributionReservationPackageEntity.setStockArticleId(s.getId()); //维护订单下包件信息 @@ -710,6 +711,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl