From 2ddff54311ca5270f19c8eead7088d4db9446f27 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 27 Feb 2024 11:21:05 +0800
Subject: [PATCH] Merge branch 'develop' of
 https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

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

diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 4830b2fc..ee1eb751 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -143,7 +143,12 @@
                     </group>
                 </page>
             </xpath>
-
+           <xpath expr="//label[1]" position="before">
+                <field name='routing_type'/>
+            </xpath>
+             <xpath expr="//label[1]" position="attributes">
+                <attribute name="string">计划加工时间</attribute>
+            </xpath>
             <!--            隐藏物料清单-->
             <!--            <xpath expr="//page[@name='components']" position="attributes">-->
             <!--                <attribute name="invisible">1</attribute>-->
@@ -159,7 +164,6 @@
             </xpath>
             <field name="production_id" position="after" invisible="0">
                 <group>
-                    <field name='routing_type'/>
                     <field name="date_planned_start" invisible="1"/>
                     <field name="date_planned_finished" invisible="1"/>
                     <!--                    <field name="production_id" readonly="1"/>-->
@@ -491,7 +495,7 @@
                 </page>
             </xpath>
             <xpath expr="//form//sheet//group//group//div[1]" position="after">
-                <label for="date_start" string="实际开始时间"/>
+                <label for="date_start" string="实际加工时间"/>
                 <div class="oe_inline">
                     <field name="date_start" class="mr8 oe_inline"/>
                     <strong class="mr8 oe_inline">到</strong>