From e1af6ba2f574707cb2025ebdb011f42b6c65fc62 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Mon, 14 Oct 2024 13:41:52 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=AE=8C=E6=88=90=20=20=20=E5=B7=A5?=
 =?UTF-8?q?=E4=BB=B6=E8=A3=85=E5=A4=B9=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E7=89=88=E9=9D=A2=E4=BC=98=E5=8C=96=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/views/mrp_workorder_view.xml | 174 ++++++++----------
 1 file changed, 75 insertions(+), 99 deletions(-)

diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index d0577fbc..871f4e12 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -221,8 +221,27 @@
                 </page>
             </xpath>
             <xpath expr="//label[1]" position="before">
-                <field name='routing_type' readonly="1"/>
-                <field name='process_state' attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
+                <!--                -->
+                <field name="production_id" invisible="0"/>
+                <field name="duration_expected" invisible="1"/>
+                <field name="date_planned_start" invisible="1"/>
+                <field name="date_planned_finished" invisible="1"/>
+                <field name="duration" widget="mrp_timer"
+                       invisible="1" sum="real duration"/>
+                <field name="glb_file" readonly="1" widget="Viewer3D" string="加工模型"/>
+                <field name="manual_quotation" readonly="1"
+                       attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}"/>
+                <field name="processing_panel" readonly="1"
+                       attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割"))]}'/>
+                <field name="equipment_id" readonly="1"
+                       attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割","装夹预调"))]}'/>
+                <field name="production_line_id"
+                       attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割","装夹预调"))]}'/>
+                <field name="production_line_state" readonly="1"
+                       attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割","装夹预调"))]}'/>
+
+                <field name='routing_type' invisible="1"/>
+                <field name='process_state' invisible="1"/>
                 <field name='tag_type' readonly="1" attrs='{"invisible": [("tag_type","=",False)]}'
                        decoration-danger="tag_type == '重新加工'"/>
                 <field name="rfid_code" force_save="1" readonly="1" cache="True"
@@ -230,6 +249,24 @@
                 <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
 
             </xpath>
+            <xpath expr="//form//sheet//group//group//div[2]" position="replace">
+            </xpath>
+            <xpath expr="//form//sheet//group//group//div[1]" position="after">
+                <field name="save_name" widget="CopyClipboardChar"
+                       attrs="{'invisible':[('routing_type','!=','装夹预调')]}"/>
+                <label for="material_length" string="物料尺寸"/>
+                <div class="o_address_format">
+                    <label for="material_length" string="长"/>
+                    <field name="material_length" class="o_address_zip"/>
+                    <span>&amp;nbsp;</span>
+                    <label for="material_width" string="宽"/>
+                    <field name="material_width" class="o_address_zip"/>
+                    <span>&amp;nbsp;</span>
+                    <label for="material_height" string="高"/>
+                    <field name="material_height" class="o_address_zip"/>
+                </div>
+                <field name="part_number" string="成品的零件图号"/>
+            </xpath>
             <xpath expr="//label[1]" position="attributes">
                 <attribute name="string">计划加工时间</attribute>
             </xpath>
@@ -246,76 +283,10 @@
                 <field name='materiel_width' string="宽"/>
                 <field name='materiel_height' string="高"/>
             </xpath>
