自提页面维护数量统计增加库存品数量

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