From 5ecdbab93ecef91546cf622fae9484f8cdca56d2 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Wed, 10 Jul 2024 18:37:02 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E8=87=AA?=
 =?UTF-8?q?=E6=8F=90=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/mapper/ReportBillLoadingMapper.xml | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml
index 8180a8592..6e3329b4b 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml
@@ -97,6 +97,58 @@
             left join logpm_distribution_stock_article dsa on dsa.id = dbl.stock_article_id
             left join logpm_distribution_bill_lading_scan dbls on dbls.stock_list_id = dpl.id
             ) t ${ew.customSqlSegment}
+
+        union all
+
+        select pickup_batch,
+        warehouse,
+        warehouse_id,
+        consignee_unit,
+        waybill_number,
+        order_code,
+        packet_bar_code,
+        train_number,
+        firsts,
+        second,
+        third_product,
+        material_code,
+        material_name,
+        start_ware_in_time,
+        start_ware_out_time,
+        warehouse_entry_time_end,
+        scan_user,
+        scan_time,
+        examine_time,
+        examine_user
+        from (select dbl.pickup_batch,
+        dsa.warehouse,
+        dsa.warehouse_id,
+        dsa.consignee_unit,
+        dsa.waybill_number,
+        dsa.order_code,
+        dpl.order_package_code packet_bar_code,
+        dsa.train_number,
+        dpl.firsts,
+        dpl.second,
+        dpl.third_product,
+        dpl.material_code,
+        dpl.material_name,
+        ''                     start_ware_in_time,
+        ''                     start_ware_out_time,
+        dpl.warehouse_entry_time_end,
+        dbls.create_user       scan_user,
+        dbls.create_time       scan_time,
+        dbl.update_time        examine_time,
+        dbl.create_user        examine_user
+        from logpm_distribution_reservation_zero_package t
+        left join logpm_distrilbution_bill_lading dbl on dbl.id = t.reservation_id
+        left join logpm_distribution_parcel_list dpl on dpl.id = t.parcel_list_id
+        left join logpm_distribution_stock_article dsa on dsa.id = t.stock_article_id
+        left join logpm_distribution_bill_lading_scan dbls on dbls.parcel_list_id = dpl.id
+
+        where t.type = '3'
+        and t.zero_package_status != 2
+        )t ${ew.customSqlSegment}
     </select>
     <select id="getTasksPage" resultType="com.logpm.report.vo.BillLoadingTasksVO">
         select pickup_batch,