From f557cb8d1013f15a2428e813c1915c6a8e068043 Mon Sep 17 00:00:00 2001
From: guanhuan <guanhuan@jikimo.com>
Date: Thu, 24 Oct 2024 14:55:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=9B=BE=E7=BA=B8,=E8=B4=A8?=
 =?UTF-8?q?=E6=A3=80=E6=A0=87=E5=87=86=E6=98=BE=E7=A4=BA=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/product_template_management_view.xml    | 15 +++++++++++++--
 sf_manufacturing/views/mrp_workorder_view.xml     | 15 ++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/sf_dlm_management/views/product_template_management_view.xml b/sf_dlm_management/views/product_template_management_view.xml
index b1083332..1862e33c 100644
--- a/sf_dlm_management/views/product_template_management_view.xml
+++ b/sf_dlm_management/views/product_template_management_view.xml
@@ -16,8 +16,6 @@
                     <field name='is_bfm' invisible="1"/>
                     <field name='categ_type' invisible="1"/>
                     <field name='part_number' attrs="{'invisible': [('categ_type', '!=', '成品')]}"/>
-                    <field name='machining_drawings' attrs="{'invisible': [('categ_type', '!=', '成品')]}" widget="adaptive_viewer"/>
-                    <field name='quality_standard' attrs="{'invisible': [('categ_type', '!=', '成品')]}" widget="adaptive_viewer"/>
                     <field name='manual_quotation' attrs="{'invisible':[('upload_model_file', '=', [])]}"/>
                     <field name="upload_model_file"
                            widget="many2many_binary"
@@ -111,6 +109,19 @@
                         '刀具')], 'required': True}
                     </attribute>
                 </xpath>
+                <xpath expr="//sheet//notebook" position="inside">
+                    <page string="2D加工图纸">
+                        <field name='machining_drawings' attrs="{'invisible': [('categ_type', '!=', '成品')]}"
+                               widget="adaptive_viewer"/>
+                    </page>
+                </xpath>
+                <xpath expr="//sheet//notebook" position="inside">
+                    <page string="质检标准">
+                        <field name='quality_standard' attrs="{'invisible': [('categ_type', '!=', '成品')]}"
+                               widget="adaptive_viewer"/>
+
+                    </page>
+                </xpath>
                 <!--                <xpath expr="//field[@name='default_code']" position="attributes">-->
                 <!--                    <attribute name="attrs">{'readonly': [('categ_type', '=', '刀具')], 'invisible':-->
                 <!--                        [('product_variant_count', '>' , 1)]}-->
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 8efd76db..f3aa70cc 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -268,8 +268,6 @@
                     <field name="material_height" class="o_address_zip"/>
                 </div>
                 <field name="part_number" string="成品的零件图号"/>
-                <field name="machining_drawings" widget="adaptive_viewer"  attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}"/>
-                <field name="quality_standard" widget="adaptive_viewer" attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}"/>
             </xpath>
             <xpath expr="//label[1]" position="attributes">
                 <attribute name="string">计划加工时间</attribute>
@@ -591,7 +589,18 @@
                     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>