From 94de0551e947673b9dce5a794d73a8e0336dbf88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Tue, 18 Mar 2025 14:41:06 +0800 Subject: [PATCH] 1 --- soong_workflow/models/soong_workflow_mixin.py | 1 + soong_workflow/models/soong_workflow_node.py | 1 + soong_workflow/wizard/soong_workflow_comment_wizard.py | 1 + 3 files changed, 3 insertions(+) diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py index 33fe55fe3..c0386ca49 100644 --- a/soong_workflow/models/soong_workflow_mixin.py +++ b/soong_workflow/models/soong_workflow_mixin.py @@ -391,6 +391,7 @@ class SoongWorkflowMixin(models.AbstractModel): log_ids = record.log_ids.sorted('sequence') if log_ids[-1].approval_state == '2': raise UserError('当前状态不可以收回') + self.env['soong.workflow.record'].search([('code', '=', self.code)]).write({"employee_ids": self.env.user.employee_id.id,}) log_ids[-1].unlink() log_ids[-2].write({'approval_state': '1'}) record.write({'state': log_ids[-2].name}) diff --git a/soong_workflow/models/soong_workflow_node.py b/soong_workflow/models/soong_workflow_node.py index 4afb67f13..fd2bab867 100644 --- a/soong_workflow/models/soong_workflow_node.py +++ b/soong_workflow/models/soong_workflow_node.py @@ -135,6 +135,7 @@ class SoongWorkflowNode(models.Model): "sequence": sequence + 1, "action_type": "end", "btn_hide": False, # 对所有人显示 + "has_comment": False, # 对所有人显示 "review_type": "end", }) ] diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index 01122c57a..d1a5a6734 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -254,6 +254,7 @@ class SoongWorkflowCommentWizard(models.TransientModel): log_ids = record_id.log_ids.sorted('sequence') if log_ids[-1].approval_state == '2': raise UserError('当前状态不可以收回') + self.env['soong.workflow.record'].search([('code', '=', record_id.code)]).write({"employee_ids": self.env.user.employee_id.id,}) log_ids[-1].unlink() log_ids[-2].write({'approval_state': '1'}) record_id.write({'state': log_ids[-2].name})