From 87f22f44c146e3db04d3896ad033b002f61dbe80 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Tue, 18 Jun 2024 16:40:53 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90=E5=90=8E=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/report/mapper/ReportBillLoadingMapper.xml | 4 +++- .../main/java/com/logpm/report/mapper/ReportDeliverMapper.xml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) 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 7b7c25237..8180a8592 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 @@ -53,6 +53,7 @@ select pickup_batch, warehouse, + warehouse_id, consignee_unit, waybill_number, order_code, @@ -72,6 +73,7 @@ examine_user from (select dbl.pickup_batch, dsa.warehouse, + dsa.warehouse_id, dsa.consignee_unit, dsa.waybill_number, dsa.order_code, @@ -120,7 +122,7 @@ forklift_fee, add_value_fee, amountToFee, - createdTime + createdTime create_time from (select obj.pickup_batch, lww.name as warehouse, lww.id as warehouse_id, diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml index 367490493..cefa05fb3 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml @@ -719,8 +719,8 @@ LEFT JOIN logpm_distribution_parcel_list ldpl ON ldsa.id = ldpl.stock_article_id LEFT JOIN logpm_warehouse_tray_goods lwtg ON lwtg.association_id = ldpl.id LEFT JOIN logpm_warehouse_updown_goods lwug ON lwug.association_id = ldpl.id - ${ew.customSqlSegment} group by ldsa.id) t + ${ew.customSqlSegment}