diff --git a/backend/app/services/pl_vehicle_fuel_service.py b/backend/app/services/pl_vehicle_fuel_service.py index 8becbf069..bb9754dc7 100644 --- a/backend/app/services/pl_vehicle_fuel_service.py +++ b/backend/app/services/pl_vehicle_fuel_service.py @@ -568,6 +568,7 @@ def list_plate_month_summary( PlVehicle.tenant_no == tenant_no, PlVehicle.vehicle_type == "self", PlVehicle.del_flag == 0, + PlVehicle.vehicle_status != "scrapped", # 历史档案将叉车、油桶也归为 self;车辆统计卡片不展示这两类用油对象。 func.trim(PlVehicle.license_plate).notin_(("叉车", "油桶")), ) diff --git a/backend/tests/test_pl_vehicle_fuel_summary.py b/backend/tests/test_pl_vehicle_fuel_summary.py index 6ce064b58..0c5ebcdaf 100644 --- a/backend/tests/test_pl_vehicle_fuel_summary.py +++ b/backend/tests/test_pl_vehicle_fuel_summary.py @@ -109,6 +109,7 @@ def test_all_self_vehicles_visible_even_without_calculable_rate(summary_db): db = summary_db vehicle(db) vehicle(db, "无记录车辆", vehicle_status="maintaining") + vehicle(db, "报废车辆", vehicle_status="scrapped") vehicle(db, "承运商车辆", vehicle_type="carrier") vehicle(db, "其他租户", tenant_no="t2") vehicle(db, "删除车辆", del_flag=1) @@ -117,6 +118,7 @@ def test_all_self_vehicles_visible_even_without_calculable_rate(summary_db): fuel(db, "2026-01-10", 120, 3400) items = {item.license_plate: item.model_dump(by_alias=True) for item in summary(db).items} assert set(items) == {"皖H57837", "无记录车辆"} + assert "报废车辆" not in items assert items["皖H57837"]["liters"] == 120 assert items["皖H57837"]["monthRateL100"] is None assert items["无记录车辆"]["liters"] == 0