From 11a06df0a46783a4c5c3c3099727aea732432495 Mon Sep 17 00:00:00 2001
From: yuxianghui <1608204036@qq.com>
Date: Wed, 23 Aug 2023 17:32:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=80=E5=85=B7=E7=AE=A1=E7=90=86=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E4=B8=AD=E7=9A=84=E6=89=80=E6=9C=89=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E5=8A=A0=E7=B2=97=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E9=83=BD=E6=94=B9=E4=B8=BAname=E5=AD=97=E6=AE=B5=EF=BC=9B?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2=E5=B8=83=E5=B1=80=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/views/tool_base_views.xml  |  26 +-
 .../views/tool_material_search.xml            | 293 +++++++++---------
 2 files changed, 167 insertions(+), 152 deletions(-)

diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 361ea14a..d7254f4a 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -29,12 +29,12 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="code" readonly="1"/>
+                                <field name="name" invisible="False"/>
                             </h1>
                         </div>
                         <group>
                             <group>
-                                <field name="name" invisible="True"/>
+                                <field name="code" readonly="1"/>
                                 <field name="mrs_cutting_tool_type_id"/>
 
                                 <field name="mrs_cutting_tool_integral_model_ids"
@@ -188,12 +188,12 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="code" readonly="1"/>
+                                <field name="name" invisible="False"/>
                             </h1>
                         </div>
                         <group>
                             <group>
-                                <field name="name" invisible="True"/>
+                                <field name="code" readonly="1"/>
                                 <field name="mrs_cutting_tool_type_id"/>
 
                                 <field name="mrs_cutting_tool_integral_model_ids"
@@ -385,12 +385,12 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="code" readonly="1"/>
+                                <field name="name" invisible="False"/>
                             </h1>
                         </div>
                         <group>
                             <group>
-                                <field name="name" invisible="True"/>
+                                <field name="code" readonly="1"/>
                                 <field name="mrs_cutting_tool_type_id"/>
 
                                 <field name="mrs_cutting_tool_integral_model_ids"
@@ -570,12 +570,12 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="code" readonly="1"/>
+                                <field name="name" invisible="False"/>
                             </h1>
                         </div>
                         <group>
                             <group>
-                                <field name="name" invisible="True"/>
+                                <field name="code" readonly="1"/>
                                 <field name="mrs_cutting_tool_type_id"/>
 
                                 <field name="mrs_cutting_tool_integral_model_ids"
@@ -1170,14 +1170,14 @@
                     </header>
                     <div class="oe_title">
                         <h1>
-                            <field name="functional_tool_code" readonly="1"/>
+                            <field name="name"/>
                         </h1>
                     </div>
                     <sheet>
-                       <group>
-                           <group>
-                               <field name="name"/>
-                               <field name="functional_tool_type_id"/>
+                        <group>
+                            <group>
+                                <field name="functional_tool_code" readonly="1"/>
+                                <field name="functional_tool_type_id"/>
                                <field name="functional_tool_diameter"/>
                                <field name="functional_tool_length"/>
                                <field name="functional_tool_cutting_type"/>
diff --git a/sf_tool_management/views/tool_material_search.xml b/sf_tool_management/views/tool_material_search.xml
index e75344dd..9e844bfd 100644
--- a/sf_tool_management/views/tool_material_search.xml
+++ b/sf_tool_management/views/tool_material_search.xml
@@ -126,12 +126,16 @@
             <field name="arch" type="xml">
                 <form string="刀具物料查询">
                     <sheet>
-                        <group string='基本信息'>
+                        <div class="oe_title">
+                            <h1>
+                                <field name="name"/>
+                            </h1>
+                        </div>
+                        <group>
                             <group>
                                 <field name="mrs_cutting_tool_material_name" invisible="1"/>
                                 <field name="sequence"/>
                                 <field name="code"/>
-                                <field name="name"/>
                                 <field name="mrs_cutting_tool_type_id"/>
                                 <field name="mrs_machine_brand_id"/>
                                 <!--                                 <field name="mrs_cutting_tool_model_id"/> -->
@@ -143,147 +147,158 @@
                                 <field name="three_d_model" widget="many2one"/>
                             </group>
                         </group>
