From 665ebaab9ea4c0620dcc1df1a21bf45a0480a383 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 24 Jun 2024 17:28:06 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=87=8D=E6=96=B0=E4=B8=8B=E5=8F=91N?=
 =?UTF-8?q?C=E7=A8=8B=E5=BA=8F=E6=8C=89=E9=94=AE=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/views/compensation.xml     |  1 +
 sf_manufacturing/views/mrp_workorder_view.xml | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sf_machine_connect/views/compensation.xml b/sf_machine_connect/views/compensation.xml
index d3b14535..07173c17 100644
--- a/sf_machine_connect/views/compensation.xml
+++ b/sf_machine_connect/views/compensation.xml
@@ -23,6 +23,7 @@
                             <button name="button_send_program_again" type="object" string="重新下发NC程序"
                                     class="btn-primary"
                                     confirm="是否确认重新下发NC程序？"
+                                    groups="sf_base.group_sf_order_user,sf_base.group_sf_equipment_user"
                                     attrs="{'invisible': ['|', '|', '|',('routing_type','!=','装夹预调'),('state','in',['done', 'cancel',
                                                                                                    'progress']),('processing_drawing','=',False),('is_send_program_again','=',True)]}"/>
                             <!--                                <button string="一键补偿" name="compensation" type="object" confirm="是否确认下发补偿"-->
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index e782e449..a2736834 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -162,6 +162,7 @@
                         attrs="{'invisible': ['|','|',('routing_type','!=','装夹预调'),('is_delivery','=',True),('state','!=','done')]}"/>
                 <button name="button_send_program_again" type="object" string="重新下发NC程序" class="btn-primary"
                         confirm="是否确认重新下发NC程序？"
+                        groups="sf_base.group_sf_order_user,sf_base.group_sf_equipment_user"
                         attrs="{'invisible': ['|', '|', '|',('routing_type','!=','装夹预调'),('state','in',['done', 'cancel',
                                                                                                    'progress']),('cnc_worksheet','=',False),('is_send_program_again','=',True)]}"/>
             </xpath>
@@ -220,12 +221,12 @@
                            attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割"))]}'/>
                     <field name="production_line_state"
                            attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割","装夹预调"))]}'/>
-<!--                     <field name="functional_fixture_id" -->
-<!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
-<!--                     <field name="functional_fixture_code" force_save="1" -->
-<!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
-<!--                     <field name="functional_fixture_type_id" -->
-<!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
+                    <!--                     <field name="functional_fixture_id" -->
+                    <!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
+                    <!--                     <field name="functional_fixture_code" force_save="1" -->
+                    <!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
+                    <!--                     <field name="functional_fixture_type_id" -->
+                    <!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
                     <field name="rfid_code" force_save="1" readonly="1" cache="True"
                            attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
                     <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>