diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index 8838b6337..d5fabdffe 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml @@ -37,7 +37,7 @@ GROUP_CONCAT(DISTINCT dsa.service_number) serviceNumber, GROUP_CONCAT(DISTINCT dsa.waybill_number) waybillNumber, GROUP_CONCAT(DISTINCT dsa.consignee_unit) - consigneeUnit,GROUP_CONCAT(DISTINCT dsa.customer_name) customerName, + consigneeUnit,GROUP_CONCAT(DISTINCT dsa.consignee_person) customerName, GROUP_CONCAT(DISTINCT dsa.customer_telephone) customerTelephone,dsa.warehouse,dsa.warehouse_entry_time warehouseEntryTime,dsa.storage_fee storageFee, @@ -430,8 +430,8 @@ GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.waybill_number)) AS waybillNumber, GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.service_number)) AS serviceNumber, GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.consignee_unit)) AS consigneeUnit, - GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.customer_name)) AS customerName, - GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.customer_telephone)) AS customerTelephone + GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.consignee_person)) AS customerName, + GROUP_CONCAT(DISTINCT ANY_VALUE(ldsa.consignee_mobile)) AS customerTelephone FROM logpm_distrilbution_bill_lading ldbl LEFT JOIN logpm_distrilbution_bill_stock ldbs ON ldbl.id = ldbs.bill_lading_id LEFT JOIN logpm_distribution_stock_article ldsa ON ldbs.stock_article_id = ldsa.id