From 5d4bfa583d8850ed34b92aa3b96c6bac38146e75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 15 Jan 2026 20:18:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 soong_workflow/models/soong_workflow_mixin.py         | 9 ++++++---
 soong_workflow/templates/soong_workflow_templates.xml | 7 +++++--
 yuthon_official/models/yuthon_official.py             | 8 +++++++-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py
index ca016b0a3..a526a0c93 100644
--- a/soong_workflow/models/soong_workflow_mixin.py
+++ b/soong_workflow/models/soong_workflow_mixin.py
@@ -127,7 +127,7 @@ class SoongWorkflowMixin(models.AbstractModel):
     def _compute_is_confirm(self):
         for record in self:
             record.is_confirm = True
-            record.is_end = False
+            record.is_end = True
             domain = [('done_by', '=', self.env.user.id), ('workflow_id', '=', record.workflow_id.id),
                       ('res_id', '=', record.id), ('approval_state', 'in', ['0', '1']), ('name', '!=', '归档')]
             lg2 = record.log_ids2.search(domain)
@@ -135,7 +135,7 @@ class SoongWorkflowMixin(models.AbstractModel):
             if lg2 or lg1:
                 record.is_confirm = False
             if not lg1 and not lg2 and record.is_active == True:
-                record.is_end = True
+                record.is_end = False
 
             if record.log_ids:
                 if record.log_ids[-1].name == '归档' and record.log_ids[-1].approval_state == '2':
@@ -1279,8 +1279,11 @@ class SoongWorkflowLine(models.Model):
 
     model = fields.Char(string="Related Document Model", index=True)
     res_id = fields.Integer(string="Related Document ID", index=True)
-    workflow_record_id = fields.Many2one("soong.workflow.record", string="名称")
+    workflow_record_id = fields.Many2one("soong.workflow.record", string="标题")
     code = fields.Char(related="workflow_record_id.code", string="流水号")
+    workflow_id = fields.Many2one(related="workflow_record_id.workflow_id", string="审批类型")
+    company_id = fields.Many2one(related="workflow_record_id.company_id", string="公司")
+    department_id = fields.Many2one(related="workflow_record_id.department_id", string="部门")
     approvals_group_id = fields.Many2one(related="workflow_record_id.approvals_group_id", string="审批组")
     create_uid = fields.Many2one(related="workflow_record_id.create_uid", string="创建人")
     write_date2 = fields.Datetime(related="workflow_record_id.write_date2", string="最后更新日期")
diff --git a/soong_workflow/templates/soong_workflow_templates.xml b/soong_workflow/templates/soong_workflow_templates.xml
index 55062784f..497cf24c1 100644
--- a/soong_workflow/templates/soong_workflow_templates.xml
+++ b/soong_workflow/templates/soong_workflow_templates.xml
@@ -34,9 +34,12 @@
                     <tree edit="true" delete="False" editable="bottom" type="object">
                         <field name="workflow_record_id" domain="[('users_ids', 'in', uid)]"
                                options="{'no_open': True}"/>
-                        <field name="code"/>
-                        <field name="approvals_group_id" column_invisible="1"/>
+                        <field name="code" column_invisible="1"/>
+                        <field name="workflow_id"/>
                         <field name="create_uid"/>
+                        <field name="company_id"/>
+                        <field name="department_id"/>
+                        <field name="approvals_group_id" column_invisible="1"/>
                         <field name="write_date2"/>
                         <button name="open_record" type="object" string="详情" class="btn-primary"/>
                         <button name="unlink" type="object" string="删除" class="btn-primary"/>
diff --git a/yuthon_official/models/yuthon_official.py b/yuthon_official/models/yuthon_official.py
index 52411e7f1..eb66c6e9e 100644
--- a/yuthon_official/models/yuthon_official.py
+++ b/yuthon_official/models/yuthon_official.py
@@ -84,9 +84,15 @@ class YuthonOfficial(models.Model):
                     'state': '申请人',
                     'code': self.env['ir.sequence'].next_by_code('sub_enterprises_code'),
                     'official_partner_id': official_partner_id.id,
-                    'issuance_process_id': self.id,
                     'document_ids': [(6, 0, all_document_ids)] if all_document_ids else False
                 })
+                workflow_id = self.env['soong.workflow.record'].search([('code', '=', self.code)], limit=1).id
+                if workflow_id:
+                    self.env['soong.workflow.line'].create({
+                        'model': 'yuthon.sub.enterprises',
+                        'res_id': sub_id.id,
+                        'workflow_record_id': workflow_id
+                    })
                 self.write({'sub_id': sub_id.id})
 
     @api.onchange('is_cold')