From 36bb77ccb024e48aaef3a638d0956e7e52ec31fa Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Thu, 13 Jul 2023 17:17:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=9A=84=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_maintenance/__manifest__.py                | 1 -
 sf_manufacturing/views/mrp_workorder_view.xml | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sf_maintenance/__manifest__.py b/sf_maintenance/__manifest__.py
index 17b1e541..529c62fc 100644
--- a/sf_maintenance/__manifest__.py
+++ b/sf_maintenance/__manifest__.py
@@ -12,7 +12,6 @@
     'data': [
         'security/group_security.xml',
         'security/ir.model.access.csv',
-        'views/production_line_view.xml',
         'views/maintenance_views.xml',
         'views/maintenance_logs_views.xml',
         'views/equipment_maintenance_standards_views.xml',
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index c4152c3c..0b980564 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -111,7 +111,8 @@
                     ('is_user_working', '!=', False),('user_permissions','=',False),('name','=','获取CNC加工程序')]}"/>
                 <button name="button_pending" type="object" string="暂停" class="btn-warning"
                         attrs="{'invisible': ['|', '|','|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False),('name','=','获取CNC加工程序')]}"/>
-                <button name="button_finish" type="object" string="完成" class="btn-success"/>
+                <button name="button_finish" type="object" string="完成" class="btn-success"
+                        attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>
                 <button name="%(mrp.act_mrp_block_workcenter_wo)d" type="action" string="停工"
                         context="{'default_workcenter_id': workcenter_id}" class="btn-danger"
                         attrs="{'invisible': ['|', '|','|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'),('user_permissions','=',False),('name','=','获取CNC加工程序')]}"/>
@@ -119,6 +120,7 @@
                         context="{'default_workcenter_id': workcenter_id}" class="btn-danger"
                         attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked'),('name','=','获取CNC加工程序')]}"/>
             </xpath>
+
             <!--            隐藏物料清单-->
             <!--            <xpath expr="//page[@name='components']" position="attributes">-->
             <!--                <attribute name="invisible">1</attribute>-->