From 7b78e2451a632603a4fca88f57f1c81b4727bfaf Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 31 Jan 2023 12:02:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=9A=84cnc=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E5=8A=A0=E5=B7=A5=E9=9D=A2=E6=98=BE=E7=A4=BAbug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/views/mrp_workorder_view.xml | 46 +++++++++----------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index bdc9d0a3..94f90dbf 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -56,7 +56,7 @@
         <field name="view_ids" eval="[(5, 0, 0),
             (0, 0, {'view_mode': 'tree', 'view_id': ref('mrp.mrp_production_workorder_tree_editable_view')}),
             (0, 0, {'view_mode': 'kanban', 'view_id': ref('mrp.workcenter_line_kanban')}) ]"/>
-<!--        <field name="target">fullscreen</field>-->
+        <!--        <field name="target">fullscreen</field>-->
         <field name="target">current</field>
         <field name="domain">[('state', 'not in', ['done', 'cancel'])]</field>
         <field name="context">{'search_default_workcenter_id': active_id}</field>
@@ -110,7 +110,10 @@
                         attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked')]}"/>
             </sheet>
 
-
+            <field name="production_id" position="after">
+                <field name="processing_panel" readonly="1" attrs="{'invisible': [('routing_type', 'in', ('获取CNC加工程序','装夹','解除装夹',
+                '前置三元定位检测','后置三元质量检测','解除装夹'))]}"/>
+            </field>
             <xpath expr="//page[1]" position="before">
                 <page string="获取CNC加工程序" attrs='{"invisible": [("routing_type","!=","获取CNC加工程序")]}'>
                     <group>
@@ -309,29 +312,24 @@
             </xpath>
 
             <xpath expr="//page[1]" position="before">
-                <field name="production_id" position="after">
-                    <field name="processing_panel" readonly="1"/>
-                </field>
                 <page string="CNC程序" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
-                    <group>
-                        <field name="cnc_ids" widget="one2many" string="工作程序">
-                            <tree>
-                                <field name="sequence_number"/>
-                                <field name="program_name"/>
-                                <field name="cnc_id" string="文件"/>
-                                <field name="cutting_tool_name"/>
-                                <field name="cutting_tool_no"/>
-                                <field name="processing_type"/>
-                                <field name="margin_x_y"/>
-                                <field name="margin_z"/>
-                                <field name="depth_of_processing_z"/>
-                                <field name="cutting_tool_extension_length"/>
-                                <field name="cutting_tool_handle_type"/>
-                                <field name="estimated_processing_time"/>
-                                <field name="remark"/>
-                            </tree>
-                        </field>
-                    </group>
+                    <field name="cnc_ids" widget="one2many" string="工作程序">
+                        <tree>
+                            <field name="sequence_number"/>
+                            <field name="program_name"/>
+                            <field name="cnc_id" string="文件"/>
+                            <field name="cutting_tool_name"/>
+                            <field name="cutting_tool_no"/>
+                            <field name="processing_type"/>
+                            <field name="margin_x_y"/>
+                            <field name="margin_z"/>
+                            <field name="depth_of_processing_z"/>
+                            <field name="cutting_tool_extension_length"/>
+                            <field name="cutting_tool_handle_type"/>
+                            <field name="estimated_processing_time"/>
+                            <field name="remark"/>
+                        </tree>
+                    </field>
                     <group>
                         <field name="cnc_worksheet" string="工作指令" widget="pdf_viewer"/>
                     </group>