This commit is contained in:
zlwu committed 2026-07-04 08:21:06 +08:00
1 parent 8e70047f4c
commit b4a49183db
33 files changed
+11558 -5889

No files matched your search

+4 -1
View File
@@ -2,13 +2,16 @@
from fastapi import APIRouter
from app.api.pl import plan, transport, freight, inventory
from app.api.pl import base_data, vehicle_recharge, vehicle_maintenance, vehicle_urea
from app.api.pl import base_data, vehicle_recharge, vehicle_maintenance, vehicle_urea, transport_address
pl_router = APIRouter(prefix="/transport", tags=["运输计划管理"])
# 基础数据(承运商、车辆、司机)
pl_router.include_router(base_data.router)
# 运输通用地址库
pl_router.include_router(transport_address.router)
# 计划管理
pl_router.include_router(plan.router)
+8
View File
@@ -303,9 +303,13 @@ def create_plan(
settlement_method=payload.settlement_method,
has_freight=payload.has_freight,
pickup_address=payload.pickup_address,
pickup_lng=payload.pickup_lng,
pickup_lat=payload.pickup_lat,
pickup_time=payload.pickup_time,
pickup_notes=payload.pickup_notes,
destination_address=payload.destination_address,
destination_lng=payload.destination_lng,
destination_lat=payload.destination_lat,
delivery_time=payload.delivery_time,
destination_notes=payload.destination_notes,
follow_user_id=payload.follow_user_id or user.id,
@@ -380,9 +384,13 @@ def create_plan_full(
settlement_method=payload.settlement_method,
has_freight=payload.has_freight,
pickup_address=payload.pickup_address,
pickup_lng=payload.pickup_lng,
pickup_lat=payload.pickup_lat,
pickup_time=payload.pickup_time,
pickup_notes=payload.pickup_notes,
destination_address=payload.destination_address,
destination_lng=payload.destination_lng,
destination_lat=payload.destination_lat,
delivery_time=payload.delivery_time,
destination_notes=payload.destination_notes,
total_amount=calc_plan_total_amount(payload.products or []),
+4
View File
@@ -113,9 +113,13 @@ def _build_public_page(db: Session, transport: PlTransport) -> PublicTransportPa
plan_date=_format_plan_date(plan.plan_date if plan else None),
plan_type=plan.plan_type if plan else "",
pickup_address=plan.pickup_address if plan else transport.start_point,
pickup_lng=plan.pickup_lng if plan else None,
pickup_lat=plan.pickup_lat if plan else None,
destination_address=(
(plan.destination_address or plan.destination_name) if plan else transport.end_point
),
destination_lng=plan.destination_lng if plan else None,
destination_lat=plan.destination_lat if plan else None,
license_plate=transport.license_plate,
driver_name=transport.driver_name,
driver_phone=transport.driver_phone,
+6
View File
@@ -246,6 +246,9 @@ def _apply_plan_logistics_from_payload(plan: PlPlan, payload: TransportArrange)
plan.pickup_address = payload.pickup_address
elif payload.start_point is not None:
plan.pickup_address = payload.start_point
if "pickup_lng" in payload.model_fields_set or "pickup_lat" in payload.model_fields_set:
plan.pickup_lng = payload.pickup_lng
plan.pickup_lat = payload.pickup_lat
if payload.pickup_time is not None:
plan.pickup_time = payload.pickup_time
if payload.pickup_notes is not None:
@@ -254,6 +257,9 @@ def _apply_plan_logistics_from_payload(plan: PlPlan, payload: TransportArrange)
plan.destination_address = payload.destination_address
elif payload.end_point is not None:
plan.destination_address = payload.end_point
if "destination_lng" in payload.model_fields_set or "destination_lat" in payload.model_fields_set:
plan.destination_lng = payload.destination_lng
plan.destination_lat = payload.destination_lat
if payload.delivery_time is not None:
plan.delivery_time = payload.delivery_time
if payload.destination_notes is not None: