fix(m3): code-review 15 项修复（13 项落地，2 项依赖分摊语义记待办）

- 审批：删 _flush_order 撞键内部重试（rollback 会回掉同事务业务行造成静默丢数据，异常改由 create 外层重试整体重来/update 路径审计收敛）； act() 出参固化前置到 commit 之前（commit 后查询失败会把已通过的审批记成失败审计）；驳回/撤回清空方案生效行（防被否决方案进 M3 快照）； keyword 改 contains(autoescape=True) 对齐全库转义口径；撤单抽 withdraw_pending_orders 供编辑清空方案时显式调用 - 业务：删业务遇在途审批单禁删 400、终态审批单随 _hard_delete 清理；编辑清空方案同步撤回在途单；历史离职参与人编辑放行（冗余姓名固化语义，仅新增参与人做在职校验） - 迁移：business_secondary_allocations 补 uk(business_id, personnel_id) （模型/迁移 py/导出 SQL/init-dev 四方同步，开发库往返重放验证） - 设置：upload_logo 改同步 def（阻塞操作不卡事件循环）+ file.size 先拦； company_name schema 剥空白防全空白入库；logo 旧文件清理移到 commit 成功后（防库指旧路径而文件已删断链）；uploadLogo 走 request() 解包（原直发 service.post 不解包信封，logoUrl 会被置 undefined） - 备份：restore_drill --drop-exec 先清全部历史 drill 库再演练并即删本轮（原语义永远删错对象，每轮净增一份整库拷贝） - 测试：conftest 清理补 system_settings 种子行与 uploads/logo 文件；新增 5 例（驳回清方案/清空撤单/在途禁删终态随删/离职放行/BOOL 边界）；全量回归 701 passed - 遗留 2 项记 AI_CONTEXT（方案版本承载、审批单快照，依赖 ④ 分摊语义） Co-Authored-By: Claude Code <noreply@anthropic.com>
2026-10-16 14:23:53 +08:00
1 parent fc8a42bcd9
commit 1c93ea0a4b
@@ -34,6 +34,7 @@ from app.core.db_errors import is_duplicate_entry
 from app.core.exceptions import BadRequestError, NotFoundError
 from app.core.response import PageQuery, PageResult
 from app.models import (
+    ApprovalOrder,
    Business,
    BusinessItem,
    BusinessStatusLog,
@@ -51,7 +52,7 @@ from app.models.business import (
    BUSINESS_STATUS_DONE,
 )
 from app.models.customer import OWNER_TYPE_BUSINESS
-from app.repositories import business_repository, customer_repository
+from app.repositories import business_repository, customer_repository, personnel_repository
 from app.schemas.business import (
    BusinessCreateIn,
    BusinessDetailOut,
@@ -284,15 +285,29 @@ def get_detail(session: Session, business_id: int) -> BusinessDetailOut:


 def _build_allocation_rows(
-    session: Session, business_id: int, items: list[SecondaryAllocationIn]
+    session: Session,
+    business_id: int,
+    items: list[SecondaryAllocationIn],
+    *,
+    old_ids: set[int],
 ) -> list[SecondaryAllocation]:
-    """构造二次分配明细行：人员在职校验 + 姓名冗余固化 + 比例转 Decimal。
+    """构造二次分配明细行：人员校验 + 姓名冗余固化 + 比例转 Decimal。

-    :raises BadRequestError: 参与人员不存在或已离职
+    :param old_ids: 编辑前已参与的人员 ID 集合（create 传空集）。这些人的
+        行是**历史事实**——personnel_name 冗余固化的设计本就允许离职后回显，
+        编辑业务（哪怕只改备注）不应被历史参与人的离职状态卡死；仅对
+        **新加入**的参与人做在职校验。
+
+    :raises BadRequestError: 新增参与人员不存在或已离职
    """
    rows: list[SecondaryAllocation] = []
    for item in items:
-        person = _ensure_personnel_active(session, item.personnel_id, "分摊参与")
+        if item.personnel_id in old_ids:
+            person = personnel_repository.get_by_id(session, item.personnel_id)
+            if person is None:
+                raise BadRequestError("分摊参与人员不存在")
+        else:
+            person = _ensure_personnel_active(session, item.personnel_id, "分摊参与")
        rows.append(
            SecondaryAllocation(
                business_id=business_id,
@@ -388,11 +403,13 @@ def create_business(
                business_repository.replace_allocations(
                    session,
                    business.id,
-                    _build_allocation_rows(session, business.id, payload.secondary_allocations),
+                    _build_allocation_rows(
+                        session, business.id, payload.secondary_allocations, old_ids=set()
+                    ),
                )
                # 方案非空才提单：开关关闭=自动通过留痕，开启=待财务复核。
-                # retry_on_conflict=True：AP 编号撞键可内部重取（外层编号
-                # 重试循环兜底整体重来）
+                # AP 编号撞键时 IntegrityError 穿透 → 外层编号重试循环把
+                # 业务/方案/审批单整体重来
                if payload.secondary_allocations:
                    approval_service.submit_order(
                        session,
@@ -400,7 +417,6 @@ def create_business(
                        ref_id=business.id,
                        refer_no=business.business_no,
                        submitter=operator,
-                        retry_on_conflict=True,
                    )
                customer = customer_repository.get_by_id(session, business.customer_id)
                out = _to_out((business, customer.company_name if customer else None, None, None))
@@ -477,13 +493,18 @@ def update_business(
        )
        # 方案全量替换（空数组=清空）；终态门槛已挡「修改影响已结算月份」的
        # 前置场景（月结在 ④，快照固化后按同一哲学隔离）
+        old_ids = {
+            a.personnel_id for a in business_repository.list_allocations(session, business_id)
+        }
        business_repository.replace_allocations(
            session,
            business_id,
-            _build_allocation_rows(session, business_id, payload.secondary_allocations),
+            _build_allocation_rows(
+                session, business_id, payload.secondary_allocations, old_ids=old_ids
+            ),
        )
-        # 方案非空提单（自动撤回旧在途单）；retry_on_conflict=False：
-        # 本路径无外层重试，内部 rollback 会回掉业务行修改造成静默丢失
+        # 提单/撤单与方案同步生命周期：非空=提单（内含撤旧建新）；空=仅撤回
+        # 在途单 —— 否则旧在途单挂着已不存在的方案继续走审批
        if payload.secondary_allocations:
            approval_service.submit_order(
                session,
@@ -491,7 +512,13 @@ def update_business(
                ref_id=business_id,
                refer_no=business.business_no,
                submitter=operator,
-                retry_on_conflict=False,
+            )
+        else:
+            approval_service.withdraw_pending_orders(
+                session,
+                order_type=APPROVAL_TYPE_SECONDARY_ALLOCATION,
+                ref_id=business_id,
+                operator=operator,
            )
        _recalc_totals(session, business)
        # 锁定行上已赋值，同一身份映射实例的 _to_out 即反映新值；名称字段
@@ -515,7 +542,7 @@ def delete_business(
    与业务维度的归属留痕（无外键固化表，须手动清）。

    :raises NotFoundError: 业务不存在
-    :raises BadRequestError: 存在发货或回款记录
+    :raises BadRequestError: 存在发货或回款记录 / 存在在途审批单
    """
    business = business_repository.get_by_id(session, business_id, for_update=True)
    with audit_service.audit(
@@ -532,6 +559,10 @@ def delete_business(
            raise NotFoundError("业务不存在")
        if business_repository.has_docs(session, business_id):
            raise BadRequestError("业务已有发货或回款记录，请改为已终止而非删除")
+        # 在途审批单（ref_id 固化无外键，业务删了单还挂着且可被继续审批）：
+        # 禁删引导先完成/撤回审批，而不是静默留下指向已删业务的活单
+        if _count_pending_approvals(session, business_id):
+            raise BadRequestError("该业务有在途审批单，请先完成或撤回审批后再删除")

        business_no = business.business_no
        _hard_delete(session, business_id)
@@ -539,11 +570,46 @@ def delete_business(
        logger.info("删除业务 | business_id=%s | no=%s", business_id, business_no)


+def _count_pending_approvals(session: Session, business_id: int) -> int:
+    """该业务的在途审批单数（status 1/2；终态单随业务删除一并清理）。"""
+    from sqlalchemy import func, select
+
+    from app.models import ApprovalOrder
+    from app.models.approval import (
+        APPROVAL_STATUS_PENDING_FINANCE,
+        APPROVAL_STATUS_PENDING_LEADER,
+    )
+
+    return int(
+        session.execute(
+            select(func.count())
+            .select_from(ApprovalOrder)
+            .where(
+                ApprovalOrder.order_type == APPROVAL_TYPE_SECONDARY_ALLOCATION,
+                ApprovalOrder.ref_id == business_id,
+                ApprovalOrder.status.in_(
+                    (APPROVAL_STATUS_PENDING_FINANCE, APPROVAL_STATUS_PENDING_LEADER)
+                ),
+            )
+        ).scalar_one()
+    )
+
+
 def _hard_delete(session: Session, business_id: int) -> None:
-    """按依赖序删除：明细 → 状态留痕 → 业务维度归属留痕 → 主表。"""
+    """按依赖序删除：明细 → 二次分配方案 → 审批单（steps 随 CASCADE）→
+    状态留痕 → 业务维度归属留痕 → 主表。"""
    from sqlalchemy import delete

    session.execute(delete(BusinessItem).where(BusinessItem.business_id == business_id))
+    session.execute(
+        delete(SecondaryAllocation).where(SecondaryAllocation.business_id == business_id)
+    )
+    session.execute(
+        delete(ApprovalOrder).where(
+            ApprovalOrder.order_type == APPROVAL_TYPE_SECONDARY_ALLOCATION,
+            ApprovalOrder.ref_id == business_id,
+        )
+    )
    session.execute(delete(BusinessStatusLog).where(BusinessStatusLog.business_id == business_id))
    session.execute(
        delete(OwnershipChangeLog).where(