diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java index 4613d086a..2fc82ee9d 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryListVO.java @@ -64,6 +64,12 @@ public class DistributionDeliveryListVO extends DistributionDeliveryListEntity { @ApiModelProperty(value = "客户名称") private String consignee; + /** + * 客户名称 + */ + @ApiModelProperty(value = "客户名称") + private String mallName; + /** * 配送日期 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java index e98ffcc23..faeae066e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java @@ -68,6 +68,12 @@ public class DistributionDeliveryListExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("客户名称") private String consignee; + /** + * 仓库 + */ + @ColumnWidth(35) + @ExcelProperty("商场名称") + private String mallName; /** * 配送类型;1-自主配送,2-三方配送 */ 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 ee890f0f1..f15039df7 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 @@ -306,6 +306,7 @@ lddl.task_time AS taskTime, ldr.warehouse_id AS warehouseId, ldr.consignee AS consignee, + ldr.mall_name AS mallName, CASE lddl.kind WHEN 1 THEN @@ -355,7 +356,7 @@ WHERE lddl.id = lds.delivery_id ) signingNumber, - GROUP_CONCAT( lddl.loading_team_name, lddl.loading_team_name ) AS handlingCrew + GROUP_CONCAT( lddl.loading_team_name, lddl.unloading_team_name ) AS handlingCrew FROM logpm_distribution_delivery_list AS lddl LEFT JOIN logpm_distribution_signfor AS lds ON lddl.id = lds.delivery_id @@ -376,6 +377,9 @@ AND ldr.consignee like concat('%',#{params.clineName},'%') + + AND ldr.mall_name like concat('%',#{params.mallName},'%') + AND lddl.type = #{params.type}