From 5c63cf5c25fc1acade94af01a605576bc00e24f6 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 30 Mar 2024 15:18:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E9=A1=B5=E9=9D=A2=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=93=81=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistrilbutionBillLadingMapper.xml  | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

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 09b453139..104072378 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
@@ -33,12 +33,20 @@
     </update>
     <select id="pageList" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingVO">
 
-        select dbl.id,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,GROUP_CONCAT(DISTINCT dsa.customer_telephone)
+        select dbl.id,
+        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,
+        GROUP_CONCAT(DISTINCT dsa.customer_telephone)
         customerTelephone,dsa.warehouse,dsa.warehouse_entry_time warehouseEntryTime,dsa.storage_fee
-        storageFee,COUNT(dbp.packet_number) 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
-        deliveryDocument,dbl.conditions,dbl.total_cost totalCost,
+        storageFee,
+        count( dbp.packet_number ) + IFNULL(SUM(lddd.quantity),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
+        deliveryDocument,dbl.conditions,
+        dbl.total_cost totalCost,
         dbl.pick_up_plate pickUpPlate,dbl.pickup_batch pickupBatch,
       <!--  (
         select COUNT(lds.id)
@@ -75,6 +83,7 @@
         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
         <where>
             dbl.is_deleted = 0
             <if test="param.serviceNumber != null and param.serviceNumber != ''">and dsa.service_number like