提交
This commit is contained in:
1 parent
6d9354a194
commit
aff71d296b
2759 files changed
+860425
-13211
No files matched your search
@@ -47,9 +47,15 @@ from app.schemas.pl.plan import (
|
||||
PlanUpdate,
|
||||
PlanWithProducts,
|
||||
)
|
||||
from app.schemas.pl.transport import PlanArrangeInfoRead, TransportInventoryLinkRead, TransportSiteLinkRead
|
||||
from app.schemas.pl.transport import (
|
||||
PlanArrangeInfoRead,
|
||||
TransportInventoryLinkRead,
|
||||
TransportIoOrderBrief,
|
||||
TransportSiteLinkRead,
|
||||
)
|
||||
from app.services.pl_dibang_bridge_service import revoke_regeneratable_dibang_for_transport
|
||||
from app.services.pl_inventory_link_read import build_transport_inventory_link_read
|
||||
from app.services.pl_io_order_service import get_active_io_order_for_plan, void_io_orders_for_plan
|
||||
from app.services.pl_site_link_read import build_transport_site_link_read_from_row
|
||||
from app.services.pl_transport_site_service import revoke_site_links_for_transport
|
||||
from app.services.pl_plan_service import (
|
||||
@@ -730,6 +736,12 @@ def update_plan(
|
||||
if plan.follow_status == "cancelled":
|
||||
raise HTTPException(status_code=400, detail="已作废的计划不能修改")
|
||||
|
||||
if plan.transport_status == "arranged" and plan.plan_type in ("inbound", "outbound"):
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
detail="已安排的入库/出库计划不可修改,请作废后新建计划",
|
||||
)
|
||||
|
||||
# 更新主表字段
|
||||
update_data = payload.model_dump(exclude_unset=True, exclude={"products", "transport"})
|
||||
for key, value in update_data.items():
|
||||
@@ -1009,11 +1021,40 @@ def get_plan_arrange_info(
|
||||
)
|
||||
)
|
||||
|
||||
io_order_brief = None
|
||||
active_io = get_active_io_order_for_plan(db, tenant_no, plan)
|
||||
if active_io:
|
||||
kind, header = active_io
|
||||
from app.services.pl_io_order_service import build_io_order_site_url
|
||||
|
||||
token = (header.site_access_token or "").strip()
|
||||
io_order_brief = TransportIoOrderBrief(
|
||||
kind=kind,
|
||||
order_id=header.id,
|
||||
order_no=header.order_no,
|
||||
site_access_token=token or None,
|
||||
site_url=build_io_order_site_url(kind, token) if token else None,
|
||||
status=header.status,
|
||||
)
|
||||
if not site_records and token and header.status != "voided":
|
||||
site_records = [
|
||||
TransportSiteLinkRead(
|
||||
plan_product_id="",
|
||||
product_name=header.order_no,
|
||||
site_link_id=header.id,
|
||||
plan_no=plan.plan_no or "",
|
||||
business_type="入库" if kind == "inbound" else "出库",
|
||||
site_access_token=token,
|
||||
site_url=build_io_order_site_url(kind, token),
|
||||
)
|
||||
]
|
||||
|
||||
return PlanArrangeInfoRead(
|
||||
driver_url=driver_url,
|
||||
license_plate=transport.license_plate or plan.license_plate,
|
||||
site_records=site_records,
|
||||
inventory_records=inventory_records,
|
||||
io_order=io_order_brief,
|
||||
)
|
||||
|
||||
|
||||
@@ -1067,6 +1108,10 @@ def cancel_plan(
|
||||
transport.transport_status = "cancelled"
|
||||
transport.update_by = user.id
|
||||
|
||||
void_io_orders_for_plan(
|
||||
db, tenant_no=tenant_no, plan_id=plan.id, user_id=user.id
|
||||
)
|
||||
|
||||
plan.follow_status = "cancelled"
|
||||
plan.transport_status = "pending"
|
||||
plan.update_by = user.id
|
||||
|
||||
Reference in new issue
Block a user