-                        <group string='刀具库存信息'>
-                            <group>
-                                <field name="number"/>
-                                <field name="mrs_materials_model_id"/>
-                                <field name="purchase_date"/>
-                                <field name="purchase_batch"/>
-                            </group>
-                            <group>
-                                <field name="supplier"/>
-                                <field name="warehouse_name"/>
-                                <field name="warehouse_area"/>
-                                <field name="warehouse_location"/>
-                            </group>
-                        </group>
+                        <notebook>
+                            <page string='刀具库存信息'>
+                                <group >
+                                    <group>
+                                        <field name="number"/>
+                                        <field name="mrs_materials_model_id"/>
+                                        <field name="purchase_date"/>
+                                        <field name="purchase_batch"/>
+                                    </group>
+                                    <group>
+                                        <field name="supplier"/>
+                                        <field name="warehouse_name"/>
+                                        <field name="warehouse_area"/>
+                                        <field name="warehouse_location"/>
+                                    </group>
+                                </group>
+                            </page>
+                            <page string="刀片信息" attrs="{'invisible': [('cutting_tool_type','!=','刀片')]}">
+                                <group>
+                                    <group>
+                                        <field name="blade_code" invisible="True"/>
+                                        <field name="blade_length"/>
+                                        <field name="blade_width"/>
+                                        <field name="blade_height"/>
+                                        <field name="blade_radius"/>
+                                        <field name="blade_hardness"/>
+                                        <field name="blade_accuracy"/>
+                                        <field name="blade_coating_material_id"/>
+                                        <field name="mrs_cutting_tool_model_blade_cutter_bar_ids" widget="many2many_tags"/>
+                                    </group>
+                                    <group>
+                                        <field name="blade_top_angle"/>
+                                        <field name="blade_front_angle"/>
+                                        <field name="blade_rear_angle"/>
+                                        <field name="blade_main_included_angle"/>
+                                        <field name="blade_r_angle"/>
+                                        <field name="blade_nut"/>
+                                        <field name="mrs_cutting_tool_model_blade_cutter_pad_ids" widget="many2many_tags"/>
+                                    </group>
+                                </group>
+                            </page>
+                            <page string="整体式刀具信息" attrs="{'invisible': [('cutting_tool_type','!=','整体式刀具')]}">
+                                <group>
+                                    <group>
+                                        <field name="integral_code" invisible="True"/>
+                                        <field name="integral_total_length"/>
+                                        <field name="integral_shank_length"/>
+                                        <field name="integral_blade_length"/>
+                                        <field name="integral_diameter"/>
+                                        <field name="integral_blade_number"/>
+                                        <field name="integral_accuracy"/>
+                                    </group>
+                                    <group>
+                                        <field name="integral_front_angle"/>
+                                        <field name="integral_rear_angle"/>
+                                        <field name="integral_main_included_angle"/>
+                                        <field name="integral_nut"/>
+                                        <field name="integral_hardness"/>
+                                        <field name="integral_coating_material"/>
+                                        <field name="integral_scope"/>
+                                    </group>
+                                </group>
+                            </page>
+                            <page string="刀杆信息" attrs="{'invisible': [('cutting_tool_type','!=','刀杆')]}">
+                                <group>
+                                    <group>
+                                        <field name="bar_code" invisible="True"/>
+                                        <field name="bar_c_diameter"/>
+                                        <field name="bar_total_length"/>
+                                        <field name="bar_blade_number"/>
+                                        <field name="bar_d_diameter"/>
+                                        <field name="bar_scope"/>
+                                        <field name="mrs_cutting_tool_model_bar_blade_ids" widget="many2many_tags"/>
+                                    </group>
+                                    <group>
+                                        <field name="bar_wrench"/>
+                                        <field name="bar_screw"/>
+                                        <field name="bar_radius"/>
+                                        <field name="bar_accuracy"/>
+                                        <field name="bar_hardness"/>
+                                    </group>
+                                </group>
+                            </page>
+                            <page string="刀盘信息" attrs="{'invisible': [('cutting_tool_type','!=','刀盘')]}">
+                                <group>
+                                    <group>
+                                        <field name="pad_code" invisible="True"/>
+                                        <field name="pad_c_diameter"/>
+                                        <field name="pad_total_length"/>
+                                        <field name="pad_blade_number"/>
+                                        <field name="pad_d_diameter"/>
+                                        <field name="pad_scope"/>
+                                        <field name="mrs_cutting_tool_model_pad_blade_ids" widget="many2many_tags"/>
+                                    </group>
+                                    <group>
+                                        <field name="pad_wrench"/>
+                                        <field name="pad_screw"/>
+                                        <field name="pad_radius"/>
+                                        <field name="pad_accuracy"/>
+                                        <field name="pad_hardness"/>
+                                    </group>
+                                </group>
+                            </page>
+                            <page string="刀柄信息" attrs="{'invisible': [('cutting_tool_type','!=','刀柄')]}">
+                                <group>
+                                    <group>
+                                        <field name="handle_code" invisible="True"/>
+                                        <field name="handle_diameter"/>
+                                        <field name="handle_flange_length"/>
+                                        <field name="handle_flange_diameter"/>
+                                        <field name="handle_clamping_diameter_min"/>
+                                        <field name="handle_clamping_diameter_max"/>
+                                        <field name="handle_clamping_range"/>
+                                        <field name="handle_detection_accuracy"/>
+                                        <field name="mrs_cutting_tool_model_handle_chuck_model_ids" widget="many2many_tags"/>
+                                    </group>
+                                    <group>
+                                        <field name="handle_jump_accuracy"/>
+                                        <field name="handle_max_speed"/>
+                                        <field name="handle_standard_speed"/>
+                                        <field name="handle_weight"/>
+                                        <field name="handle_body_accuracy"/>
+                                        <field name="handle_nut"/>
+                                        <field name="handle_detection_hardness"/>
+                                    </group>
+                                </group>
+                            </page>
+                            <page string="夹头信息" attrs="{'invisible': [('cutting_tool_type','!=','夹头')]}">
+                                <group>
+                                    <group>
+                                        <field name="chuck_code" invisible="True"/>
+                                        <field name="chuck_clamping_diameter_min"/>
+                                        <field name="chuck_clamping_diameter_max"/>
+                                        <field name="chuck_diameter"/>
+                                        <field name="chuck_inner_diameter"/>
+                                        <field name="chuck_feature"/>
+                                        <field name="mrs_cutting_tool_model_chuck_handle_model_ids" widget="many2many_tags"/>
+                                    </group>
+                                    <group>
+                                        <field name="chuck_accuracy"/>
+                                        <field name="chuck_height"/>
+                                        <field name="chuck_nut"/>
+                                        <field name="chuck_clamping_range"/>
+                                        <field name="image"/>
+                                    </group>
+                                </group>
+                            </page>
+                        </notebook>
                         <group>
                             <field name="cutting_tool_material_name" invisible="True"/>
                             <field name="cutting_tool_type" invisible="True"/>
                         </group>
