From a96a9f5b75b02f087c3a94c8681ab68475e2b6e6 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 20 Jan 2025 12:47:11 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=E7=BB=93=E6=9E=9C=E5=8F=AA=E8=AF=BB=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=9B2=E3=80=81=E4=BF=AE=E6=94=B9=E8=B4=A8?=
 =?UTF-8?q?=E6=A3=80=E5=8D=95=E5=AE=8C=E6=88=90=E6=97=B6=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=B7=A5=E5=8D=95=E5=88=A4=E6=96=AD=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=9B3=E3=80=81=E5=8E=BB=E9=99=A4=E5=8F=AA?=
 =?UTF-8?q?=E6=9C=89=E9=85=8D=E7=BD=AE=E5=90=8E=E7=BD=AE=E4=B8=89=E5=85=83?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=E7=9A=84=E5=B7=A5=E5=8D=95=E6=89=8D=E8=83=BD?=
 =?UTF-8?q?=E7=9C=8B=E5=88=B0=E8=B4=A8=E6=A3=80=E5=8D=95=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E3=80=81=E9=A1=B5=E7=AD=BE=E7=9A=84=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/views/mrp_workorder_view.xml |  2 +-
 sf_quality/models/quality.py                  |  8 +++--
 sf_quality/views/quality_check_view.xml       | 32 ++++++++++++-------
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 5b409e38..971a39ad 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -533,7 +533,7 @@
                 <page string="后置三元检测" attrs='{"invisible": [("individuation_page_PTD", "=", False)]}'>
                     <group>
                         <field name="test_results"
-                               attrs='{"readonly":[("state","!=","to be detected"), "|",("routing_type","=","CNC加工"),("is_inspect", "=", True)],
+                               attrs='{"readonly":["&amp;","|",("state","!=","to be detected"), "|",("routing_type","=","CNC加工"),("is_inspect", "=", True),("state","in",["done","rework"])],
                                "invisible":[("results","!=",False)]}'/>
                         <!--                        <field name="is_remanufacture" attrs='{"invisible":[("test_results","!=","报废")]}'/>-->
                         <!--                        <field name="is_fetchcnc"-->
diff --git a/sf_quality/models/quality.py b/sf_quality/models/quality.py
index 55b831cc..f3163896 100644
--- a/sf_quality/models/quality.py
+++ b/sf_quality/models/quality.py
@@ -62,7 +62,9 @@ class QualityCheck(models.Model):
     def do_pass(self):
         self.ensure_one()
         super().do_pass()
-        if self.workorder_id and self.individuation_page_PTD is True:
+        if self.workorder_id:
+            if self.workorder_id.state in ('pending', 'waiting'):
+                raise ValidationError('工单未就绪!')
             # 1）将页签“判定结果”的检测结果值同步到【工单_后置三元检测_检测结果】
             if self.test_results in ['返工', '报废']:
                 raise ValidationError('请重新选择【判定结果】-【检测结果】')
@@ -74,7 +76,9 @@ class QualityCheck(models.Model):
     def do_fail(self):
         self.ensure_one()
         super().do_fail()
-        if self.workorder_id and self.individuation_page_PTD is True:
+        if self.workorder_id:
+            if self.workorder_id.state in ('pending', 'waiting'):
+                raise ValidationError('工单未就绪!')
             # 1）将页签“判定结果”的检测结果值同步到【工单_后置三元检测_检测结果】
             if not self.test_results:
                 raise ValidationError('请填写【判定结果】里的信息')
diff --git a/sf_quality/views/quality_check_view.xml b/sf_quality/views/quality_check_view.xml
index 19f272f4..61309737 100644
--- a/sf_quality/views/quality_check_view.xml
+++ b/sf_quality/views/quality_check_view.xml
@@ -9,22 +9,24 @@
                 <field name="production_id" invisible="1"/>
                 <field name="work_state" invisible="1"/>
                 <field name="individuation_page_PTD" invisible="1"/>
