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 104072378..489d48b4f 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 @@ -41,7 +41,7 @@ GROUP_CONCAT(DISTINCT dsa.customer_telephone) customerTelephone,dsa.warehouse,dsa.warehouse_entry_time warehouseEntryTime,dsa.storage_fee storageFee, - count( dbp.packet_number ) + IFNULL(SUM(lddd.quantity),0)AS totalNumber, + count( dbp.packet_number ) + IFNULL((SELECT SUM(quantity) FROM logpm_distribution_delivery_details WHERE bill_lading_id = dbl.id )),0)AS totalNumber, dbl.certificate_type certificateType, GROUP_CONCAT(DISTINCT dsa.brand) brand,dsa.type_service typeService, dbl.pick_up_time pickUpTime,dbl.consignee,dbl.delivery_document @@ -83,7 +83,6 @@ from logpm_distrilbution_bill_lading dbl LEFT JOIN logpm_distrilbution_bill_package dbp on dbp.bill_lading_id = dbl.id and dbp.packet_bar_status in (1,3) LEFT JOIN logpm_distribution_stock_article dsa on dbp.stock_article_id = dsa.id - LEFT JOIN logpm_distribution_delivery_details lddd ON lddd.bill_lading_id = dbl.id dbl.is_deleted = 0 and dsa.service_number like