From a2868a258116461c816b4172cad18030f6dee56a Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Tue, 18 Mar 2025 09:43:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8C=89=E9=92=AE=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=EF=BC=9B=E4=BF=AE=E5=A4=8D=E6=8E=92=E7=A8=8B=E5=8D=95?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/wizard/sale_order_cancel.py | 12 ++++++------
 sf_quality/views/quality_check_view.xml      |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sf_manufacturing/wizard/sale_order_cancel.py b/sf_manufacturing/wizard/sale_order_cancel.py
index c14f7620..08938c10 100644
--- a/sf_manufacturing/wizard/sale_order_cancel.py
+++ b/sf_manufacturing/wizard/sale_order_cancel.py
@@ -75,6 +75,12 @@ class SFSaleOrderCancelWizard(models.TransientModel):
         # 取消销售订单
         result = self.order_id.action_cancel()
 
+        # 取消制造订单的排程单
+        mo_plan_orders = self.env['sf.production.plan'].search([
+            ('origin', '=', self.order_id.name)])
+        if mo_plan_orders:
+            mo_plan_orders.write({'state': 'cancel'})
+
         # 取消关联的制造订单及其采购单
         manufacturing_orders = self.env['mrp.production'].search([
             ('origin', '=', self.order_id.name)
@@ -94,12 +100,6 @@ class SFSaleOrderCancelWizard(models.TransientModel):
             if mo_quality_checks:
                 mo_quality_checks.write({'quality_state': 'cancel'})
 
-            # 取消制造订单的排程单
-            mo_plan_orders = self.env['sf.production.plan'].search([
-                ('origin', '=', order.name)])
-            if mo_plan_orders:
-                mo_plan_orders.write({'state': 'cancel'})
-
             # 取消制造订单的子制造订单
             child_mo_ids = self.env['mrp.production'].search([
                 ('origin', '=', mo.name)
diff --git a/sf_quality/views/quality_check_view.xml b/sf_quality/views/quality_check_view.xml
index 56b67457..d5f816d4 100644
--- a/sf_quality/views/quality_check_view.xml
+++ b/sf_quality/views/quality_check_view.xml
@@ -52,7 +52,7 @@
                 </page>
             </xpath>
             <xpath expr="//header//button[@name='do_pass'][1]" position="attributes">
-                <attribute name="attrs">{'invisible': [('is_out_check', '=', True)]}</attribute>
+                <attribute name="attrs">{'invisible': ['|', ('is_out_check', '=', True), ('quality_state', '!=', 'none')]}</attribute>
                 <attribute name="string">合格</attribute>
             </xpath>
             <xpath expr="//header//button[@name='do_pass'][2]" position="attributes">
@@ -60,7 +60,7 @@
                 <attribute name="string">合格</attribute>
             </xpath>
             <xpath expr="//header//button[@name='do_fail'][1]" position="attributes">
-                <attribute name="attrs">{'invisible': [('is_out_check', '=', True)]}</attribute>
+                <attribute name="attrs">{'invisible': ['|', ('is_out_check', '=', True), ('quality_state', '!=', 'none')]}</attribute>
                 <attribute name="string">不合格</attribute>
             </xpath>
             <xpath expr="//header//button[@name='do_fail'][2]" position="attributes">