diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java index bce985be5..2d5eed827 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java @@ -92,6 +92,21 @@ public class DistributionAppDeliveryListVO extends DistributionDeliveryListEntit */ @ApiModelProperty(value = "是否备货(1-没有,2-备货)") private String isstock; + /** + * 电话 + */ + @ApiModelProperty(value = "电话") + private String deliveryPhone; + /** + * 名称 + */ + @ApiModelProperty(value = "名称") + private String consignee; + /** + * 地址 + */ + @ApiModelProperty(value = "地址") + private String deliveryAddress; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java index c54b45636..4da860597 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java @@ -40,6 +40,12 @@ public class DistributionAppStockArticleVO extends DistributionStockArticleEntit */ @ApiModelProperty(value = "扫描数") private Integer loadingNub; + + /** + * 订单ID + */ + @ApiModelProperty(value = "订单ID") + private Long stockArticleId; /** * 签收数 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index d8e7136ab..dd2d42403 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -628,7 +628,15 @@ join logpm_distribution_reservation ldr on lds.reservation_id =ldr.id WHERE lds.delivery_id = lddl.id) inventoryNub, (SELECT COALESCE(sum(lds.loaded_number+lds.loadedin_number), 0) FROM logpm_distribution_signfor lds WHERE - lddl.id = lds.delivery_id) scannedNumber + lddl.id = lds.delivery_id) scannedNumber, + ( + select GROUP_CONCAT(ldr.consignee) + from logpm_distribution_reservation ldr + where ldr.id in + (select lds.reservation_id + from logpm_distribution_signfor lds + where lds.delivery_id = lddl.id ) + ) consignee FROM logpm_distribution_delivery_list lddl left join logpm_distribution_delivery_self ldds on lddl.id =ldds.delivery_id diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.java index 11d168c99..5b48dc31d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.java @@ -125,4 +125,6 @@ public interface DistributionReservationPackageMapper extends BaseMapper getPackDetail(@Param("param") DistributionReservationPackageDTO packageDTO); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml index 6bb0b1ada..7ed2fcc45 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml @@ -249,5 +249,15 @@ WHERE + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 7f47e0ea6..7becd5259 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -510,6 +510,8 @@ lds.driver_signing driverSigning, lds.Signing_status SigningStatus, lds.loaded_number loadingNub, + ldr.delivery_phone deliveryPhone, + ldr.delivery_address deliveryAddress, (SELECT COALESCE(COUNT(*), 0) from logpm_distribution_reservation_stockarticle ldrs WHERE ldrs.reservation_id =ldr.id ) ordNub, COALESCE(lds.received_quantity + lds.receivedin_quantity, 0) signNub FROM @@ -520,11 +522,12 @@ AND lds.delivery_id = #{id} - - - + + +