feat(borrow): 借库审批补「完结」能力(对齐出库 status=4)
- mark_completed 改为 1→4 已完结(真正扫码借出完成仍为 status=3) - 前端审批页新增「已完结」筛选项与状态映射;审批信息列对 3/4 显示审批人
This commit is contained in:
@ -464,18 +464,21 @@ class BorrowApprovalService:
|
||||
|
||||
@staticmethod
|
||||
def mark_completed(request_id):
|
||||
"""标记审批单为已完成(借库执行完成后调用)"""
|
||||
"""
|
||||
手动完结已通过的借库审批单(status 1-已通过 → 4-已完结,对齐出库审批的完结语义)。
|
||||
注意:真正“扫码借出执行完成”走 trans_service.execute_dispatch,置 status=3(已完成)。
|
||||
"""
|
||||
approval = BorrowApproval.query.get(request_id)
|
||||
if not approval:
|
||||
return False, "审批单不存在", None
|
||||
|
||||
if approval.status != 1:
|
||||
return False, f"只有已通过的审批单才能标记为完成 (当前状态: {approval.status})", None
|
||||
return False, f"只有已通过的审批单才能标记为完结 (当前状态: {approval.status})", None
|
||||
|
||||
try:
|
||||
approval.status = 3 # 已完成
|
||||
approval.status = 4 # 已完结
|
||||
db.session.commit()
|
||||
return True, "审批单已完成", approval
|
||||
return True, "审批单已完结", approval
|
||||
except Exception as e:
|
||||
db.session.rollback()
|
||||
return False, f"操作失败: {str(e)}", None
|
||||
Reference in New Issue
Block a user