-                        <group string="刀片信息" attrs="{'invisible': [('cutting_tool_type','!=','刀片')]}">
-                            <group>
-                                <field name="blade_code" invisible="True"/>
-                                <field name="blade_length"/>
-                                <field name="blade_width"/>
-                                <field name="blade_height"/>
-                                <field name="blade_radius"/>
-                                <field name="blade_hardness"/>
-                                <field name="blade_accuracy"/>
-                                <field name="blade_coating_material_id"/>
-                                <field name="mrs_cutting_tool_model_blade_cutter_bar_ids" widget="many2many_tags"/>
-                            </group>
-                            <group>
-                                <field name="blade_top_angle"/>
-                                <field name="blade_front_angle"/>
-                                <field name="blade_rear_angle"/>
-                                <field name="blade_main_included_angle"/>
-                                <field name="blade_r_angle"/>
-                                <field name="blade_nut"/>
-                                <field name="mrs_cutting_tool_model_blade_cutter_pad_ids" widget="many2many_tags"/>
-                            </group>
-                        </group>
-
-                        <group string="整体式刀具信息" attrs="{'invisible': [('cutting_tool_type','!=','整体式刀具')]}">
-                            <group>
-                                <field name="integral_code" invisible="True"/>
-                                <field name="integral_total_length"/>
-                                <field name="integral_shank_length"/>
-                                <field name="integral_blade_length"/>
-                                <field name="integral_diameter"/>
-                                <field name="integral_blade_number"/>
-                                <field name="integral_accuracy"/>
-                            </group>
-                            <group>
-                                <field name="integral_front_angle"/>
-                                <field name="integral_rear_angle"/>
-                                <field name="integral_main_included_angle"/>
-                                <field name="integral_nut"/>
-                                <field name="integral_hardness"/>
-                                <field name="integral_coating_material"/>
-                                <field name="integral_scope"/>
-                            </group>
-                        </group>
-
-                        <group string="刀杆信息" attrs="{'invisible': [('cutting_tool_type','!=','刀杆')]}">
-                            <group>
-                                <field name="bar_code" invisible="True"/>
-                                <field name="bar_c_diameter"/>
-                                <field name="bar_total_length"/>
-                                <field name="bar_blade_number"/>
-                                <field name="bar_d_diameter"/>
-                                <field name="bar_scope"/>
-                                <field name="mrs_cutting_tool_model_bar_blade_ids" widget="many2many_tags"/>
-                            </group>
-                            <group>
-                                <field name="bar_wrench"/>
-                                <field name="bar_screw"/>
-                                <field name="bar_radius"/>
-                                <field name="bar_accuracy"/>
-                                <field name="bar_hardness"/>
-                            </group>
-                        </group>
-
-                        <group string="刀盘信息" attrs="{'invisible': [('cutting_tool_type','!=','刀盘')]}">
-                            <group>
-                                <field name="pad_code" invisible="True"/>
-                                <field name="pad_c_diameter"/>
-                                <field name="pad_total_length"/>
-                                <field name="pad_blade_number"/>
-                                <field name="pad_d_diameter"/>
-                                <field name="pad_scope"/>
-                                <field name="mrs_cutting_tool_model_pad_blade_ids" widget="many2many_tags"/>
-                            </group>
-                            <group>
-                                <field name="pad_wrench"/>
-                                <field name="pad_screw"/>
-                                <field name="pad_radius"/>
-                                <field name="pad_accuracy"/>
-                                <field name="pad_hardness"/>
-                            </group>
-                        </group>
-
-                        <group string="刀柄信息" attrs="{'invisible': [('cutting_tool_type','!=','刀柄')]}">
-                            <group>
-                                <field name="handle_code" invisible="True"/>
-                                <field name="handle_diameter"/>
-                                <field name="handle_flange_length"/>
-                                <field name="handle_flange_diameter"/>
-                                <field name="handle_clamping_diameter_min"/>
-                                <field name="handle_clamping_diameter_max"/>
-                                <field name="handle_clamping_range"/>
-                                <field name="handle_detection_accuracy"/>
-                                <field name="mrs_cutting_tool_model_handle_chuck_model_ids" widget="many2many_tags"/>
-                            </group>
-                            <group>
-                                <field name="handle_jump_accuracy"/>
-                                <field name="handle_max_speed"/>
-                                <field name="handle_standard_speed"/>
-                                <field name="handle_weight"/>
-                                <field name="handle_body_accuracy"/>
-                                <field name="handle_nut"/>
-                                <field name="handle_detection_hardness"/>
-                            </group>
-                        </group>
-
-                        <group string="夹头信息" attrs="{'invisible': [('cutting_tool_type','!=','夹头')]}">
-                            <group>
-                                <field name="chuck_code" invisible="True"/>
-                                <field name="chuck_clamping_diameter_min"/>
-                                <field name="chuck_clamping_diameter_max"/>
-                                <field name="chuck_diameter"/>
-                                <field name="chuck_inner_diameter"/>
-                                <field name="chuck_feature"/>
-                                <field name="mrs_cutting_tool_model_chuck_handle_model_ids" widget="many2many_tags"/>
-                            </group>
-                            <group>
-                                <field name="chuck_accuracy"/>
-                                <field name="chuck_height"/>
-                                <field name="chuck_nut"/>
-                                <field name="chuck_clamping_range"/>
-                                <field name="image"/>
-                            </group>
-                        </group>
                     </sheet>
                 </form>
             </field>