From 6f81853b31d3fc844dc348cdcd71ae985aa8dab0 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 19 Mar 2025 14:20:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E5=BC=80=E5=8D=95=E6=94=B6=E5=85=A5=20?= =?UTF-8?q?=E6=80=BB=E8=AE=A1=E9=9C=80=E8=A6=81=E6=8C=89=E5=B9=B4=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml index fbd050e85..49f8a3788 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml @@ -23,7 +23,7 @@ From bb4ad624f2be54d8dfbc00e508a189924851ef56 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 19 Mar 2025 14:24:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E5=B9=B2=E7=BA=BF=E8=BD=A6=E6=AC=A1?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/report/mapper/WarehouseIndexMapper.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml index 49f8a3788..c99d6ca97 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml @@ -1023,6 +1023,7 @@ logpm_trunkline_cars_load ltcl LEFT JOIN logpm_trunkline_cars_load_line ltcll on ltcll.load_id=ltcl.id WHERE + YEAR(ltcl.create_time) = YEAR(CURDATE()) and ltcl.load_status!=100 and ltcll.node_id =#{warehouseId} @@ -1051,6 +1054,7 @@ logpm_trunkline_cars_load ltcl LEFT JOIN logpm_trunkline_cars_load_line ltcll on ltcll.load_id=ltcl.id WHERE + YEAR(ltcl.create_time) = YEAR(CURDATE()) and ltcl.load_status!='100' and ltcl.load_status!='100' and ltcll.node_status='10' and ltcll.unload_status!='0' and ltcll.node_id =#{warehouseId} From e38a764f8d5c2792f314463442fb8453410d627d Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 19 Mar 2025 14:25:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E6=8A=A5=E8=A1=A8bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/mapper/ReportIncomingMapper.xml | 6 +++--- .../logpm/report/mapper/ReportTimeMapper.xml | 20 +++++++------------ 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.xml index e5604e5f9..5aea8e6a4 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.xml @@ -201,7 +201,7 @@ when lww.waybill_type = '2' then sum(ldpn.signin_quantity) end signNum from logpm_warehouse_waybill lww left join logpm_warehouse_warehouse waw on waw.id = lww.destination_warehouse_id - left join logpm_distribution_parcel_list ldpl on ldpl.waybill_id = lww.id + left join logpm_distribution_parcel_list ldpl on ldpl.waybill_id = lww.id and ldpl.warehouse_id = lww.destination_warehouse_id left join logpm_distribution_parcel_number ldpn on ldpn.parcel_list_id = ldpl.id where lww.document_making_time > '2024-10-22 00:00:00' and lww.departure_warehouse_id != 1847456188105195522 @@ -285,7 +285,7 @@ when lww.waybill_type = '2' then sum(ldpn.signin_quantity) end signNum from logpm_warehouse_waybill lww left join logpm_warehouse_warehouse waw on waw.id = lww.destination_warehouse_id - left join logpm_distribution_parcel_list ldpl on ldpl.waybill_id = lww.id + left join logpm_distribution_parcel_list ldpl on ldpl.waybill_id = lww.id and ldpl.warehouse_id = lww.destination_warehouse_id left join logpm_distribution_parcel_number ldpn on ldpn.parcel_list_id = ldpl.id where lww.document_making_time > '2024-10-22 00:00:00' and lww.departure_warehouse_id != 1847456188105195522 @@ -607,7 +607,7 @@ when lww.waybill_type = '2' then sum(ldpn.signin_quantity) end signNum from logpm_warehouse_waybill lww left join logpm_warehouse_warehouse waw on waw.id = lww.destination_warehouse_id - left join logpm_distribution_parcel_list ldpl on ldpl.waybill_id = lww.id + left join logpm_distribution_parcel_list ldpl on ldpl.waybill_id = lww.id and ldpl.warehouse_id = lww.destination_warehouse_id left join logpm_distribution_parcel_number ldpn on ldpn.parcel_list_id = ldpl.id where lww.document_making_time > '2024-10-22 00:00:00' and lww.departure_warehouse_id != 1847456188105195522 diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml index aa2db686d..cfcc3a2ca 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml @@ -1971,7 +1971,6 @@ lww.shipper_name shipperName, lww.shipper_mobile shipperMobile, lww.shipper_address shipperAddress, - lww.service_type serviceType, lww.destination destination, lww.complete_destination completeDestination, lww.departure departure, @@ -1989,7 +1988,7 @@ lww.d_pay arrivePay, lww.h_pay backPay, lww.y_pay monthPay, - lbc.type_service serviceType, + IFNULL(lbc.type_service,lww.service_type) serviceType, IFNULL(lww.update_status,0) updateStatus, IFNULL(lww.check_status,0) checkStatus, lww.check_reson checkReson, @@ -2127,7 +2126,7 @@ and lww.urgency = #{param.urgency} - and lww.service_type = #{param.serviceType} + and IFNULL(lbc.type_service,lww.service_type) = #{param.serviceType} and lww.transport_type = #{param.transportType} @@ -2233,11 +2232,6 @@ lww.shipper_name shipperName, lww.shipper_mobile shipperMobile, lww.shipper_address shipperAddress, - case when lww.service_type='1' then '商配' - when lww.service_type='2' then '市配' - when lww.service_type='3' then '自提' - when lww.service_type='4' then '三方中转' - ELSE '未知' END serviceType, lww.destination destination, lww.complete_destination completeDestination, lww.departure departure, @@ -2279,10 +2273,10 @@ lww.d_pay arrivePay, lww.h_pay backPay, lww.y_pay monthPay, - case when lbc.type_service='1' then '商配' - when lbc.type_service='2' then '市配' - when lbc.type_service='3' then '自提' - when lbc.type_service='4' then '三方中转' + case when IFNULL(lbc.type_service,lww.service_type)='1' then '商配' + when IFNULL(lbc.type_service,lww.service_type)='2' then '市配' + when IFNULL(lbc.type_service,lww.service_type)='3' then '自提' + when IFNULL(lbc.type_service,lww.service_type)='4' then '三方中转' else '未知' end serviceType, CASE WHEN IFNULL(lww.update_status,0)=0 THEN '未改单' WHEN IFNULL(lww.update_status,0)=1 THEN '已改单' @@ -2441,7 +2435,7 @@ and lww.urgency = #{param.urgency} - and lww.service_type = #{param.serviceType} + and IFNULL(lbc.type_service,lww.service_type) = #{param.serviceType} and lww.transport_type = #{param.transportType}