-            <field name="production_id" position="after" invisible="0">
-                <group>
-                    <field name="date_planned_start" invisible="1"/>
-                    <field name="date_planned_finished" invisible="1"/>
-                    <!--                    <field name="production_id" readonly="1"/>-->
-                    <field name="duration" widget="mrp_timer"
-                           attrs="{'invisible': [('production_state','=', 'draft')], 'readonly': [('is_user_working', '=', True)]}"
-                           sum="real duration"/>
-                    <field name="glb_file" readonly="1" widget="Viewer3D" string="加工模型"/>
-                    <field name="manual_quotation" readonly="1"
-                           attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}"/>
-                    <field name="processing_panel" readonly="1"
-                           attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割"))]}'/>
-                    <field name="equipment_id" readonly="1"
-                           attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割","装夹预调"))]}'/>
-                    <field name="production_line_id"
-                           attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割"))]}'/>
-                    <field name="production_line_state" readonly="1"
-                           attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割","装夹预调"))]}'/>
-                    <!--                     <field name="functional_fixture_id" -->
-                    <!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
-                    <!--                     <field name="functional_fixture_code" force_save="1" -->
-                    <!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
-                    <!--                     <field name="functional_fixture_type_id" -->
-                    <!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
-                </group>
-                <!--                <group>-->
-                <!--                    <div>-->
-                <!--                        <label for="glb_file" string="加工模型"/>-->
-                <!--                        <field name="glb_file" readonly="1" widget="Viewer3D"/>-->
-                <!--                    </div>-->
-                <!--                    &lt;!&ndash;                    <field name="glb_file" string="模型" readonly="1" widget="Viewer3D"/>&ndash;&gt;-->
-                <!--                </group>-->
-
-                <!--                <field name="processing_panel" readonly="1" attrs="{'invisible': [('routing_type', 'in', ('获取CNC加工程序','装夹','解除装夹',-->
-                <!--                '前置三元定位检测','后置三元质量检测','解除装夹'))]}"/>-->
-            </field>
-            <!--            <page string="Components" name="components">-->
             <xpath expr="//page[1]" position="before">
-                <!--                <page string="装夹托盘" attrs='{"invisible": [("routing_type","!=","装夹")]}'>-->
-                <!--                    <group>-->
-                <!--                        <field name="routing_type" invisible="1"/>-->
-                <!--                        <field name="tray_code"/>-->
-                <!--                        <field name="tray_id" readonly="1"/>-->
-                <!--                    </group>-->
-                <!--                    <group>-->
-                <!--                        <field name="pro_code" readonly="1" attrs='{"invisible": [("pro_code_ok","=",False)]}'-->
-                <!--                               style="color:green"/>-->
-                <!--                        <field name="pro_code" readonly="1" attrs='{"invisible": [("pro_code_ok","!=",False)]}'/>-->
-                <!--                        <div>-->
-                <!--                            <field name="pro_code_ok" invisible="1"/>-->
-                <!--                        </div>-->
-
-                <!--                    </group>-->
-                <!--                    <div class="col-12 col-lg-6 o_setting_box">-->
-                <!--                        <button type="object" class="oe_highlight" name="gettray" string="绑定托盘"-->
-                <!--                                attrs='{"invisible": ["|","|",("tray_id","!=",False),("state","!=","progress"),("production_id","=",False)]}'/>-->
-
-                <!--                    </div>-->
-                <!--                </page>-->
                 <page string="工件装夹" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
                     <group>
                         <field name="_barcode_scanned" widget="barcode_handler"/>
-                        <!--                        <group string="卡盘">-->
-                        <!--                            <field name="chuck_serial_number"/>-->
-                        <!--                            <field name="chuck_name"/>-->
-                        <!--                            <field name="chuck_brand_id"/>-->
-                        <!--                            <field name="chuck_type_id"/>-->
-                        <!--                            <field name="chuck_model_id"/>-->
-                        <!--                        </group>-->
                         <group string="托盘">
                             <field name="tray_serial_number" readonly="1" string="序列号"/>
                         </group>
@@ -330,10 +301,6 @@
                             <field name="tray_model_id" readonly="1" string="型号"/>
                         </group>
                     </group>
-                    <group string="加工图纸">
-                        <!--                         隐藏加工图纸字段名 -->
-                        <field name="processing_drawing" widget="pdf_viewer" string="" readonly="1"/>
-                    </group>
                     <group string="预调程序信息">
                         <field name="preset_program_information" colspan="2" nolabel="1"
                                placeholder="如有预调程序信息请在此处输入....."/>
@@ -520,7 +487,8 @@
 
             <xpath expr="//form//header" position="inside">
                 <button type="object" class="oe_highlight jikimo_button_confirm" name="get_three_check_datas"
