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}