From eed89836e102ceb784f780940fd72a76825c89ac Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 17 Jan 2025 09:36:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mrp_workorder_views.xml             |  1 +
 sf_manufacturing/views/mrp_workorder_view.xml | 46 ++++++++++---------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/jikimo_workorder_exception/views/mrp_workorder_views.xml b/jikimo_workorder_exception/views/mrp_workorder_views.xml
index e589adb4..55ee0aa7 100644
--- a/jikimo_workorder_exception/views/mrp_workorder_views.xml
+++ b/jikimo_workorder_exception/views/mrp_workorder_views.xml
@@ -7,6 +7,7 @@
             <field name="inherit_id" ref="mrp.mrp_production_workorder_form_view_inherit"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook/page[last()]" position="after">
+                    <field name="routing_type" invisible="1"/>
                     <page string="异常记录" name="workorder_exception" attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}">
                         <field name="exception_ids" nolabel="1" readonly="1">
                             <tree create="false" delete="false" edit="false">
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index d10b37ba..9e847741 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -310,28 +310,6 @@
 
 
             <xpath expr="//page[1]" position="before">
-                <page string="工件装夹" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
-                    <group>
-                        <field name="_barcode_scanned" widget="barcode_handler"/>
-                        <group string="托盘">
-                            <field name="tray_serial_number" readonly="1" string="序列号"/>
-                        </group>
-                    </group>
-                    <group>
-                        <group>
-                            <field name="tray_product_id" readonly="1" string="名称"/>
-                            <field name="tray_brand_id" readonly="1" string="品牌"/>
-                        </group>
-                        <group>
-                            <field name="tray_type_id" readonly="1" string="类型"/>
-                            <field name="tray_model_id" readonly="1" string="型号"/>
-                        </group>
-                    </group>
-                    <group string="预调程序信息">
-                        <field name="preset_program_information" colspan="2" nolabel="1"
-                               placeholder="如有预调程序信息请在此处输入....."/>
-                    </group>
-                </page>
                 <page string="前置三元检测定位参数" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
 
                     <div>左面:</div>
@@ -629,6 +607,30 @@
                     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="//page[1]" position="before">
+                <page string="工件装夹" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
+                    <group>
+                        <field name="_barcode_scanned" widget="barcode_handler"/>
+                        <group string="托盘">
+                            <field name="tray_serial_number" readonly="1" string="序列号"/>
+                        </group>
+                    </group>
+                    <group>
+                        <group>
+                            <field name="tray_product_id" readonly="1" string="名称"/>
+                            <field name="tray_brand_id" readonly="1" string="品牌"/>
+                        </group>
+                        <group>
+                            <field name="tray_type_id" readonly="1" string="类型"/>
+                            <field name="tray_model_id" readonly="1" string="型号"/>
+                        </group>
+                    </group>
+                    <group string="预调程序信息">
+                        <field name="preset_program_information" colspan="2" nolabel="1"
+                               placeholder="如有预调程序信息请在此处输入....."/>
+                    </group>
+                </page>
+            </xpath>
         </field>
     </record>
 

From f3e64b007e95a343b90ce23dc61803b03047100b Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 17 Jan 2025 09:59:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 9e847741..505d0c41 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -126,9 +126,9 @@
         <field name="model">mrp.workorder</field>
         <field name="inherit_id" ref="mrp.mrp_production_workorder_form_view_inherit"/>
         <field name="arch" type="xml">
-            <xpath expr="//sheet" position="inside">
+            <xpath expr="//form" position="inside">
                 <!-- 其他可见字段 -->
-                <field name="_barcode_scanned" widget="barcode_handler" invisible="1"/>
+                <field name="_barcode_scanned" widget="barcode_handler"/>
             </xpath>
             <!--             <xpath expr="//form" position="inside"> -->
             <!--                 <script src="sf_manufacturing/static/src/js/customRFID.js"/> -->
@@ -310,6 +310,28 @@
 
 
             <xpath expr="//page[1]" position="before">
+                <page string="工件装夹" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
+                    <group>
+<!--                         <field name="_barcode_scanned" widget="barcode_handler"/> -->
+                        <group string="托盘">
+                            <field name="tray_serial_number" readonly="1" string="序列号"/>
+                        </group>
+                    </group>
+                    <group>
+                        <group>
+                            <field name="tray_product_id" readonly="1" string="名称"/>
+                            <field name="tray_brand_id" readonly="1" string="品牌"/>
+                        </group>
+                        <group>
+                            <field name="tray_type_id" readonly="1" string="类型"/>
+                            <field name="tray_model_id" readonly="1" string="型号"/>
+                        </group>
+                    </group>
+                    <group string="预调程序信息">
+                        <field name="preset_program_information" colspan="2" nolabel="1"
+                               placeholder="如有预调程序信息请在此处输入....."/>
+                    </group>
+                </page>
                 <page string="前置三元检测定位参数" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
 
                     <div>左面:</div>
@@ -607,30 +629,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="//page[1]" position="before">
-                <page string="工件装夹" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
-                    <group>
-                        <field name="_barcode_scanned" widget="barcode_handler"/>
-                        <group string="托盘">
-                            <field name="tray_serial_number" readonly="1" string="序列号"/>
-                        </group>
-                    </group>
-                    <group>
-                        <group>
-                            <field name="tray_product_id" readonly="1" string="名称"/>
-                            <field name="tray_brand_id" readonly="1" string="品牌"/>
-                        </group>
-                        <group>
-                            <field name="tray_type_id" readonly="1" string="类型"/>
-                            <field name="tray_model_id" readonly="1" string="型号"/>
-                        </group>
-                    </group>
-                    <group string="预调程序信息">
-                        <field name="preset_program_information" colspan="2" nolabel="1"
-                               placeholder="如有预调程序信息请在此处输入....."/>
-                    </group>
-                </page>
-            </xpath>
         </field>
     </record>