-                        string="获取数据" attrs='{"invisible": ["|", ("state","!=","progress"), ("routing_type","!=","装夹预调")]}'/>
+                        string="获取数据"
+                        attrs='{"invisible": ["|", ("state","!=","progress"), ("routing_type","!=","装夹预调")]}'/>
             </xpath>
 
 
@@ -571,9 +539,7 @@
                             <!--                            <field name="button_state" invisible="1"/>-->
                         </tree>
                     </field>
-                    <group>
-                        <field name="cnc_worksheet" string="工作指令" widget="pdf_viewer"/>
-                    </group>
+
                 </page>
                 <page string="CMM程序" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
                     <field name="cmm_ids" widget="one2many" string="CMM程序" readonly="1">
@@ -602,33 +568,43 @@
 
                 </page>
             </xpath>
-            <xpath expr="//form//sheet//group//group//div[1]" position="after">
-                <label for="date_start" string="实际加工时间"/>
-                <div class="oe_inline">
-                    <field name="date_start" class="mr8 oe_inline"/>
-                    <strong class="mr8 oe_inline">到</strong>
-                    <field name="date_finished" class="oe_inline"/>
-                </div>
-            </xpath>
-            <xpath expr="//form//sheet//group//group//div[3]" position="after">
-                <field name="save_name" widget="CopyClipboardChar"
-                       attrs="{'invisible':[('routing_type','!=','装夹预调')]}"/>
-                <label for="material_length" string="物料尺寸"/>
-                <div class="o_address_format">
-                    <label for="material_length" string="长"/>
-                    <field name="material_length" class="o_address_zip"/>
-                    <span>&amp;nbsp;</span>
-                    <label for="material_width" string="宽"/>
-                    <field name="material_width" class="o_address_zip"/>
-                    <span>&amp;nbsp;</span>
-                    <label for="material_height" string="高"/>
-                    <field name="material_height" class="o_address_zip"/>
-                </div>
-                <field name="part_number" string="成品的零件图号"/>
+            <!--            <xpath expr="//form//sheet//group//group//div[1]" position="after">-->
+            <!--                <label for="date_start" string="实际加工时间"/>-->
+            <!--                <div class="oe_inline">-->
+            <!--                    <field name="date_start" class="mr8 oe_inline"/>-->
+            <!--                    <strong class="mr8 oe_inline">到</strong>-->
+            <!--                    <field name="date_finished" class="oe_inline"/>-->
+            <!--                </div>-->
+            <!--            </xpath>-->
+            <xpath expr="//page[@name='time_tracking']//field[@name='time_ids']//tree//field[@name='date_end']"
+                   position="after">
+                <field name="duration" string="实际时长"/>
             </xpath>
         </field>
     </record>
 
+    <record id="view_mrp_production_workorder_tray_form_inherit_sf_1" model="ir.ui.view">
+        <field name="name">mrp.production.workorder.tray.form.inherit.sf.1</field>
+        <field name="model">mrp.workorder</field>
+        <field name="inherit_id" ref="sf_manufacturing.view_mrp_production_workorder_tray_form_inherit_sf"/>
+        <field name="arch" type="xml">
+            <xpath expr="//form//sheet//group//group[2]" position="replace">
+                <group string="装夹图纸" attrs="{'invisible': [('routing_type', '!=', '装夹预调')]}">
+                    <!--                         隐藏加工图纸字段名 -->
+                    <field name="processing_drawing" widget="pdf_viewer" string="" readonly="1"/>
+                    <!--                    <field name="production_id" invisible="0"/>-->
+                </group>
+                <group string="工作指令" attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}">
+                    <field name="cnc_worksheet" string="" widget="pdf_viewer"/>
+                </group>
+            </xpath>
+            <!--            <xpath expr="//form//sheet//group//group[1]" position="before">-->
+            <!--                <field name="production_id"/>-->
+            <!--            </xpath>-->
+        </field>
+    </record>
+
+
     <record id="workcenter_form_workorder_search" model="ir.ui.view">
         <field name="name">custom.workorder.search</field>
         <field name="model">mrp.workorder</field>