提交
This commit is contained in:
1 parent
493f8d6756
commit
d84f4b944c
406 files changed
+58954
-10376
No files matched your search
@@ -211,7 +211,7 @@ async def delete_tenant(
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
try:
|
||||
tenant_svc.soft_delete_tenant(db, tenant_id)
|
||||
tenant_svc.soft_delete_tenant(db, tenant_id, user_info=_user)
|
||||
return success_response(None, message="删除成功")
|
||||
except ValueError as e:
|
||||
return error_response(400, str(e))
|
||||
@@ -401,7 +401,7 @@ async def delete_user(
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
try:
|
||||
user_svc.soft_delete_user(db, user_id)
|
||||
user_svc.soft_delete_user(db, user_id, user_info=_user)
|
||||
return success_response(None, message="删除成功")
|
||||
except ValueError as e:
|
||||
return error_response(400, str(e))
|
||||
@@ -513,7 +513,7 @@ async def delete_dict_type(
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
try:
|
||||
dict_type_svc.soft_delete_dict_type(db, dict_type_id)
|
||||
dict_type_svc.soft_delete_dict_type(db, dict_type_id, user_info=_user)
|
||||
return success_response(None, message="删除成功")
|
||||
except ValueError as e:
|
||||
return error_response(400, str(e))
|
||||
@@ -617,7 +617,7 @@ async def delete_dict_data(
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
try:
|
||||
dict_data_svc.soft_delete_dict_data(db, data_id)
|
||||
dict_data_svc.soft_delete_dict_data(db, data_id, user_info=_user)
|
||||
return success_response(None, message="删除成功")
|
||||
except ValueError as e:
|
||||
return error_response(400, str(e))
|
||||
@@ -760,7 +760,7 @@ async def delete_dept(
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
try:
|
||||
dept_svc.soft_delete_dept(db, dept_id)
|
||||
dept_svc.soft_delete_dept(db, dept_id, user_info=_user)
|
||||
return success_response(None, message="删除成功")
|
||||
except ValueError as e:
|
||||
return error_response(400, str(e))
|
||||
@@ -879,7 +879,7 @@ async def delete_site(
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
try:
|
||||
site_svc.soft_delete_site(db, site_id)
|
||||
site_svc.soft_delete_site(db, site_id, user_info=_user)
|
||||
return success_response(None, message="删除成功")
|
||||
except ValueError as e:
|
||||
return error_response(400, str(e))
|
||||
@@ -978,7 +978,7 @@ async def delete_post(
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
try:
|
||||
post_svc.soft_delete_post(db, post_id)
|
||||
post_svc.soft_delete_post(db, post_id, user_info=_user)
|
||||
return success_response(None, message="删除成功")
|
||||
except ValueError as e:
|
||||
return error_response(400, str(e))
|
||||
@@ -1138,7 +1138,7 @@ async def delete_menu(
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
try:
|
||||
menu_svc.soft_delete_menu(db, menu_id)
|
||||
menu_svc.soft_delete_menu(db, menu_id, user_info=_user)
|
||||
return success_response(None, message="删除成功")
|
||||
except ValueError as e:
|
||||
return error_response(400, str(e))
|
||||
@@ -1248,7 +1248,7 @@ async def delete_role_management(
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
try:
|
||||
role_svc.soft_delete_role(db, role_id)
|
||||
role_svc.soft_delete_role(db, role_id, user_info=_user)
|
||||
return success_response(None, message="删除成功")
|
||||
except ValueError as e:
|
||||
return error_response(400, str(e))
|
||||
|
||||
@@ -12,6 +12,7 @@ from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.database import get_db
|
||||
from app.core.menu_guard import require_admin_or_super_admin
|
||||
from app.core.oper_log_decorator import oper_log
|
||||
from app.core.response import error_response, success_response
|
||||
from app.core.tenant_context import get_tenant_no
|
||||
from app.crud.crm.data_scope_helpers import (
|
||||
@@ -414,6 +415,7 @@ async def customer_detail(
|
||||
|
||||
|
||||
@router.post("/customer/add")
|
||||
@oper_log(title="CRM客户管理", business_type=1, summary="新增客户【{customerName}】")
|
||||
async def customer_create(
|
||||
body: CustomerCreateBody,
|
||||
_user: dict = Depends(require_admin_or_super_admin),
|
||||
@@ -443,6 +445,7 @@ async def customer_create(
|
||||
|
||||
|
||||
@router.post("/customer/update")
|
||||
@oper_log(title="CRM客户管理", business_type=2, summary="修改客户【{customerName}】")
|
||||
async def customer_update(
|
||||
body: CustomerUpdateBody,
|
||||
_user: dict = Depends(require_admin_or_super_admin),
|
||||
@@ -469,6 +472,7 @@ async def customer_update(
|
||||
|
||||
|
||||
@router.post("/customer/delete")
|
||||
@oper_log(title="CRM客户管理", business_type=3, business_id_field="ids", summary="删除客户")
|
||||
async def customer_delete(
|
||||
body: CustomerDeleteBody,
|
||||
_user: dict = Depends(require_admin_or_super_admin),
|
||||
@@ -926,6 +930,7 @@ async def product_import_template(
|
||||
|
||||
|
||||
@router.post("/customer/transfer")
|
||||
@oper_log(title="CRM客户管理", business_type=2, business_id_field="customerId", summary="转移客户")
|
||||
async def customer_transfer(
|
||||
body: dict,
|
||||
_user: dict = Depends(require_admin_or_super_admin),
|
||||
@@ -951,6 +956,7 @@ async def customer_transfer(
|
||||
|
||||
|
||||
@router.post("/customer/intoPool")
|
||||
@oper_log(title="CRM客户管理", business_type=2, business_id_field="customerId", summary="客户放入公海")
|
||||
async def customer_into_pool(
|
||||
body: dict,
|
||||
_user: dict = Depends(require_admin_or_super_admin),
|
||||
@@ -975,6 +981,7 @@ async def customer_into_pool(
|
||||
|
||||
|
||||
@router.post("/customer/deal/{customer_id}")
|
||||
@oper_log(title="CRM客户管理", business_type=2, path_param="customer_id", summary="客户成交")
|
||||
async def customer_deal(
|
||||
customer_id: str,
|
||||
body: dict = None,
|
||||
@@ -1026,6 +1033,7 @@ async def customer_check_duplicate(
|
||||
|
||||
|
||||
@router.post("/customer/export")
|
||||
@oper_log(title="CRM客户管理", business_type=5, summary="导出客户列表")
|
||||
async def customer_export(
|
||||
body: CustomerListBody = None,
|
||||
_user: dict = Depends(require_admin_or_super_admin),
|
||||
@@ -1350,6 +1358,7 @@ async def pool_customer_list(
|
||||
|
||||
|
||||
@router.post("/customer/pool/assign")
|
||||
@oper_log(title="CRM客户管理", business_type=2, business_id_field="customerIds", summary="公海分配客户")
|
||||
async def pool_customer_assign(
|
||||
body: PoolAssignBody,
|
||||
_user: dict = Depends(require_admin_or_super_admin),
|
||||
@@ -1368,6 +1377,7 @@ async def pool_customer_assign(
|
||||
|
||||
|
||||
@router.post("/customer/claim")
|
||||
@oper_log(title="CRM客户管理", business_type=2, business_id_field="customerId", summary="认领公海客户")
|
||||
async def pool_customer_claim(
|
||||
body: PoolClaimBody,
|
||||
_user: dict = Depends(require_admin_or_super_admin),
|
||||
|
||||
@@ -9,6 +9,7 @@ from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.database import get_db
|
||||
from app.core.menu_guard import require_admin_or_super_admin
|
||||
from app.core.oper_log_decorator import oper_log
|
||||
from app.core.response import error_response, success_response
|
||||
from app.core.tenant_context import get_tenant_no
|
||||
from app.crud.crm.data_scope_helpers import crm_user_info
|
||||
@@ -156,6 +157,7 @@ def register_contract_routes(router):
|
||||
return error_response(500, str(e))
|
||||
|
||||
@router.post("/contract")
|
||||
@oper_log(title="CRM合同管理", business_type=1, summary="新增合同【{contractName}】")
|
||||
async def contract_add(
|
||||
body: ContractCreateBody,
|
||||
_user: dict = Depends(require_admin_or_super_admin),
|
||||
@@ -180,6 +182,7 @@ def register_contract_routes(router):
|
||||
return error_response(500, str(e))
|
||||
|
||||
@router.put("/contract")
|
||||
@oper_log(title="CRM合同管理", business_type=2, summary="修改合同【{contractName}】")
|
||||
async def contract_edit(
|
||||
body: ContractUpdateBody,
|
||||
_user: dict = Depends(require_admin_or_super_admin),
|
||||
@@ -208,6 +211,7 @@ def register_contract_routes(router):
|
||||
return error_response(500, str(e))
|
||||
|
||||
@router.delete("/contract/{ids}")
|
||||
@oper_log(title="CRM合同管理", business_type=3, path_param="ids", summary="删除合同")
|
||||
async def contract_remove(
|
||||
ids: str,
|
||||
_user: dict = Depends(require_admin_or_super_admin),
|
||||
@@ -337,6 +341,7 @@ def register_contract_routes(router):
|
||||
return error_response(500, str(e))
|
||||
|
||||
@router.put("/contract/invalid")
|
||||
@oper_log(title="CRM合同管理", business_type=2, summary="作废合同")
|
||||
async def contract_invalid(
|
||||
body: ContractInvalidBody,
|
||||
_user: dict = Depends(require_admin_or_super_admin),
|
||||
@@ -441,6 +446,7 @@ def register_contract_routes(router):
|
||||
return error_response(500, str(e))
|
||||
|
||||
@router.post("/contract/export")
|
||||
@oper_log(title="CRM合同管理", business_type=5, summary="导出合同列表")
|
||||
async def contract_export(
|
||||
body: ContractExportBody = None,
|
||||
_user: dict = Depends(require_admin_or_super_admin),
|
||||
|
||||
@@ -10,6 +10,7 @@ from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.database import get_db
|
||||
from app.core.db_auth import DbUserContext, get_db_current_user, get_db_current_user_optional
|
||||
from app.core.delete_guard import assert_row_deletable_by_creator, user_info_from_context
|
||||
from app.core.tenant_context import get_tenant_no
|
||||
from app.services.db_data_scope import apply_db_scope, assert_db_row_in_scope
|
||||
from app.services.db.inventory_id import next_inbound_outbound_id
|
||||
@@ -426,6 +427,7 @@ def delete_inventory(
|
||||
) -> None:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
row = _get_inventory(db, tenant_no, id, user)
|
||||
assert_row_deletable_by_creator(row, user_info_from_context(user))
|
||||
row.del_flag = 1
|
||||
row.update_by = user.id
|
||||
db.commit()
|
||||
|
||||
@@ -9,6 +9,7 @@ from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.database import get_db
|
||||
from app.core.db_auth import DbUserContext, get_db_current_user
|
||||
from app.core.delete_guard import assert_row_deletable_by_creator, user_info_from_context
|
||||
from app.core.tenant_context import get_tenant_no
|
||||
from app.core.utils import generate_uuid
|
||||
from app.services.db_data_scope import apply_db_scope, assert_db_row_in_scope
|
||||
@@ -295,6 +296,7 @@ def delete_plan(
|
||||
) -> None:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
plan = _get_plan(db, tenant_no, id, user)
|
||||
assert_row_deletable_by_creator(plan, user_info_from_context(user))
|
||||
plan.del_flag = 1
|
||||
plan.update_by = user.id
|
||||
db.commit()
|
||||
|
||||
@@ -9,6 +9,7 @@ from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.database import get_db
|
||||
from app.core.db_auth import DbUserContext, get_db_current_user
|
||||
from app.core.delete_guard import assert_row_deletable_by_creator, user_info_from_context
|
||||
from app.core.tenant_context import get_tenant_no
|
||||
from app.core.utils import generate_uuid
|
||||
from app.services.db_data_scope import apply_db_scope, assert_db_row_in_scope
|
||||
@@ -360,6 +361,7 @@ def delete_weighing(
|
||||
) -> None:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
row = _get_weighing(db, tenant_no, id, user)
|
||||
assert_row_deletable_by_creator(row, user_info_from_context(user))
|
||||
row.is_voided = 1
|
||||
row.update_by = user.id
|
||||
db.commit()
|
||||
|
||||
@@ -182,7 +182,7 @@ async def delete_leave(
|
||||
return error_response(404, "请假记录不存在")
|
||||
if leave["status"] == "pending":
|
||||
return error_response(400, "审批中的请假单不能删除")
|
||||
leave_crud.soft_delete_leave(db, leave_id, user_id=user_id)
|
||||
leave_crud.soft_delete_leave(db, leave_id, user_id=user_id, user_info=_user)
|
||||
db.commit()
|
||||
return success_response(None)
|
||||
|
||||
|
||||
@@ -41,6 +41,8 @@ async def operlog_list(
|
||||
page_size=page_size,
|
||||
title=body.title if body else None,
|
||||
business_type=body.business_type if body else None,
|
||||
business_id=body.business_id if body else None,
|
||||
business_title=body.business_title if body else None,
|
||||
oper_name=body.oper_name if body else None,
|
||||
status=body.status if body else None,
|
||||
user_info=info,
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
from fastapi import APIRouter
|
||||
|
||||
from app.api.pl import plan, transport, freight, inventory
|
||||
from app.api.pl import base_data
|
||||
from app.api.pl import base_data, vehicle_recharge, vehicle_maintenance, vehicle_urea
|
||||
|
||||
pl_router = APIRouter(prefix="/transport", tags=["运输计划管理"])
|
||||
|
||||
@@ -20,3 +20,15 @@ pl_router.include_router(freight.router)
|
||||
|
||||
# 盘存统计
|
||||
pl_router.include_router(inventory.router)
|
||||
|
||||
# ETC/加油充值
|
||||
pl_router.include_router(vehicle_recharge.apply_router)
|
||||
pl_router.include_router(vehicle_recharge.record_router)
|
||||
|
||||
# 车辆维保
|
||||
pl_router.include_router(vehicle_maintenance.apply_router)
|
||||
pl_router.include_router(vehicle_maintenance.process_router)
|
||||
|
||||
# 车辆尿素
|
||||
pl_router.include_router(vehicle_urea.apply_router)
|
||||
pl_router.include_router(vehicle_urea.disburse_router)
|
||||
@@ -1,4 +1,5 @@
|
||||
"""运输计划管理 - 基础数据 API(承运商、车辆、人员)"""
|
||||
from datetime import datetime
|
||||
from typing import Optional
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query, status
|
||||
@@ -7,6 +8,7 @@ from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.database import get_db
|
||||
from app.core.db_auth import DbUserContext, get_db_current_user
|
||||
from app.core.delete_guard import assert_row_deletable_by_creator, user_info_from_context
|
||||
from app.services.pl_data_scope import apply_pl_scope, assert_pl_row_in_scope
|
||||
from app.core.tenant_context import get_tenant_no
|
||||
from app.core.utils import generate_uuid
|
||||
@@ -18,9 +20,11 @@ from app.models.pl_models import (
|
||||
PlVehiclePersonnel,
|
||||
)
|
||||
from app.schemas.pl import (
|
||||
CarrierAuditReject,
|
||||
CarrierCreate,
|
||||
CarrierRead,
|
||||
CarrierUpdate,
|
||||
carrier_to_read,
|
||||
DriverCreate,
|
||||
DriverRead,
|
||||
DriverUpdate,
|
||||
@@ -40,6 +44,10 @@ from app.services.pl_cert_service import (
|
||||
nearest_expire_date,
|
||||
save_owner_certs,
|
||||
)
|
||||
from app.services.pl_carrier_service import (
|
||||
carrier_eligible_for_transport,
|
||||
carrier_qualification_complete,
|
||||
)
|
||||
from app.services.pl_personnel_service import (
|
||||
load_vehicle_personnel_rows,
|
||||
load_vehicle_personnel_summaries,
|
||||
@@ -58,6 +66,7 @@ router = APIRouter(prefix="", tags=["运输计划-基础数据"])
|
||||
def list_carriers(
|
||||
q: Optional[str] = Query(default=None, description="模糊搜索"),
|
||||
status: Optional[str] = Query(default=None, description="状态"),
|
||||
audit_status: Optional[str] = Query(default=None, alias="auditStatus", description="审核状态"),
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> list[CarrierRead]:
|
||||
@@ -70,6 +79,9 @@ def list_carriers(
|
||||
if status:
|
||||
query = query.filter(PlCarrier.status == status)
|
||||
|
||||
if audit_status:
|
||||
query = query.filter(PlCarrier.audit_status == audit_status)
|
||||
|
||||
if q:
|
||||
query = query.filter(
|
||||
or_(
|
||||
@@ -84,7 +96,7 @@ def list_carriers(
|
||||
case((PlCarrier.order_num.is_(None), 1), else_=0).asc(),
|
||||
PlCarrier.create_time.desc(),
|
||||
)
|
||||
return query.all()
|
||||
return [carrier_to_read(row) for row in query.all()]
|
||||
|
||||
|
||||
@router.post("/carrier", response_model=CarrierRead, status_code=status.HTTP_201_CREATED)
|
||||
@@ -102,6 +114,11 @@ def create_carrier(
|
||||
contact_name=payload.contact_name,
|
||||
contact_phone=payload.contact_phone,
|
||||
status=payload.status,
|
||||
business_license_urls=payload.business_license_urls.strip(),
|
||||
road_transport_license_urls=payload.road_transport_license_urls.strip(),
|
||||
transport_agreement_urls=payload.transport_agreement_urls.strip(),
|
||||
transport_agreement_expire_date=payload.transport_agreement_expire_date,
|
||||
audit_status="pending",
|
||||
remark=payload.remark,
|
||||
create_by=user.id,
|
||||
create_dept_id=user.dept_id,
|
||||
@@ -109,7 +126,7 @@ def create_carrier(
|
||||
db.add(carrier)
|
||||
db.commit()
|
||||
db.refresh(carrier)
|
||||
return carrier
|
||||
return carrier_to_read(carrier)
|
||||
|
||||
|
||||
@router.get("/carrier/{id}", response_model=CarrierRead)
|
||||
@@ -120,7 +137,7 @@ def get_carrier(
|
||||
) -> CarrierRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
carrier = _get_carrier(db, tenant_no, id, user)
|
||||
return carrier
|
||||
return carrier_to_read(carrier)
|
||||
|
||||
|
||||
@router.put("/carrier/{id}", response_model=CarrierRead)
|
||||
@@ -133,13 +150,28 @@ def update_carrier(
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
carrier = _get_carrier(db, tenant_no, id, user)
|
||||
|
||||
for key, value in payload.model_dump(exclude_unset=True).items():
|
||||
payload_data = payload.model_dump(exclude_unset=True)
|
||||
qual_keys = (
|
||||
"business_license_urls",
|
||||
"road_transport_license_urls",
|
||||
"transport_agreement_urls",
|
||||
"transport_agreement_expire_date",
|
||||
)
|
||||
qual_changed = any(key in payload_data for key in qual_keys)
|
||||
|
||||
for key, value in payload_data.items():
|
||||
setattr(carrier, key, value)
|
||||
|
||||
if qual_changed and carrier.audit_status == "approved":
|
||||
carrier.audit_status = "pending"
|
||||
carrier.audit_by = None
|
||||
carrier.audit_time = None
|
||||
carrier.audit_remark = None
|
||||
|
||||
carrier.update_by = user.id
|
||||
db.commit()
|
||||
db.refresh(carrier)
|
||||
return carrier
|
||||
return carrier_to_read(carrier)
|
||||
|
||||
|
||||
@router.delete("/carrier/{id}", status_code=status.HTTP_204_NO_CONTENT)
|
||||
@@ -150,11 +182,59 @@ def delete_carrier(
|
||||
) -> None:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
carrier = _get_carrier(db, tenant_no, id, user)
|
||||
assert_row_deletable_by_creator(carrier, user_info_from_context(user))
|
||||
carrier.del_flag = 1
|
||||
carrier.update_by = user.id
|
||||
db.commit()
|
||||
|
||||
|
||||
@router.post("/carrier/{id}/approve", response_model=CarrierRead)
|
||||
def approve_carrier(
|
||||
id: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> CarrierRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
carrier = _get_carrier(db, tenant_no, id, user)
|
||||
|
||||
if carrier.audit_status == "approved":
|
||||
raise HTTPException(status_code=400, detail="承运商已审核通过")
|
||||
if not carrier_qualification_complete(carrier):
|
||||
raise HTTPException(status_code=400, detail="承运商资质附件不完整,无法审核通过")
|
||||
|
||||
carrier.audit_status = "approved"
|
||||
carrier.audit_by = user.id
|
||||
carrier.audit_time = datetime.now()
|
||||
carrier.audit_remark = None
|
||||
carrier.update_by = user.id
|
||||
db.commit()
|
||||
db.refresh(carrier)
|
||||
return carrier_to_read(carrier)
|
||||
|
||||
|
||||
@router.post("/carrier/{id}/reject", response_model=CarrierRead)
|
||||
def reject_carrier(
|
||||
id: str,
|
||||
payload: CarrierAuditReject,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> CarrierRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
carrier = _get_carrier(db, tenant_no, id, user)
|
||||
|
||||
if carrier.audit_status == "approved":
|
||||
raise HTTPException(status_code=400, detail="承运商已审核通过,无法驳回")
|
||||
|
||||
carrier.audit_status = "rejected"
|
||||
carrier.audit_by = user.id
|
||||
carrier.audit_time = datetime.now()
|
||||
carrier.audit_remark = (payload.remark or "").strip() or None
|
||||
carrier.update_by = user.id
|
||||
db.commit()
|
||||
db.refresh(carrier)
|
||||
return carrier_to_read(carrier)
|
||||
|
||||
|
||||
def _get_carrier(db: Session, tenant_no: str, carrier_id: str, user: DbUserContext) -> PlCarrier:
|
||||
carrier = (
|
||||
db.query(PlCarrier)
|
||||
@@ -212,6 +292,11 @@ def list_vehicles(
|
||||
vehicle_type: Optional[str] = Query(default=None, alias="vehicleType", description="车辆类型"),
|
||||
carrier_id: Optional[str] = Query(default=None, alias="carrierId", description="承运商ID"),
|
||||
vehicle_status: Optional[str] = Query(default=None, alias="vehicleStatus", description="车辆状态"),
|
||||
exclude_ineligible_carrier: Optional[bool] = Query(
|
||||
default=False,
|
||||
alias="excludeIneligibleCarrier",
|
||||
description="排除资质不全或协议过期的承运商车辆",
|
||||
),
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> list[VehicleRead]:
|
||||
@@ -240,6 +325,34 @@ def list_vehicles(
|
||||
PlVehicle.create_time.desc(),
|
||||
)
|
||||
vehicles = query.all()
|
||||
|
||||
if exclude_ineligible_carrier:
|
||||
carrier_ids = {
|
||||
v.carrier_id for v in vehicles if v.vehicle_type == "carrier" and v.carrier_id
|
||||
}
|
||||
carrier_map: dict[str, PlCarrier] = {}
|
||||
if carrier_ids:
|
||||
carriers = (
|
||||
db.query(PlCarrier)
|
||||
.filter(
|
||||
PlCarrier.id.in_(carrier_ids),
|
||||
PlCarrier.tenant_no == tenant_no,
|
||||
PlCarrier.del_flag == 0,
|
||||
)
|
||||
.all()
|
||||
)
|
||||
carrier_map = {c.id: c for c in carriers}
|
||||
vehicles = [
|
||||
v
|
||||
for v in vehicles
|
||||
if v.vehicle_type != "carrier"
|
||||
or not v.carrier_id
|
||||
or (
|
||||
v.carrier_id in carrier_map
|
||||
and carrier_eligible_for_transport(carrier_map[v.carrier_id])
|
||||
)
|
||||
]
|
||||
|
||||
summaries = load_vehicle_personnel_summaries(
|
||||
db, tenant_no, [v.id for v in vehicles]
|
||||
)
|
||||
@@ -387,6 +500,7 @@ def delete_vehicle(
|
||||
) -> None:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
vehicle = _get_vehicle(db, tenant_no, id, user)
|
||||
assert_row_deletable_by_creator(vehicle, user_info_from_context(user))
|
||||
vehicle.del_flag = 1
|
||||
vehicle.update_by = user.id
|
||||
db.commit()
|
||||
@@ -568,6 +682,7 @@ def delete_personnel(
|
||||
) -> None:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
personnel = _get_personnel(db, tenant_no, id, user)
|
||||
assert_row_deletable_by_creator(personnel, user_info_from_context(user))
|
||||
personnel.del_flag = 1
|
||||
personnel.update_by = user.id
|
||||
db.commit()
|
||||
@@ -710,6 +825,7 @@ def delete_driver(
|
||||
) -> None:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
personnel = _get_personnel(db, tenant_no, id, user)
|
||||
assert_row_deletable_by_creator(personnel, user_info_from_context(user))
|
||||
personnel.del_flag = 1
|
||||
personnel.update_by = user.id
|
||||
db.commit()
|
||||
@@ -783,5 +899,6 @@ def unbind_vehicle_driver(
|
||||
assert_pl_row_in_scope(db, vd, PlVehiclePersonnel, user, tenant_no)
|
||||
else:
|
||||
assert_pl_row_in_scope(db, vd, PlVehicleDriver, user, tenant_no)
|
||||
assert_row_deletable_by_creator(vd, user_info_from_context(user))
|
||||
vd.del_flag = 1
|
||||
db.commit()
|
||||
@@ -11,6 +11,7 @@ from app.core.tenant_context import get_tenant_no
|
||||
from app.models.pl_models import PlFreightSettlement
|
||||
from app.schemas.pl.freight import (
|
||||
FreightSettlementApprovalActionBody,
|
||||
FreightSettlementByTransportRead,
|
||||
FreightSettlementCreate,
|
||||
FreightSettlementDisburseBody,
|
||||
FreightSettlementListResponse,
|
||||
@@ -100,6 +101,21 @@ def list_settlements(
|
||||
return FreightSettlementListResponse(total=total, list=items)
|
||||
|
||||
|
||||
@router.get("/by-transport/{transport_id}", response_model=Optional[FreightSettlementByTransportRead])
|
||||
def get_settlement_by_transport(
|
||||
transport_id: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> Optional[FreightSettlementByTransportRead]:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
detail = freight_svc.get_settlement_by_transport_id(
|
||||
db, tenant_no=tenant_no, transport_id=transport_id, user=user
|
||||
)
|
||||
if not detail:
|
||||
return None
|
||||
return FreightSettlementByTransportRead.model_validate(detail)
|
||||
|
||||
|
||||
@router.post("/", response_model=FreightSettlementRead, status_code=status.HTTP_201_CREATED)
|
||||
def create_settlement(
|
||||
payload: FreightSettlementCreate,
|
||||
|
||||
@@ -9,6 +9,7 @@ from sqlalchemy.orm import Session
|
||||
from app.core.config import settings
|
||||
from app.core.database import get_db
|
||||
from app.core.db_auth import DbUserContext, get_db_current_user
|
||||
from app.core.delete_guard import assert_row_deletable_by_creator, user_info_from_context
|
||||
from app.services.pl_data_scope import apply_pl_scope, assert_pl_row_in_scope
|
||||
from app.core.tenant_context import get_tenant_no
|
||||
from app.core.utils import generate_uuid
|
||||
@@ -970,6 +971,7 @@ def delete_plan(
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
plan = _get_plan(db, tenant_no, id, user)
|
||||
|
||||
assert_row_deletable_by_creator(plan, user_info_from_context(user))
|
||||
plan.del_flag = 1
|
||||
plan.update_by = user.id
|
||||
|
||||
|
||||
@@ -52,6 +52,7 @@ from app.services.pl_transport_site_service import (
|
||||
sync_site_links_for_transport,
|
||||
)
|
||||
from app.services.pl_plan_service import is_ton_product_unit
|
||||
from app.services.pl_carrier_service import assert_carrier_eligible_for_transport
|
||||
|
||||
router = APIRouter(prefix="/order", tags=["运输计划-运输管理"])
|
||||
|
||||
@@ -166,6 +167,41 @@ def _get_vehicle_info(db: Session, vehicle_id: str, tenant_no: Optional[str] = N
|
||||
return info
|
||||
|
||||
|
||||
def _assert_vehicle_carrier_eligible(
|
||||
db: Session,
|
||||
tenant_no: str,
|
||||
vehicle_id: str,
|
||||
*,
|
||||
rearrange: bool = False,
|
||||
) -> None:
|
||||
vehicle = (
|
||||
db.query(PlVehicle)
|
||||
.filter(
|
||||
PlVehicle.id == vehicle_id,
|
||||
PlVehicle.tenant_no == tenant_no,
|
||||
PlVehicle.del_flag == 0,
|
||||
)
|
||||
.first()
|
||||
)
|
||||
if not vehicle:
|
||||
raise HTTPException(status_code=400, detail="车辆不存在")
|
||||
if not vehicle.carrier_id:
|
||||
return
|
||||
|
||||
carrier = (
|
||||
db.query(PlCarrier)
|
||||
.filter(
|
||||
PlCarrier.id == vehicle.carrier_id,
|
||||
PlCarrier.tenant_no == tenant_no,
|
||||
PlCarrier.del_flag == 0,
|
||||
)
|
||||
.first()
|
||||
)
|
||||
if not carrier:
|
||||
raise HTTPException(status_code=400, detail="承运商不存在")
|
||||
assert_carrier_eligible_for_transport(carrier, rearrange=rearrange)
|
||||
|
||||
|
||||
def _ensure_driver_access_token(transport: PlTransport) -> str:
|
||||
token = (transport.driver_access_token or "").strip()
|
||||
if not token:
|
||||
@@ -262,7 +298,8 @@ def _apply_transport_arrange_fields(
|
||||
transport.freight_price = payload.freight_price
|
||||
transport.freight_amount = freight_amount or 0
|
||||
transport.freight_type = payload.freight_type
|
||||
transport.has_invoice = payload.has_invoice
|
||||
if payload.has_invoice is not None:
|
||||
transport.has_invoice = payload.has_invoice
|
||||
if payload.remark is not None:
|
||||
transport.remark = payload.remark
|
||||
transport.update_by = user_id
|
||||
@@ -441,6 +478,26 @@ def arrange_transport(
|
||||
raise HTTPException(status_code=404, detail="计划不存在")
|
||||
assert_pl_row_in_scope(db, plan, PlPlan, user, tenant_no)
|
||||
|
||||
existing_transport = None
|
||||
if plan.transport_id:
|
||||
existing_transport = db.query(PlTransport).filter(
|
||||
PlTransport.id == plan.transport_id,
|
||||
PlTransport.tenant_no == tenant_no,
|
||||
PlTransport.del_flag == 0,
|
||||
).first()
|
||||
|
||||
is_rearrange = _is_rearrange(plan, existing_transport)
|
||||
|
||||
if is_rearrange and existing_transport and existing_transport.vehicle_id:
|
||||
_assert_vehicle_carrier_eligible(
|
||||
db,
|
||||
tenant_no,
|
||||
existing_transport.vehicle_id,
|
||||
rearrange=True,
|
||||
)
|
||||
|
||||
_assert_vehicle_carrier_eligible(db, tenant_no, payload.vehicle_id, rearrange=False)
|
||||
|
||||
# 获取车辆信息
|
||||
vehicle_info = _get_vehicle_info(db, payload.vehicle_id, tenant_no)
|
||||
|
||||
@@ -481,16 +538,6 @@ def arrange_transport(
|
||||
_apply_plan_logistics_from_payload(plan, payload)
|
||||
start_point, end_point = _resolve_transport_endpoints(plan, payload)
|
||||
|
||||
existing_transport = None
|
||||
if plan.transport_id:
|
||||
existing_transport = db.query(PlTransport).filter(
|
||||
PlTransport.id == plan.transport_id,
|
||||
PlTransport.tenant_no == tenant_no,
|
||||
PlTransport.del_flag == 0,
|
||||
).first()
|
||||
|
||||
is_rearrange = _is_rearrange(plan, existing_transport)
|
||||
|
||||
if (
|
||||
plan.plan_type in ("inbound", "outbound")
|
||||
and is_rearrange
|
||||
|
||||
@@ -0,0 +1,202 @@
|
||||
"""车辆维保 API"""
|
||||
from datetime import date
|
||||
from typing import Optional
|
||||
|
||||
from fastapi import APIRouter, Depends, Query, status
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.database import get_db
|
||||
from app.core.db_auth import DbUserContext, get_db_current_user
|
||||
from app.core.tenant_context import get_tenant_no
|
||||
from app.schemas.pl.vehicle_maintenance import (
|
||||
VehicleMaintenanceApplyCreate,
|
||||
VehicleMaintenanceApplyListResponse,
|
||||
VehicleMaintenanceApplyRead,
|
||||
VehicleMaintenanceApplyReminder,
|
||||
VehicleMaintenanceApplyUpdate,
|
||||
VehicleMaintenanceProcessBoardListResponse,
|
||||
VehicleMaintenanceProcessCreate,
|
||||
VehicleMaintenanceProcessRead,
|
||||
VehicleMaintenanceProcessUpdate,
|
||||
)
|
||||
from app.services import pl_vehicle_maintenance_service as svc
|
||||
|
||||
apply_router = APIRouter(prefix="/vehicle-maintenance-apply", tags=["运输计划-车辆维保申请"])
|
||||
process_router = APIRouter(prefix="/vehicle-maintenance-process", tags=["运输计划-车辆维保处理"])
|
||||
|
||||
|
||||
@apply_router.get("/", response_model=VehicleMaintenanceApplyListResponse)
|
||||
def list_applies(
|
||||
q: Optional[str] = Query(default=None),
|
||||
maintenance_type: Optional[str] = Query(default=None, alias="maintenanceType"),
|
||||
status: Optional[str] = Query(default=None),
|
||||
apply_date_from: Optional[date] = Query(default=None, alias="applyDateFrom"),
|
||||
apply_date_to: Optional[date] = Query(default=None, alias="applyDateTo"),
|
||||
applicant_id: Optional[str] = Query(default=None, alias="applicantId"),
|
||||
page: int = Query(default=1, ge=1),
|
||||
page_size: int = Query(default=20, ge=1, le=100, alias="pageSize"),
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleMaintenanceApplyListResponse:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
items, total = svc.list_applies(
|
||||
db,
|
||||
tenant_no,
|
||||
user,
|
||||
q=q,
|
||||
maintenance_type=maintenance_type,
|
||||
status=status,
|
||||
apply_date_from=apply_date_from,
|
||||
apply_date_to=apply_date_to,
|
||||
applicant_id=applicant_id,
|
||||
page=page,
|
||||
page_size=page_size,
|
||||
)
|
||||
return VehicleMaintenanceApplyListResponse(
|
||||
items=items, total=total, page=page, pageSize=page_size
|
||||
)
|
||||
|
||||
|
||||
@apply_router.get("/reminders", response_model=list[VehicleMaintenanceApplyReminder])
|
||||
def list_reminders(
|
||||
license_plate: str = Query(..., alias="licensePlate"),
|
||||
exclude_apply_id: Optional[str] = Query(default=None, alias="excludeApplyId"),
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> list[VehicleMaintenanceApplyReminder]:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
return svc.list_reminders(
|
||||
db,
|
||||
tenant_no,
|
||||
user,
|
||||
license_plate,
|
||||
exclude_apply_id=exclude_apply_id,
|
||||
)
|
||||
|
||||
|
||||
@apply_router.get("/{id}", response_model=VehicleMaintenanceApplyRead)
|
||||
def get_apply(
|
||||
id: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleMaintenanceApplyRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
return svc.get_apply(db, tenant_no, user, id)
|
||||
|
||||
|
||||
@apply_router.post("/", response_model=VehicleMaintenanceApplyRead, status_code=status.HTTP_201_CREATED)
|
||||
def create_apply(
|
||||
payload: VehicleMaintenanceApplyCreate,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleMaintenanceApplyRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
return svc.create_apply(db, tenant_no, user, payload)
|
||||
|
||||
|
||||
@apply_router.put("/{id}", response_model=VehicleMaintenanceApplyRead)
|
||||
def update_apply(
|
||||
id: str,
|
||||
payload: VehicleMaintenanceApplyUpdate,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleMaintenanceApplyRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
return svc.update_apply(db, tenant_no, user, id, payload)
|
||||
|
||||
|
||||
@apply_router.post("/{id}/cancel", response_model=VehicleMaintenanceApplyRead)
|
||||
def cancel_apply(
|
||||
id: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleMaintenanceApplyRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
return svc.cancel_apply(db, tenant_no, user, id)
|
||||
|
||||
|
||||
@apply_router.delete("/{ids}", status_code=status.HTTP_204_NO_CONTENT)
|
||||
def delete_applies(
|
||||
ids: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> None:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
apply_ids = [item for item in ids.split(",") if item]
|
||||
svc.delete_applies(db, tenant_no, user, apply_ids)
|
||||
|
||||
|
||||
@process_router.get("/process-board", response_model=VehicleMaintenanceProcessBoardListResponse)
|
||||
def list_process_board(
|
||||
q: Optional[str] = Query(default=None),
|
||||
maintenance_type: Optional[str] = Query(default=None, alias="maintenanceType"),
|
||||
apply_status: Optional[str] = Query(default=None, alias="applyStatus"),
|
||||
apply_date_from: Optional[date] = Query(default=None, alias="applyDateFrom"),
|
||||
apply_date_to: Optional[date] = Query(default=None, alias="applyDateTo"),
|
||||
process_date_from: Optional[date] = Query(default=None, alias="processDateFrom"),
|
||||
process_date_to: Optional[date] = Query(default=None, alias="processDateTo"),
|
||||
page: int = Query(default=1, ge=1),
|
||||
page_size: int = Query(default=20, ge=1, le=100, alias="pageSize"),
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleMaintenanceProcessBoardListResponse:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
items, total = svc.list_process_board(
|
||||
db,
|
||||
tenant_no,
|
||||
user,
|
||||
q=q,
|
||||
maintenance_type=maintenance_type,
|
||||
apply_status=apply_status,
|
||||
apply_date_from=apply_date_from,
|
||||
apply_date_to=apply_date_to,
|
||||
process_date_from=process_date_from,
|
||||
process_date_to=process_date_to,
|
||||
page=page,
|
||||
page_size=page_size,
|
||||
)
|
||||
return VehicleMaintenanceProcessBoardListResponse(
|
||||
items=items, total=total, page=page, pageSize=page_size
|
||||
)
|
||||
|
||||
|
||||
@process_router.get("/{id}", response_model=VehicleMaintenanceProcessRead)
|
||||
def get_process(
|
||||
id: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleMaintenanceProcessRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
return svc.get_process(db, tenant_no, user, id)
|
||||
|
||||
|
||||
@process_router.post("/", response_model=VehicleMaintenanceProcessRead, status_code=status.HTTP_201_CREATED)
|
||||
def create_process(
|
||||
payload: VehicleMaintenanceProcessCreate,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleMaintenanceProcessRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
return svc.create_process(db, tenant_no, user, payload)
|
||||
|
||||
|
||||
@process_router.put("/{id}", response_model=VehicleMaintenanceProcessRead)
|
||||
def update_process(
|
||||
id: str,
|
||||
payload: VehicleMaintenanceProcessUpdate,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleMaintenanceProcessRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
return svc.update_process(db, tenant_no, user, id, payload)
|
||||
|
||||
|
||||
@process_router.delete("/{ids}", status_code=status.HTTP_204_NO_CONTENT)
|
||||
def delete_processes(
|
||||
ids: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> None:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
process_ids = [item for item in ids.split(",") if item]
|
||||
svc.delete_processes(db, tenant_no, user, process_ids)
|
||||
@@ -0,0 +1,228 @@
|
||||
"""车辆 ETC/加油充值 API"""
|
||||
from datetime import date
|
||||
from typing import Optional
|
||||
|
||||
from fastapi import APIRouter, Depends, Query, status
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.database import get_db
|
||||
from app.core.db_auth import DbUserContext, get_db_current_user
|
||||
from app.core.tenant_context import get_tenant_no
|
||||
from app.schemas.pl.vehicle_recharge import (
|
||||
VehicleRechargeApplyCreate,
|
||||
VehicleRechargeApplyListResponse,
|
||||
VehicleRechargeApplyOption,
|
||||
VehicleRechargeApplyRead,
|
||||
VehicleRechargeApplyUpdate,
|
||||
VehicleRechargeDisburseBoardListResponse,
|
||||
VehicleRechargeRecordCreate,
|
||||
VehicleRechargeRecordListResponse,
|
||||
VehicleRechargeRecordRead,
|
||||
VehicleRechargeRecordUpdate,
|
||||
)
|
||||
from app.services import pl_vehicle_recharge_service as svc
|
||||
|
||||
apply_router = APIRouter(prefix="/vehicle-recharge-apply", tags=["运输计划-ETC加油申请"])
|
||||
record_router = APIRouter(prefix="/vehicle-recharge-record", tags=["运输计划-ETC加油发放"])
|
||||
|
||||
|
||||
@apply_router.get("/", response_model=VehicleRechargeApplyListResponse)
|
||||
def list_applies(
|
||||
q: Optional[str] = Query(default=None),
|
||||
recharge_type: Optional[str] = Query(default=None, alias="rechargeType"),
|
||||
status: Optional[str] = Query(default=None),
|
||||
apply_date_from: Optional[date] = Query(default=None, alias="applyDateFrom"),
|
||||
apply_date_to: Optional[date] = Query(default=None, alias="applyDateTo"),
|
||||
applicant_id: Optional[str] = Query(default=None, alias="applicantId"),
|
||||
page: int = Query(default=1, ge=1),
|
||||
page_size: int = Query(default=20, ge=1, le=100, alias="pageSize"),
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleRechargeApplyListResponse:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
items, total = svc.list_applies(
|
||||
db,
|
||||
tenant_no,
|
||||
user,
|
||||
q=q,
|
||||
recharge_type=recharge_type,
|
||||
status=status,
|
||||
apply_date_from=apply_date_from,
|
||||
apply_date_to=apply_date_to,
|
||||
applicant_id=applicant_id,
|
||||
page=page,
|
||||
page_size=page_size,
|
||||
)
|
||||
return VehicleRechargeApplyListResponse(
|
||||
items=items, total=total, page=page, pageSize=page_size
|
||||
)
|
||||
|
||||
|
||||
@apply_router.get("/pending-options", response_model=list[VehicleRechargeApplyOption])
|
||||
def pending_apply_options(
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> list[VehicleRechargeApplyOption]:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
rows = svc.list_pending_apply_options(db, tenant_no, user)
|
||||
return [VehicleRechargeApplyOption.model_validate(row) for row in rows]
|
||||
|
||||
|
||||
@apply_router.get("/{id}", response_model=VehicleRechargeApplyRead)
|
||||
def get_apply(
|
||||
id: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleRechargeApplyRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
return svc.get_apply(db, tenant_no, user, id)
|
||||
|
||||
|
||||
@apply_router.post("/", response_model=VehicleRechargeApplyRead, status_code=status.HTTP_201_CREATED)
|
||||
def create_apply(
|
||||
payload: VehicleRechargeApplyCreate,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleRechargeApplyRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
return svc.create_apply(db, tenant_no, user, payload)
|
||||
|
||||
|
||||
@apply_router.put("/{id}", response_model=VehicleRechargeApplyRead)
|
||||
def update_apply(
|
||||
id: str,
|
||||
payload: VehicleRechargeApplyUpdate,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleRechargeApplyRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
return svc.update_apply(db, tenant_no, user, id, payload)
|
||||
|
||||
|
||||
@apply_router.post("/{id}/cancel", response_model=VehicleRechargeApplyRead)
|
||||
def cancel_apply(
|
||||
id: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleRechargeApplyRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
return svc.cancel_apply(db, tenant_no, user, id)
|
||||
|
||||
|
||||
@apply_router.delete("/{ids}", status_code=status.HTTP_204_NO_CONTENT)
|
||||
def delete_applies(
|
||||
ids: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> None:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
apply_ids = [item for item in ids.split(",") if item]
|
||||
svc.delete_applies(db, tenant_no, user, apply_ids)
|
||||
|
||||
|
||||
@record_router.get("/", response_model=VehicleRechargeRecordListResponse)
|
||||
def list_records(
|
||||
q: Optional[str] = Query(default=None),
|
||||
recharge_type: Optional[str] = Query(default=None, alias="rechargeType"),
|
||||
recharge_date_from: Optional[date] = Query(default=None, alias="rechargeDateFrom"),
|
||||
recharge_date_to: Optional[date] = Query(default=None, alias="rechargeDateTo"),
|
||||
gas_station: Optional[str] = Query(default=None, alias="gasStation"),
|
||||
apply_no: Optional[str] = Query(default=None, alias="applyNo"),
|
||||
page: int = Query(default=1, ge=1),
|
||||
page_size: int = Query(default=20, ge=1, le=100, alias="pageSize"),
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleRechargeRecordListResponse:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
items, total = svc.list_records(
|
||||
db,
|
||||
tenant_no,
|
||||
user,
|
||||
q=q,
|
||||
recharge_type=recharge_type,
|
||||
recharge_date_from=recharge_date_from,
|
||||
recharge_date_to=recharge_date_to,
|
||||
gas_station=gas_station,
|
||||
apply_no=apply_no,
|
||||
page=page,
|
||||
page_size=page_size,
|
||||
)
|
||||
return VehicleRechargeRecordListResponse(
|
||||
items=items, total=total, page=page, pageSize=page_size
|
||||
)
|
||||
|
||||
|
||||
@record_router.get("/disburse-board", response_model=VehicleRechargeDisburseBoardListResponse)
|
||||
def list_disburse_board(
|
||||
q: Optional[str] = Query(default=None),
|
||||
recharge_type: Optional[str] = Query(default=None, alias="rechargeType"),
|
||||
apply_status: Optional[str] = Query(default=None, alias="applyStatus"),
|
||||
apply_date_from: Optional[date] = Query(default=None, alias="applyDateFrom"),
|
||||
apply_date_to: Optional[date] = Query(default=None, alias="applyDateTo"),
|
||||
recharge_date_from: Optional[date] = Query(default=None, alias="rechargeDateFrom"),
|
||||
recharge_date_to: Optional[date] = Query(default=None, alias="rechargeDateTo"),
|
||||
page: int = Query(default=1, ge=1),
|
||||
page_size: int = Query(default=20, ge=1, le=100, alias="pageSize"),
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleRechargeDisburseBoardListResponse:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
items, total = svc.list_disburse_board(
|
||||
db,
|
||||
tenant_no,
|
||||
user,
|
||||
q=q,
|
||||
recharge_type=recharge_type,
|
||||
apply_status=apply_status,
|
||||
apply_date_from=apply_date_from,
|
||||
apply_date_to=apply_date_to,
|
||||
recharge_date_from=recharge_date_from,
|
||||
recharge_date_to=recharge_date_to,
|
||||
page=page,
|
||||
page_size=page_size,
|
||||
)
|
||||
return VehicleRechargeDisburseBoardListResponse(
|
||||
items=items, total=total, page=page, pageSize=page_size
|
||||
)
|
||||
|
||||
|
||||
@record_router.get("/{id}", response_model=VehicleRechargeRecordRead)
|
||||
def get_record(
|
||||
id: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleRechargeRecordRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
return svc.get_record(db, tenant_no, user, id)
|
||||
|
||||
|
||||
@record_router.post("/", response_model=VehicleRechargeRecordRead, status_code=status.HTTP_201_CREATED)
|
||||
def create_record(
|
||||
payload: VehicleRechargeRecordCreate,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleRechargeRecordRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
return svc.create_record(db, tenant_no, user, payload)
|
||||
|
||||
|
||||
@record_router.put("/{id}", response_model=VehicleRechargeRecordRead)
|
||||
def update_record(
|
||||
id: str,
|
||||
payload: VehicleRechargeRecordUpdate,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleRechargeRecordRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
return svc.update_record(db, tenant_no, user, id, payload)
|
||||
|
||||
|
||||
@record_router.delete("/{ids}", status_code=status.HTTP_204_NO_CONTENT)
|
||||
def delete_records(
|
||||
ids: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> None:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
record_ids = [item for item in ids.split(",") if item]
|
||||
svc.delete_records(db, tenant_no, user, record_ids)
|
||||
@@ -0,0 +1,180 @@
|
||||
"""车辆尿素 API"""
|
||||
from datetime import date
|
||||
from typing import Optional
|
||||
|
||||
from fastapi import APIRouter, Depends, Query, status
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.database import get_db
|
||||
from app.core.db_auth import DbUserContext, get_db_current_user
|
||||
from app.core.tenant_context import get_tenant_no
|
||||
from app.schemas.pl.vehicle_urea import (
|
||||
VehicleUreaApplyCreate,
|
||||
VehicleUreaApplyListResponse,
|
||||
VehicleUreaApplyRead,
|
||||
VehicleUreaApplyUpdate,
|
||||
VehicleUreaDisburseBoardListResponse,
|
||||
VehicleUreaDisburseCreate,
|
||||
VehicleUreaDisburseRead,
|
||||
VehicleUreaDisburseUpdate,
|
||||
)
|
||||
from app.services import pl_vehicle_urea_service as svc
|
||||
|
||||
apply_router = APIRouter(prefix="/vehicle-urea-apply", tags=["运输计划-车辆尿素申请"])
|
||||
disburse_router = APIRouter(prefix="/vehicle-urea-disburse", tags=["运输计划-车辆尿素发放"])
|
||||
|
||||
|
||||
@apply_router.get("/", response_model=VehicleUreaApplyListResponse)
|
||||
def list_applies(
|
||||
q: Optional[str] = Query(default=None),
|
||||
status: Optional[str] = Query(default=None),
|
||||
apply_date_from: Optional[date] = Query(default=None, alias="applyDateFrom"),
|
||||
apply_date_to: Optional[date] = Query(default=None, alias="applyDateTo"),
|
||||
applicant_id: Optional[str] = Query(default=None, alias="applicantId"),
|
||||
page: int = Query(default=1, ge=1),
|
||||
page_size: int = Query(default=20, ge=1, le=100, alias="pageSize"),
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleUreaApplyListResponse:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
items, total = svc.list_applies(
|
||||
db,
|
||||
tenant_no,
|
||||
user,
|
||||
q=q,
|
||||
status=status,
|
||||
apply_date_from=apply_date_from,
|
||||
apply_date_to=apply_date_to,
|
||||
applicant_id=applicant_id,
|
||||
page=page,
|
||||
page_size=page_size,
|
||||
)
|
||||
return VehicleUreaApplyListResponse(
|
||||
items=items, total=total, page=page, pageSize=page_size
|
||||
)
|
||||
|
||||
|
||||
@apply_router.get("/{id}", response_model=VehicleUreaApplyRead)
|
||||
def get_apply(
|
||||
id: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleUreaApplyRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
return svc.get_apply(db, tenant_no, user, id)
|
||||
|
||||
|
||||
@apply_router.post("/", response_model=VehicleUreaApplyRead, status_code=status.HTTP_201_CREATED)
|
||||
def create_apply(
|
||||
payload: VehicleUreaApplyCreate,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleUreaApplyRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
return svc.create_apply(db, tenant_no, user, payload)
|
||||
|
||||
|
||||
@apply_router.put("/{id}", response_model=VehicleUreaApplyRead)
|
||||
def update_apply(
|
||||
id: str,
|
||||
payload: VehicleUreaApplyUpdate,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleUreaApplyRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
return svc.update_apply(db, tenant_no, user, id, payload)
|
||||
|
||||
|
||||
@apply_router.post("/{id}/cancel", response_model=VehicleUreaApplyRead)
|
||||
def cancel_apply(
|
||||
id: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleUreaApplyRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
return svc.cancel_apply(db, tenant_no, user, id)
|
||||
|
||||
|
||||
@apply_router.delete("/{ids}", status_code=status.HTTP_204_NO_CONTENT)
|
||||
def delete_applies(
|
||||
ids: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> None:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
apply_ids = [item for item in ids.split(",") if item]
|
||||
svc.delete_applies(db, tenant_no, user, apply_ids)
|
||||
|
||||
|
||||
@disburse_router.get("/disburse-board", response_model=VehicleUreaDisburseBoardListResponse)
|
||||
def list_disburse_board(
|
||||
q: Optional[str] = Query(default=None),
|
||||
apply_status: Optional[str] = Query(default=None, alias="applyStatus"),
|
||||
apply_date_from: Optional[date] = Query(default=None, alias="applyDateFrom"),
|
||||
apply_date_to: Optional[date] = Query(default=None, alias="applyDateTo"),
|
||||
disburse_date_from: Optional[date] = Query(default=None, alias="disburseDateFrom"),
|
||||
disburse_date_to: Optional[date] = Query(default=None, alias="disburseDateTo"),
|
||||
page: int = Query(default=1, ge=1),
|
||||
page_size: int = Query(default=20, ge=1, le=100, alias="pageSize"),
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleUreaDisburseBoardListResponse:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
items, total = svc.list_disburse_board(
|
||||
db,
|
||||
tenant_no,
|
||||
user,
|
||||
q=q,
|
||||
apply_status=apply_status,
|
||||
apply_date_from=apply_date_from,
|
||||
apply_date_to=apply_date_to,
|
||||
disburse_date_from=disburse_date_from,
|
||||
disburse_date_to=disburse_date_to,
|
||||
page=page,
|
||||
page_size=page_size,
|
||||
)
|
||||
return VehicleUreaDisburseBoardListResponse(
|
||||
items=items, total=total, page=page, pageSize=page_size
|
||||
)
|
||||
|
||||
|
||||
@disburse_router.get("/{id}", response_model=VehicleUreaDisburseRead)
|
||||
def get_disburse(
|
||||
id: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleUreaDisburseRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
return svc.get_disburse(db, tenant_no, user, id)
|
||||
|
||||
|
||||
@disburse_router.post("/", response_model=VehicleUreaDisburseRead, status_code=status.HTTP_201_CREATED)
|
||||
def create_disburse(
|
||||
payload: VehicleUreaDisburseCreate,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleUreaDisburseRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
return svc.create_disburse(db, tenant_no, user, payload)
|
||||
|
||||
|
||||
@disburse_router.put("/{id}", response_model=VehicleUreaDisburseRead)
|
||||
def update_disburse(
|
||||
id: str,
|
||||
payload: VehicleUreaDisburseUpdate,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> VehicleUreaDisburseRead:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
return svc.update_disburse(db, tenant_no, user, id, payload)
|
||||
|
||||
|
||||
@disburse_router.delete("/{ids}", status_code=status.HTTP_204_NO_CONTENT)
|
||||
def delete_disburses(
|
||||
ids: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: DbUserContext = Depends(get_db_current_user),
|
||||
) -> None:
|
||||
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
|
||||
disburse_ids = [item for item in ids.split(",") if item]
|
||||
svc.delete_disburses(db, tenant_no, user, disburse_ids)
|
||||
@@ -57,12 +57,14 @@ def _build_user_info_payload(user: SysUser, web_role: str) -> dict:
|
||||
|
||||
|
||||
def _jwt_user_payload(user: SysUser, web_role: str) -> dict:
|
||||
tenant_no = (getattr(user, "tenant_no", None) or "").strip() or settings.DEFAULT_TENANT_NO
|
||||
return {
|
||||
"sub": user.id,
|
||||
"username": user.user_no,
|
||||
"role": web_role,
|
||||
"region_id": user.dept_id,
|
||||
"real_name": user.nick_name,
|
||||
"tenant_no": tenant_no,
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -244,7 +244,7 @@ async def delete_process_def(
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
try:
|
||||
wf_crud.soft_delete_process_def(db, def_id)
|
||||
wf_crud.soft_delete_process_def(db, def_id, user_info=_user)
|
||||
return success_response(None, message="删除成功")
|
||||
except ValueError as e:
|
||||
return error_response(400, str(e))
|
||||
|
||||
Reference in new issue
Block a user