From 5f48dad86c0c3ad59a12ba72dcae1dad0d2bb318 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 19 Mar 2025 08:44:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=91=E6=96=99=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=8D=95=E8=B4=A8=E6=A3=80=E5=BC=B9=E7=AA=97=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E5=89=8D=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 quality_control/wizard/quality_check_wizard.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/quality_control/wizard/quality_check_wizard.py b/quality_control/wizard/quality_check_wizard.py
index 502bacc1..f4297f47 100644
--- a/quality_control/wizard/quality_check_wizard.py
+++ b/quality_control/wizard/quality_check_wizard.py
@@ -116,6 +116,9 @@ class QualityCheckWizard(models.TransientModel):
     
     # 对于成品出库的出厂检验报告，增加发布按钮
     def publish(self): 
+        self.current_check_id._check_part_number()
+        self.current_check_id._check_measure_line()
+        self.current_check_id._check_check_qty_and_total_qty()
         self.current_check_id._do_publish_implementation()
 
 

From 94441422cd2a65c7bab7f8fd767ac812495ab7d7 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 19 Mar 2025 09:43:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=87=BA=E5=8E=82=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=B7=B2=E7=BB=8F=E5=8F=91=E5=B8=83-?=
 =?UTF-8?q?=E8=BF=98=E5=8F=AF=E4=BB=A5=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9-=E5=8F=91=E5=B8=83=E5=90=8E=E8=A6=81?=
 =?UTF-8?q?=E7=A6=81=E6=8E=89=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/quality.check.measures.line.xml     | 24 ++++++++++++++++++-
 quality_control/views/quality_views.xml       | 10 ++++----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/quality_control/views/quality.check.measures.line.xml b/quality_control/views/quality.check.measures.line.xml
index c3cb5353..68cc4249 100644
--- a/quality_control/views/quality.check.measures.line.xml
+++ b/quality_control/views/quality.check.measures.line.xml
@@ -15,8 +15,30 @@
                 <field name="measure_value5" attrs="{ 'column_invisible': [('parent.column_nums', '&lt;', 5)] }"/>
                 <field name="measure_result"/>
                 <field name="remark"/>
-                <button name="del_measure_value" type="object" string="删除" class="btn-danger"/>
+                <button name="del_measure_value" type="object" string="删除" class="btn-danger" attrs="{'invisible': [('parent.publish_status', '=', 'published')]}"/>
             </tree>
         </field>
     </record>
+
+    <record id="quality_check_measure_line_form" model="ir.ui.view">
+        <field name="name">quality.check.measure.line.form</field>
+        <field name="model">quality.check.measure.line</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="measure_item"/>
+
+                            <field name="remark"/>
+                        </group>
+                        <group>
+                            <field name="measure_result"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
 </odoo>
\ No newline at end of file
diff --git a/quality_control/views/quality_views.xml b/quality_control/views/quality_views.xml
index 6872952f..b173f3b1 100644
--- a/quality_control/views/quality_views.xml
+++ b/quality_control/views/quality_views.xml
@@ -268,10 +268,10 @@
                             <field name="categ_type" invisible="1"/>
                             <field name="product_id" attrs="{'invisible' : [('measure_on', '=', 'operation')]}"/>
                             <field name="part_name" attrs="{'invisible': [('categ_type', '!=', '成品')]}"/>
-                            <field name="part_number" attrs="{'invisible': [('categ_type', '!=', '成品')]}"/>
+                            <field name="part_number" attrs="{'invisible': [('categ_type', '!=', '成品')], 'readonly': [('publish_status', '=', 'published')]}"/>
                             <field name="material_name" attrs="{'invisible': [('categ_type', '!=', '成品')]}"/>
                             <field name="total_qty" attrs="{'invisible': ['|', ('measure_on', '!=', 'product'), ('is_out_check', '=', False)]}"/>
