From cfde3898261970ee6a103ed8a931008b8b939003 Mon Sep 17 00:00:00 2001
From: gqh <email@example.com472285236@qq.co>
Date: Sun, 29 Jan 2023 09:43:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=93=8D=E4=BD=9Cpage?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=9C=A8=E5=89=8D=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/views/mrp_workorder_view.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 39859ee0..e5b01c16 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -108,7 +108,7 @@
             </sheet>
 
 
-            <xpath expr="//page[last()]" position="after">
+            <xpath expr="//page[1]" position="before">
                 <page string="获取CNC加工程序" attrs='{"invisible": [("routing_type","!=","获取CNC加工程序")]}'>
                      <group>
                         <field name="programming_no" readonly="1"
@@ -127,7 +127,8 @@
                 </page>
 
             </xpath>
-            <xpath expr="//page[last()]" position="after">
+<!--            <page string="Components" name="components">-->
+            <xpath expr="//page[1]" position="before">
                 <page string="装夹托盘" attrs='{"invisible": [("routing_type","!=","装夹")]}'>
                     <group>
                         <field name="routing_type" invisible="1"/>
@@ -144,7 +145,7 @@
                 </page>
 
             </xpath>
-            <xpath expr="//page[last()]" position="after">
+            <xpath expr="//page[1]" position="before">
                 <page string="三元前置检测定位参数" attrs='{"invisible": [("routing_type","!=","前置三元定位检测")]}'>
                     <group>
                         <group>
@@ -260,7 +261,7 @@
                 </page>
             </xpath>
 
-            <xpath expr="//page[last()]" position="after">
+            <xpath expr="//page[1]" position="before">
                 <page string="CNC程序" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
                     <group>
                         <field name="cnc_ids" widget="one2many" string="工作程序">
@@ -284,7 +285,7 @@
                     </group>
                 </page>
             </xpath>
-            <xpath expr="//page[last()]" position="after">
+            <xpath expr="//page[1]" position="before">
                 <page string="后置三元检测" attrs='{"invisible": [("routing_type","!=","后置三元质量检测")]}'>
                     <group>
                         <field name="test_results" widget="selection"/>
@@ -296,7 +297,7 @@
                     </div>
                 </page>
             </xpath>
-            <xpath expr="//page[last()]" position="after">
+            <xpath expr="//page[1]" position="before">
                 <page string="解除装夹" attrs='{"invisible": [("routing_type","!=","解除装夹")]}'>
 
                     <div class="col-12 col-lg-6 o_setting_box">