From 86d97ef331efcbbba29f37494ea91ac4b857e80a Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Fri, 25 Oct 2024 11:55:43 +0800
Subject: [PATCH] =?UTF-8?q?2D=E5=8A=A0=E5=B7=A5=E5=9B=BE=E7=BA=B8=E5=92=8C?=
 =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=A0=87=E5=87=86=E4=BD=8D=E7=BD=AE=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/views/mrp_workorder_view.xml | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 708a9779..69dcac7a 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -467,6 +467,15 @@
                         <field name='X_deviation_angle' readonly="1"/>
                     </group>
                 </page>
+
+                 <page string="2D加工图纸"  attrs="{'invisible': [('routing_type','!=','装夹预调')]}">
+                    <field name="machining_drawings" widget="adaptive_viewer"/>
+                </page>
+
+				 <page string="质检标准"  attrs="{'invisible': [('routing_type','!=','装夹预调')]}">
+                    <field name="quality_standard" widget="adaptive_viewer"/>
+                </page>
+
                 <page string="工件配送"
                       attrs="{'invisible': [('routing_type','!=','装夹预调')]}">
                     <field name="workpiece_delivery_ids">
@@ -520,6 +529,13 @@
                     <!--                                attrs='{"invisible": ["|","|",("state","!=","progress"),("user_permissions","=",False),("results","=","合格")]}'/>-->
                     <!--                    </div>-->
                 </page>
+                 <page string="2D加工图纸"  attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
+                    <field name="machining_drawings" widget="adaptive_viewer"/>
+                </page>
+
+				 <page string="质检标准"  attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
+                    <field name="quality_standard" widget="adaptive_viewer"/>
+                </page>
             </xpath>
             <xpath expr="//page[1]" position="before">
                 <page string="CNC程序" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
@@ -590,18 +606,6 @@
                     mrp.group_mrp_manager,sf_base.group_sf_mrp_manager,sf_base.group_sf_equipment_user,sf_base.group_sf_order_user
                 </attribute>
             </xpath>
-            <xpath expr="//sheet//notebook" position="inside">
-                <page string="2D加工图纸">
-                    <field name="machining_drawings" widget="adaptive_viewer"
-                           attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}"/>
-                </page>
-            </xpath>
-            <xpath expr="//sheet//notebook" position="inside">
-                <page string="质检标准">
-                    <field name="quality_standard" widget="adaptive_viewer"
-                           attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}"/>
-                </page>
-            </xpath>
         </field>
     </record>