-                            <field name="check_qty" attrs="{'invisible': [('measure_on', '!=', 'product')]}"/>
+                            <field name="check_qty" attrs="{'invisible': [('measure_on', '!=', 'product')], 'readonly': [('publish_status', '=', 'published')]}"/>
 <!--                             <field name="categ_type"/> -->
                             <field name="report_number_id"/>
                             <field name="column_nums" invisible="1"/>
@@ -320,7 +320,7 @@
                             <field name="team_id"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                             <field name="user_id" string="Control Person" invisible="1"/>
-                            <field name="measure_operator" string="操机员"/>
+                            <field name="measure_operator" string="操机员" attrs="{'readonly': [('publish_status', '=', 'published')]}"/>
 
                         </group>
                     </group>
@@ -338,11 +338,11 @@
                                 type="action"
                                 class="btn-primary"
                                 attrs="{'force_show':1}"
-                                context="{'default_model_name': 'quality.check.measure.line'}"/>
+                                context="{'default_model_name': 'quality.check.measure.line', 'default_check_id': id}"/>
                             </div>
                             <br/>
                             <div class="o_row">
-                            <field name="measure_line_ids" widget="tree"/>
+                            <field name="measure_line_ids" widget="tree" attrs="{'readonly': [('publish_status', '=', 'published')]}"/>
                             </div>
                         </page>
                         <page string="出厂检验报告" name="out_check" attrs="{'invisible': [('is_out_check', '=', False)]}">

From 6bdaad87186365250a63ee3779f4f7fa734d152c Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 19 Mar 2025 10:03:59 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=87=BA=E5=8E=82=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E4=B8=8A=E4=BC=A0=E6=A8=A1=E6=9D=BF=E5=90=8E?=
 =?UTF-8?q?-=E6=B2=A1=E6=9C=89=E8=87=AA=E5=8A=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=9C=89=E6=95=B0=E5=80=BC=E7=9A=84=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 quality_control/wizard/import_complex_model.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/quality_control/wizard/import_complex_model.py b/quality_control/wizard/import_complex_model.py
index c7a43f87..84674138 100644
--- a/quality_control/wizard/import_complex_model.py
+++ b/quality_control/wizard/import_complex_model.py
@@ -24,6 +24,7 @@ class ImportComplexModelWizard(models.TransientModel):
     file_data = fields.Binary("数据文件")
     model_name = fields.Char(string='Model Name')
     field_basis = fields.Char(string='Field Basis')
+    check_id = fields.Many2one(string='质检单', comodel_name='quality.check')
 
     def get_model_column_name_labels(self, model):
         fields_info = model.fields_get()
@@ -96,6 +97,9 @@ class ImportComplexModelWizard(models.TransientModel):
         """导入Excel数据"""
         if not self.file_data:
             raise UserError(_('请先上传Excel文件'))
+        
+        if self.check_id.measure_line_ids:
+            self.sudo().check_id.measure_line_ids.unlink()
 
         # 解码文件数据
         file_content = base64.b64decode(self.file_data)
@@ -156,6 +160,7 @@ class ImportComplexModelWizard(models.TransientModel):
             valid_data_imported = False
 
             # 从第二行开始读取数据（跳过表头）
+            max_columns = 1
             for row_index in range(1, sheet.nrows):
                 row = sheet.row_values(row_index)
 
@@ -182,8 +187,15 @@ class ImportComplexModelWizard(models.TransientModel):
                     'remark': row[10] if len(row) > 10 and row[10] else '',  # 备注列
                 }
 
+                for i in range(1, 6):
+                    if measure_line_vals.get(f'measure_value{i}'):
+                        if i > max_columns:
+                            max_columns = i
+
                 self.env['quality.check.measure.line'].create(measure_line_vals)
                 valid_data_imported = True
+            
+            quality_check.column_nums = max_columns
 
             # 检查是否有有效数据被导入
             if not valid_data_imported: