diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py
index 945ab1eb..048c94d3 100644
--- a/sf_base/models/tool_base_new.py
+++ b/sf_base/models/tool_base_new.py
@@ -26,32 +26,32 @@ class FunctionalCuttingTool(models.Model):
 
     # 整体式刀具型号
     mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', 'rel_integral_model_functional_sf',
-                                                           string='整体式刀具型号', domain=
-                                                           [('mrs_cutting_tool_material_name', '=', '整体式刀具')])
+                                                            string='整体式刀具型号', domain=
+                                                            [('mrs_cutting_tool_material_name', '=', '整体式刀具')])
     # 刀片型号
     mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'rel_blade_model_functional_sf',
-                                                        string='刀片型号', domain=
-                                                        [('mrs_cutting_tool_material_name', '=', '刀片')])
+                                                         string='刀片型号', domain=
+                                                         [('mrs_cutting_tool_material_name', '=', '刀片')])
     # 刀杆型号
     mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
-                                                            'rel_cutterbar_model_functional_sf',
-                                                            string='刀杆型号', domain=
-                                                            [('mrs_cutting_tool_material_name', '=', '刀杆')])
+                                                             'rel_cutterbar_model_functional_sf',
+                                                             string='刀杆型号', domain=
+                                                             [('mrs_cutting_tool_material_name', '=', '刀杆')])
     # 刀盘型号
     mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
-                                                            'rel_cutterpad_model_functional_sf',
-                                                            string='刀盘型号', domain=
-                                                            [('mrs_cutting_tool_material_name', '=', '刀盘')])
+                                                             'rel_cutterpad_model_functional_sf',
+                                                             string='刀盘型号', domain=
+                                                             [('mrs_cutting_tool_material_name', '=', '刀盘')])
     # 刀柄型号
     mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
-                                                               'rel_cutterhandle_model_functional_sf', string='刀柄型号',
-                                                               domain=
-                                                               [('mrs_cutting_tool_material_name', '=', '刀柄')])
+                                                                'rel_cutterhandle_model_functional_sf', string='刀柄型号',
+                                                                domain=
+                                                                [('mrs_cutting_tool_material_name', '=', '刀柄')])
     # 夹头型号
     mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
-                                                             'rel_cutterhead_model_functional_sf',
-                                                             string='夹头型号', domain=
-                                                             [('mrs_cutting_tool_material_name', '=', '夹头')])
+                                                              'rel_cutterhead_model_functional_sf',
+                                                              string='夹头型号', domain=
+                                                              [('mrs_cutting_tool_material_name', '=', '夹头')])
 
     diameter = fields.Float('直径(mm)')
     tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
diff --git a/sf_base/views/fixture_view.xml b/sf_base/views/fixture_view.xml
index a21aaa8f..e0ad6aea 100644
--- a/sf_base/views/fixture_view.xml
+++ b/sf_base/views/fixture_view.xml
@@ -21,7 +21,7 @@
         <field name="name">夹具物料</field>
         <field name="model">sf.fixture.material</field>
         <field name="arch" type="xml">
-            <tree string="夹具物料">
+            <tree string="夹具物料" create="false">
                 <field name="code"/>
                 <field name="name"/>
                 <field name="remark"/>
@@ -85,7 +85,7 @@
         <field name="name">联装类型</field>
         <field name="model">sf.multi_mounting.type</field>
         <field name="arch" type="xml">
-            <tree string="联装类型">
+            <tree string="联装类型" create="false">
                 <field name="code"/>
                 <field name="name"/>
                 <field name="remark"/>
@@ -159,7 +159,7 @@
         <field name="name">夹具型号</field>
         <field name="model">sf.fixture.model</field>
         <field name="arch" type="xml">
-            <tree string="夹具型号">
+            <tree string="夹具型号" create="false">
                 <field name="code"/>
                 <field name="name"/>
                 <field name="brand_id"/>
diff --git a/sf_base/views/functional_fixture_view.xml b/sf_base/views/functional_fixture_view.xml
index 6b49bb87..8a2b45c7 100644
--- a/sf_base/views/functional_fixture_view.xml
+++ b/sf_base/views/functional_fixture_view.xml
@@ -22,7 +22,7 @@
         <field name="name">功能夹具类型</field>
         <field name="model">sf.functional.fixture.type</field>
         <field name="arch" type="xml">
-            <tree string="功能夹具类型">
+            <tree string="功能夹具类型" create="false">
                 <field name="code"/>
                 <field name="name"/>
                 <field name="remark"/>
@@ -81,7 +81,7 @@
         <field name="name">功能夹具</field>
         <field name="model">sf.functional.fixture</field>
         <field name="arch" type="xml">
-            <tree string="功能夹具">
+            <tree string="功能夹具" create="false">
                 <field name="code"/>
                 <field name="name"/>
                 <field name="type_id"/>
diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py
index bc7c841b..911c043b 100644
--- a/sf_maintenance/models/sf_maintenance.py
+++ b/sf_maintenance/models/sf_maintenance.py
@@ -155,6 +155,7 @@ class SfMaintenanceEquipment(models.Model):
             result.append((parameter.id, name))
         return result
 
+
     @api.constrains('rotate_speed')
     def _check_rotate_speed(self):
         if self.rotate_speed <= 0:
diff --git a/sf_maintenance/views/equipment_maintenance_standards_views.xml b/sf_maintenance/views/equipment_maintenance_standards_views.xml
index 7263a135..9681efac 100644
--- a/sf_maintenance/views/equipment_maintenance_standards_views.xml
+++ b/sf_maintenance/views/equipment_maintenance_standards_views.xml
@@ -8,19 +8,26 @@
         <field name="arch" type="xml">
             <form string="设备维保标准">
                 <sheet>
+                    <group>
                     <group>
                         <field name="code" readonly="1" force_save="1"/>
-                        <field name="maintenance_type" required="1"/>
                         <field name="name" required="1"/>
+                        <field name="maintenance_equipment_category_id" required="1"/>
                         <field name="eq_maintenance_ids" invisible='1'/>
                         <field name="overhaul_ids" invisible='1'/>
 
 
                     </group>
                     <group>
+                        <field name="maintenance_type" required="1"/>
                         <field name="created_user_id"/>
-                        <field name="maintenance_equipment_category_id" required="1"/>
-                        <field name="maintenance_equipment_ids" widget="many2many_tags"/>
+
+
+                    </group>
+
+                    </group>
+                    <group>
+                         <field name="maintenance_equipment_ids" widget="many2many_tags" attrs="{'invisible': [('maintenance_equipment_category_id', '=', False)]}"/>
                     </group>
                     <notebook>
                         <page string="维保项目">
diff --git a/sf_maintenance/views/maintenance_logs_views.xml b/sf_maintenance/views/maintenance_logs_views.xml
index 3a985d3f..d5cffdae 100644
--- a/sf_maintenance/views/maintenance_logs_views.xml
+++ b/sf_maintenance/views/maintenance_logs_views.xml
@@ -88,7 +88,7 @@
         <!-- Action -->
 
     <record id="action_maintenance_logs" model="ir.actions.act_window">
-        <field name="name">设备维保标准</field>
+        <field name="name">设备故障日志</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">sf.maintenance.logs</field>
         <field name="view_mode">tree,form</field>
diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml
index ba890bd1..7f1f41ba 100644
--- a/sf_maintenance/views/maintenance_views.xml
+++ b/sf_maintenance/views/maintenance_views.xml
@@ -24,8 +24,10 @@
                 <xpath expr="//field[@name='category_id']" position="after">
                     <field name="code" readonly="1"/>
                     <field name="equipment_type"/>
-                    <field name="brand_id"/>
-                    <field name="type_id" attrs="{'invisible': [('equipment_type', '!=', '机床')]}"/>
+
+                    <field name="type_id" attrs="{'invisible': [('equipment_type', '!=', '机床')]}" required="1"/>
+                        <field name="brand_id" attrs="{'invisible': [('type_id', '=', False)]}"
+                           force_save="1"/>
                     <field name="machine_tool_category" readonly="1" attrs="{'invisible': [('type_id', '=', False)]}"
                            force_save="1"/>
                 </xpath>
@@ -33,64 +35,64 @@
                     <page string="设备参数" name="sf_equipment" attrs="{'invisible': [('type_id', '=', False)]}">
                         <group string="参数">
                             <group>
-                                <field name="control_system_id" required="1" options="{'no_create': True}"/>
-                                <field name="workbench_L" required="1"/>
-                                <field name="workbench_W" required="1"/>
-                                <field name="machine_tool_L" required="1"/>
-                                <field name="machine_tool_W" required="1"/>
-                                <field name="machine_tool_H" required="1"/>
-                                <field name="knife_type" required="1"/>
-                                <field name="workpiece_load" required="1"/>
-                                <field name="lead_screw" required="1"/>
-                                <field name="taper" required="1"/>
-                                <field name="torque" required="1"/>
-                                <field name="motor_power" required="1"/>
+                                <field name="control_system_id" options="{'no_create': True}"/>
+                                <field name="workbench_L"/>
+                                <field name="workbench_W"/>
+                                <field name="machine_tool_L"/>
+                                <field name="machine_tool_W"/>
+                                <field name="machine_tool_H"/>
+                                <field name="knife_type"/>
+                                <field name="workpiece_load"/>
+                                <field name="lead_screw"/>
+                                <field name="taper"/>
+                                <field name="torque"/>
+                                <field name="motor_power"/>
 
-                                <field name="number_of_knife_library" required="1" options="{'format': false}"/>
-                                <field name="number_of_axles" required="1" widget="radio"
+                                <field name="number_of_knife_library" options="{'format': false}"/>
+                                <field name="number_of_axles" widget="radio"
                                        options="{'horizontal': true}"/>
                                 <label for="x_axis" string="加工行程(mm)"
                                        attrs="{'invisible': [('number_of_axles', '=', False)]}"/>
                                 <div class="test_model"
                                      attrs="{'invisible': [('number_of_axles', '=', False)]}">
                                     <label for="x_axis" string="x"/>
-                                    <field name="x_axis" class="o_address_zip" required="1"
+                                    <field name="x_axis" class="o_address_zip"
                                            options="{'format': false}"/>
                                     <span>&amp;nbsp;</span>
                                     <label for="y_axis" string="y"/>
-                                    <field name="y_axis" class="o_address_zip" required="1"
+                                    <field name="y_axis" class="o_address_zip"
                                            options="{'format': false}"/>
                                     <span>&amp;nbsp;</span>
                                     <label for="z_axis" string="z"/>
-                                    <field name="z_axis" class="o_address_zip" required="1"
+                                    <field name="z_axis" class="o_address_zip"
                                            options="{'format': false}"/>
                                     <br></br>
                                     <label for="b_axis" string="b"
                                            attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"/>
-                                    <field name="b_axis" class="o_address_zip" required="1"
+                                    <field name="b_axis" class="o_address_zip"
                                            attrs="{'invisible': [('number_of_axles', '=', '三轴')]}"
                                            options="{'format': false}"/>
                                     <span>&amp;nbsp;</span>
                                     <label for="c_axis" string="c"
                                            attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"/>
-                                    <field name="c_axis" class="o_address_zip" required="1"
+                                    <field name="c_axis" class="o_address_zip"
                                            attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"
                                            options="{'format': false}"/>
                                 </div>
                             </group>
                             <group>
-                                <field name="heightened_way" required="1"/>
-                                <field name="tool_quality_max" required="1"/>
-                                <field name="tool_long_max" required="1"/>
-                                <field name="tool_diameter_max" required="1"/>
-                                <field name="guide_rail" required="1"/>
+                                <field name="heightened_way"/>
+                                <field name="tool_quality_max"/>
+                                <field name="tool_long_max"/>
+                                <field name="tool_diameter_max"/>
+                                <field name="guide_rail"/>
 
-                                <field name="feed_speed" required="1"/>
-                                <field name="tool_speed" required="1"/>
-                                <field name="distance" required="1"/>
-                                <field name="rotate_speed" string="主轴转速(min)" required="1"
+                                <field name="feed_speed"/>
+                                <field name="tool_speed"/>
+                                <field name="distance"/>
+                                <field name="rotate_speed" string="主轴转速(min)"
                                        options="{'format': false}"/>
-                                <field name="precision" required="1" string="X轴定位精度(mm)(mm)"/>
+                                <field name="precision" string="X轴定位精度(mm)(mm)"/>
 
                             </group>
                         </group>
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index db0c13fb..da76de13 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -2,11 +2,17 @@
 from odoo import fields, models, api
 
 
+# class FunctionalCuttingToolEntity(models.Model):
+#     _name = 'sf.functional.cutting.tool.entity'
+#     _inherit = 'sf.functional.cutting.tool'
+#     _description = '功能刀具管理'
 class FunctionalCuttingToolEntity(models.Model):
     _name = 'sf.functional.cutting.tool.entity'
-    _inherit = 'sf.functional.cutting.tool'
     _description = '功能刀具管理'
+    _inherits = {'sf.functional.cutting.tool': 'sf_functional_cutting_tool_entity_id'}
 
+    # 新添加的关联到原模型的字段
+    sf_functional_cutting_tool_entity_id = fields.Many2one('sf.functional.cutting.tool', ondelete='cascade')
     order = fields.Char(string='序')
     functional_cutting_tool_id = fields.Char(string='功能刀具', invisible=True)
     # 功能刀具预警 特有字段
diff --git a/sf_tool_management/models/tool_material_search.py b/sf_tool_management/models/tool_material_search.py
index bd53d8db..645cc0ac 100644
--- a/sf_tool_management/models/tool_material_search.py
+++ b/sf_tool_management/models/tool_material_search.py
@@ -16,7 +16,7 @@ class SfToolMaterialSearch(models.Model):
         domain="[('mrs_cutting_tool_material_id.name', '=', mrs_cutting_tool_material_name)]")
     mrs_machine_brand_id = fields.Many2one('sf.machine.brand', '品牌')
     # 关联刀具型号
-    mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', '刀具型号')
+    # mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', '刀具型号')
 
     # 关联刀具物料模型
     mrs_cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料')
diff --git a/sf_tool_management/views/tool_material_search.xml b/sf_tool_management/views/tool_material_search.xml
index 4865f553..e42cf8fe 100644
--- a/sf_tool_management/views/tool_material_search.xml
+++ b/sf_tool_management/views/tool_material_search.xml
@@ -11,7 +11,7 @@
                     <field name="name"/>
                     <field name="mrs_cutting_tool_type_id"/>
                     <field name="mrs_machine_brand_id"/>
-                    <field name="mrs_cutting_tool_model_id"/>
+<!--                     <field name="mrs_cutting_tool_model_id"/> -->
                     <field name="mrs_materials_model_id"/>
                     <field name="mrs_cutting_tool_material_id"/>