diff --git a/inventory-backend/app/services/borrow_service.py b/inventory-backend/app/services/borrow_service.py index df81e17..3dbc33e 100644 --- a/inventory-backend/app/services/borrow_service.py +++ b/inventory-backend/app/services/borrow_service.py @@ -559,6 +559,14 @@ class BorrowApprovalService: from app.services.inventory_reservation import release_reserved restored = release_reserved(approval.get_items()) + # ★ 清理该单据的扫码草稿(含其他用户的)。 + # 撤回后单据状态变为 4,不再出现在扫码页的下拉里(那里只拉 status=1), + # 草稿从此成为永远读不到的死数据。 + from app.models.scan_draft import ScanDraft + ScanDraft.query.filter_by( + biz_type='borrow', request_id=approval.id + ).delete(synchronize_session=False) + approval.status = 4 # 已撤回/已完结 db.session.commit() return True, f"申请单已撤回,释放 {restored} 项预占库存", approval diff --git a/inventory-backend/app/services/outbound_service.py b/inventory-backend/app/services/outbound_service.py index f795b7d..0d2bbf5 100644 --- a/inventory-backend/app/services/outbound_service.py +++ b/inventory-backend/app/services/outbound_service.py @@ -1327,6 +1327,18 @@ class OutboundApprovalService: from app.services.inventory_reservation import release_reserved restored = release_reserved(approval.get_items()) + # ★ 清理该单据的扫码草稿。 + # 草稿按 (user_id, request_id) 隔离,撤回后单据状态变为 4, + # 不会再出现在扫码页的单据下拉里(那里只拉 status=1), + # 草稿从此成为永远读不到的死数据。此处一并清掉。 + # + # 注意:要清**所有用户**在这张单上的草稿,而非仅撤回者自己的 —— + # 可能有多人扫过同一张单,只清自己的会留下他人的孤儿数据。 + from app.models.scan_draft import ScanDraft + ScanDraft.query.filter_by( + biz_type='outbound', request_id=approval.id + ).delete(synchronize_session=False) + approval.status = 4 # 4-已撤回/已完结 approval.actual_approver_id = user_id approval.approved_at = None