提交
This commit is contained in:
1 parent
012a2ad68e
commit
5fe53c5481
4775 files changed
+2190111
-40277
No files matched your search
@@ -163,23 +163,24 @@ def _resolve_vehicle(
|
||||
plate = (draft.license_plate or "").strip()
|
||||
if not plate:
|
||||
raise HTTPException(status_code=400, detail="车牌号不能为空")
|
||||
carrier_id = (draft.carrier_id or "").strip()
|
||||
if not carrier_id:
|
||||
raise HTTPException(status_code=400, detail="请选择承运商")
|
||||
|
||||
carrier = (
|
||||
db.query(PlCarrier)
|
||||
.filter(
|
||||
PlCarrier.id == carrier_id,
|
||||
PlCarrier.tenant_no == tenant_no,
|
||||
PlCarrier.del_flag == 0,
|
||||
carrier_id = (draft.carrier_id or "").strip() or None
|
||||
carrier_name = (draft.carrier_name or "").strip() or None
|
||||
if carrier_id:
|
||||
carrier = (
|
||||
db.query(PlCarrier)
|
||||
.filter(
|
||||
PlCarrier.id == carrier_id,
|
||||
PlCarrier.tenant_no == tenant_no,
|
||||
PlCarrier.del_flag == 0,
|
||||
)
|
||||
.first()
|
||||
)
|
||||
.first()
|
||||
)
|
||||
if not carrier:
|
||||
raise HTTPException(status_code=400, detail="承运商不存在")
|
||||
if not carrier:
|
||||
raise HTTPException(status_code=400, detail="承运商不存在")
|
||||
carrier_name = carrier_name or carrier.carrier_name
|
||||
else:
|
||||
carrier_name = None
|
||||
|
||||
carrier_name = (draft.carrier_name or "").strip() or carrier.carrier_name
|
||||
existing = _find_vehicle_by_plate(db, tenant_no, plate)
|
||||
if existing and conflict is None:
|
||||
raise HTTPException(
|
||||
|
||||
Reference in new issue
Block a user