-                <field name="production_line_id" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}"/>
-                <field name="equipment_id" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}"/>
+                <field name="production_line_id" attrs="{'invisible': [('production_id', '=', False)]}"/>
+                <field name="equipment_id" attrs="{'invisible': [('production_id', '=', False)]}"/>
                 <field name="model_file" widget="Viewer3D" string="模型" readonly="1" force_save="1"
-                       attrs="{'invisible': ['|', '|',('model_file', '=', False), ('production_id', '=', False), ('individuation_page_PTD', '=', False)]}"/>
+                       attrs="{'invisible': ['|',('model_file', '=', False), ('production_id', '=', False)]}"/>
             </xpath>
             <xpath expr="//field[@name='partner_id']" position="after">
-                <field name="processing_panel" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}"/>
+                <field name="processing_panel" attrs="{'invisible': [('production_id', '=', False)]}"/>
+<!--                <field name="production_id" string="制造订单" readonly="1"-->
+<!--                       attrs="{'invisible': [('production_id', '=', False)]}"/>-->
                 <field name="workorder_id" string="工单号" readonly="1"
-                       attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}"/>
-                <field name="is_inspect" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}"/>
+                       attrs="{'invisible': [('production_id', '=', False)]}"/>
+                <field name="is_inspect" attrs="{'invisible': [('production_id', '=', False)]}"/>
             </xpath>
             <xpath expr="//page[@name='notes']" position="before">
-                <page string="检测报告" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}">
+                <page string="检测报告" attrs="{'invisible': [('production_id', '=', False)]}">
                     <field name="detection_report" string="" widget="pdf_viewer"/>
                 </page>
-                <page string="判定结果" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}">
+                <page string="判定结果" attrs="{'invisible': [('production_id', '=', False)]}">
                     <group>
                         <group>
                             <field name="test_results" attrs="{'readonly': [('quality_state','in', ['pass', 'fail'])]}"/>
@@ -35,25 +37,33 @@
                         </group>
                     </group>
                 </page>
-                <page string="2D图纸" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}">
+                <page string="2D图纸" attrs="{'invisible': [('production_id', '=', False)]}">
                     <field name="machining_drawings" string="" widget="adaptive_viewer"/>
                 </page>
-                <page string="客户质量标准" attrs="{'invisible': ['|',('production_id', '=', False), ('individuation_page_PTD', '=', False)]}">
+                <page string="客户质量标准" attrs="{'invisible': [('production_id', '=', False)]}">
                     <field name="quality_standard" string="" widget="adaptive_viewer"/>
                 </page>
                 <page string="其他"
-                      attrs="{'invisible': ['|','|', ('quality_state', 'not in', ['pass', 'fail']), ('production_id', '=', False),('individuation_page_PTD', '=', False)]}">
+                      attrs="{'invisible': ['|',('quality_state', 'not in', ['pass', 'fail']), ('production_id', '=', False)]}">
                     <group>
                         <field name="write_uid" widget='many2one_avatar_user' string="判定人" readonly="1"/>
                         <field name="write_date" string="判定时间" readonly="1"/>
                     </group>
                 </page>
             </xpath>
+            <xpath expr="//header//button[@name='do_pass'][1]" position="attributes">
+                <attribute name="string">合格</attribute>
+            </xpath>
             <xpath expr="//header//button[@name='do_pass'][2]" position="attributes">
                 <attribute name="attrs">{'invisible': ['|',('quality_state', '!=', 'fail'),('work_state','in', ('done', 'rework'))]}</attribute>
+                <attribute name="string">合格</attribute>
+            </xpath>
+            <xpath expr="//header//button[@name='do_fail'][1]" position="attributes">
+                <attribute name="string">不合格</attribute>
             </xpath>
             <xpath expr="//header//button[@name='do_fail'][2]" position="attributes">
                 <attribute name="attrs">{'invisible': ['|',('quality_state', '!=', 'pass'),('work_state','in', ('done', 'rework'))]}</attribute>
+                <attribute name="string">不合格</attribute>
             </xpath>
         </field>
     </record>