From 4138903bff29300a0ce66b5dc1c6aafa114c503c Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 14 Mar 2025 14:02:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=91=E5=AF=BC=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 quality_control/models/quality.py             |  7 ++++++-
 quality_control/views/quality_views.xml       |  3 ++-
 quality_control/wizard/quality_wizard.py      |  2 ++
 .../wizard/quality_wizard_view.xml            | 20 ++++++++++++++++++-
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/quality_control/models/quality.py b/quality_control/models/quality.py
index 329d9593..a9a845d2 100644
--- a/quality_control/models/quality.py
+++ b/quality_control/models/quality.py
@@ -177,6 +177,8 @@ class QualityCheck(models.Model):
     # 出厂检验报告编号
     report_number_id = fields.Many2one('documents.document', string='出厂检验报告编号', readonly=True)
 
+    old_report_name = fields.Char('旧出厂检验报告编号', default='')
+
     # 出厂检验报告、关联文档的数据
     report_content = fields.Binary(string='出厂检验报告', related='report_number_id.datas')
 
@@ -259,6 +261,8 @@ class QualityCheck(models.Model):
                 'default_check_qty': self.check_qty,
                 'default_measure_count': self.column_nums,
                 'default_item_count': len(self.measure_line_ids),
+                'default_old_report_name': self.old_report_name,
+                'default_publish_status': self.publish_status,
             }
         }
 
@@ -309,7 +313,8 @@ class QualityCheck(models.Model):
         # 关联到当前质检记录
         self.write({
             'report_number_id': doc.id,
-            'publish_status': 'published'
+            'publish_status': 'published',
+            'old_report_name': self.report_number_id.name
         })
 
         # 记录发布历史
diff --git a/quality_control/views/quality_views.xml b/quality_control/views/quality_views.xml
index ae0e5452..6872952f 100644
--- a/quality_control/views/quality_views.xml
+++ b/quality_control/views/quality_views.xml
@@ -274,7 +274,8 @@
                             <field name="check_qty" attrs="{'invisible': [('measure_on', '!=', 'product')]}"/>
 <!--                             <field name="categ_type"/> -->
                             <field name="report_number_id"/>
-                            <field name="column_nums"/>
+                            <field name="column_nums" invisible="1"/>
+                            <field name="publish_status"/>
                             <field name="show_lot_text" invisible="1"/>
                             <field name="move_line_id" invisible="1"/>
                             <field name="product_tracking" invisible="1"/>
diff --git a/quality_control/wizard/quality_wizard.py b/quality_control/wizard/quality_wizard.py
index 3768792a..dc5a33f4 100644
--- a/quality_control/wizard/quality_wizard.py
+++ b/quality_control/wizard/quality_wizard.py
@@ -11,6 +11,8 @@ class QualityCheckPublishWizard(models.TransientModel):
     check_qty = fields.Char('检验数', readonly=True)
     measure_count = fields.Integer('测量件数', readonly=True)
     item_count = fields.Integer('检验项目数', readonly=True)
+    old_report_name = fields.Char('旧出厂检验报告编号', readonly=True)
+    publish_status = fields.Selection([('draft', '草稿'), ('published', '已发布'), ('canceled', '已撤销')], string='发布状态', readonly=True)
     
     def action_confirm_publish(self):
         """确认发布"""
diff --git a/quality_control/wizard/quality_wizard_view.xml b/quality_control/wizard/quality_wizard_view.xml
index 90bc3c05..4099c1dc 100644
--- a/quality_control/wizard/quality_wizard_view.xml
+++ b/quality_control/wizard/quality_wizard_view.xml
@@ -7,7 +7,25 @@
             <form string="发布确认">
                 <div class="alert alert-info" role="alert" style="margin-bottom:0px;">
                     <p>您即将发布出厂检验报告：产品<strong><field name="product_name" class="oe_inline"/></strong>，总数量<strong><field name="total_qty" class="oe_inline"/></strong>，检验数<strong><field name="check_qty" class="oe_inline"/></strong>，测量<strong><field name="measure_count" class="oe_inline"/></strong>件，检验项目<strong><field name="item_count" class="oe_inline"/></strong>项。</p>
-                    <p>注意：发布后所有用户可扫描下载本报告</p>
+                    <field name="publish_status" invisible="1"/>
+                    <!-- 状态为draft时显示 -->
+                    <div attrs="{'invisible': [('publish_status', '!=', 'draft')]}">
+                        <span style="font-weight:bold;">
+                            注意：发布后所有用户可扫描下载本报告
+                        </span>
+                    </div>
+                    <!-- 状态不为draft时显示 -->
+                    <div attrs="{'invisible': [('publish_status', '=', 'draft')]}">
+                        <span style="font-weight:bold;">
+                            注意：已发布的报告
+                            <field name="old_report_name" readonly="1" 
+                                  style="color:red;" 
+                                  attrs="{'invisible': [('old_report_name', '=', False)]}"/>
+                            <span style="color:red;" 
+                                 attrs="{'invisible': [('old_report_name', '!=', False)]}">(未知报告编号)</span>
+                            可能已被客户下载
+                        </span>
+                    </div>
                 </div>
                 <footer>
                     <button name="action_confirm_publish" string="发布" type="object" class="btn-primary"/>