From 927de4e19644e9d5b1c020f9f42f0d17a172898a Mon Sep 17 00:00:00 2001 From: kilo Date: Thu, 13 Jul 2023 14:49:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E7=94=B5=E8=AF=9D?= =?UTF-8?q?=E3=80=81=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DistributionDeliverySelfEntity.java | 12 ++++++++++++ .../mapper/DistributionDeliverySelfMapper.xml | 2 ++ .../impl/DistributionReservationServiceImpl.java | 4 ++++ 3 files changed, 18 insertions(+) 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 Date: Thu, 13 Jul 2023 15:01:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=BD=A6=E7=89=8C=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/entity/DistributionDeliverySelfEntity.java | 6 ++++++ .../distribution/mapper/DistributionDeliverySelfMapper.xml | 1 + .../distribution/mapper/DistributionStockListMapper.xml | 1 + 3 files changed, 8 insertions(+) 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 c8803fe59..f4361f67a 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 @@ -72,6 +72,12 @@ public class DistributionDeliverySelfEntity extends TenantEntity { */ @ApiModelProperty(value = "司机名称") private String driverName; + + /** + * 车牌号 + */ + @ApiModelProperty(value = "车牌号") + private String vehicleNub; /** * 预留1 */ 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 6085d72ad..79866ca55 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 @@ -20,6 +20,7 @@ + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index e9d25dfa1..0486c874c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -23,6 +23,7 @@ +