diff --git a/sf_base/models/base.py b/sf_base/models/base.py
index 0a1face8..f6a945aa 100644
--- a/sf_base/models/base.py
+++ b/sf_base/models/base.py
@@ -31,13 +31,13 @@ class MachineBrand(models.Model):
     _name = 'sf.machine.brand'
     _description = '品牌'
 
+    code = fields.Char('编码')
     name = fields.Char('名称')
     tag_ids = fields.Many2many('sf.machine.brand.tags', 'rel_machine_brand_tags', string='类别')
     image_brand = fields.Image("品牌图片")
     manufacturer_model_number = fields.Char('厂家型号', size=10)
+    remark = fields.Text('备注')
     active = fields.Boolean('有效', default=True)
-    code = fields.Char('编码')
-
 
 # 机床
 class MachineTool(models.Model):
diff --git a/sf_base/models/fixture.py b/sf_base/models/fixture.py
index d5ad7fe6..d929cad9 100644
--- a/sf_base/models/fixture.py
+++ b/sf_base/models/fixture.py
@@ -1,4 +1,8 @@
 from odoo import models, fields, api
+from odoo.addons.sf_base.commons.common import Common
+from odoo.exceptions import ValidationError
+import requests
+import json
 
 
 class FixtureMaterial(models.Model):
@@ -40,14 +44,17 @@ class FixtureModel(models.Model):
     width = fields.Char(string="宽度[mm]", size=6)
     height = fields.Char(string="高度[mm]", size=6)
     weight = fields.Char(string="重量[kg]", size=4)
-    clamp_workpiece_length_max = fields.Char(string="夹持工件长度MAX[mm]", size=6)
-    clamp_workpiece_width_max = fields.Char(string="夹持工件宽度MAX[mm]", size=6)
-    clamp_workpiece_height_max = fields.Char(string="夹持工件高度MAX[mm]", size=6)
-    clamp_workpiece_diameter_max = fields.Char(string="夹持工件直径MAX[mm]", size=6)
-    maximum_carrying_weight = fields.Char(string="最大承载重量[kg]", size=4)
-    maximum_clamping_force = fields.Char(string="最大夹持力[n]", size=8)
+    clamp_workpiece_length_max = fields.Integer(string="夹持工件长度MAX[mm]", size=6)
+    clamp_workpiece_width_max = fields.Integer(string="夹持工件宽度MAX[mm]", size=6)
+    clamp_workpiece_height_max = fields.Integer(string="夹持工件高度MAX[mm]", size=6)
+    clamp_workpiece_diameter_max = fields.Float(string="夹持工件直径MAX[mm]", size=6)
+    maximum_carrying_weight = fields.Float(string="最大承载重量[kg]", size=4)
+    maximum_clamping_force = fields.Integer(string="最大夹持力[n]", size=8)
     materials_model_id = fields.Many2one('sf.materials.model', string="材料型号")
-    driving_way = fields.Char(string="驱动方式")
-    apply_machine_tool_type_id = fields.Many2one('sf.machine_tool.type', string="适用机床型号")
+    driving_way = fields.Selection([('气动', '气动'), ('液压', '液压'), ('机械', '机械')], string="驱动方式")
+    apply_machine_tool_type_ids = fields.Many2many('sf.machine_tool.type', 'rel_fixture_model_machine_tool_type',
+                                                   string="适用机床型号")
     through_hole_size = fields.Integer(string="过孔大小[mm]", size=6)
     screw_size = fields.Integer(string="螺牙大小[mm]", size=6)
+
+
diff --git a/sf_base/models/functional_fixture.py b/sf_base/models/functional_fixture.py
index 4ef466f7..86cc015f 100644
--- a/sf_base/models/functional_fixture.py
+++ b/sf_base/models/functional_fixture.py
@@ -1,4 +1,8 @@
 from odoo import models, fields, api
+from odoo.addons.sf_base.commons.common import Common
+from odoo.exceptions import ValidationError
+import requests
+import json
 
 
 class FunctionalFixtureType(models.Model):
@@ -16,7 +20,6 @@ class FunctionalFixture(models.Model):
     _description = "功能夹具"
 
     code = fields.Char(string='编码', readonly=True)
-    name = fields.Char(string="名称", size=15, required=True)
     type_id = fields.Many2one('sf.functional.fixture.type', string="功能夹具类型", required=True)
     type = fields.Char(related='type_id.name', string="功能夹具类别", store=True)
     zero_chuck_model_ids = fields.Many2many('sf.fixture.model', 'rel_fixture_model_zero_chuck', string="零点卡盘型号",
@@ -33,11 +36,124 @@ class FunctionalFixture(models.Model):
                                                domain=[('fixture_material_type', '=', '磁吸托盘')])
     vice_tray_model_ids = fields.Many2many('sf.fixture.model', 'rel_fixture_model_vice_tray', string="虎钳托盘型号",
                                            domain=[('fixture_material_type', '=', '虎钳托盘')])
+    registration_status = fields.Selection([("已注册", "已注册"), ("未注册", "未注册")], string="注册状态", default='未注册', tracking=True)
 
-    def _get_fixture_model_ids(self, fixture_model_code):
-        fixture_model_ids = []
-        for item in fixture_model_code:
-            fixture_model = self.env['sf.fixture.model'].search([('code', '=', item)])
-            if fixture_model:
-                fixture_model_ids.append(fixture_model.id)
-        return [(6, 0, fixture_model_ids)]
+
+    @api.onchange('type_id')
+    def _onchange_type_id(self):
+        if self.type_id:
+            functional_fixture_type = self.search(
+                [('type', '=', self.type)], limit=1, order='id desc')
+            if not functional_fixture_type:
+                num = "%04d" % 1
+            else:
+                m = int(functional_fixture_type.code[-3:]) + 1
+                num = "%04d" % m
+            self.code = "%s%s-%s" % ('JKM-C-GNJJ-', self.type_id.code, num)
+
+    _sql_constraints = [
+        ('code_uniq', 'unique (code)',
+         '编码不能重复')
+
+    ]
+
+    @api.depends('transfer_tray_model_ids', 'pneumatic_tray_model_ids', 'magnetic_tray_model_ids',
+                 'vice_tray_model_ids', 'type')
+    def _get_name(self):
+        for record in self:
+            if record.type:
+                if not record.transfer_tray_model_ids and not record.pneumatic_tray_model_ids and not record.magnetic_tray_model_ids and not record.vice_tray_model_ids:
+                    record.name = ''
+                if record.transfer_tray_model_ids:
+                    for i in record.transfer_tray_model_ids:
+                        record.name = '%s%s%s' % (
+                            i.display_name.split('-')[0], record.type, '功能夹具')
+                if record.pneumatic_tray_model_ids:
+                    for i in record.pneumatic_tray_model_ids:
+                        record.name = '%s%s%s' % (
+                            i.display_name.split('-')[0], record.type, '功能夹具')
+                if record.magnetic_tray_model_ids:
+                    for i in record.magnetic_tray_model_ids:
+                        record.name = '%s%s%s' % (
+                            i.display_name.split('-')[0], record.type, '功能夹具')
+                if record.vice_tray_model_ids:
+                    for i in record.vice_tray_model_ids:
+                        record.name = '%s%s%s' % (
+                            i.display_name.split('-')[0], record.type, '功能夹具')
+            else:
+                record.name = ''
+
+    name = fields.Char(string="名称", compute=_get_name, readonly=True)
+
+    def _json_zero_chuck_model_item_code(self, item):
+        code_arr = []
+        for i in item.zero_chuck_model_ids:
+            code_arr.append(i.code)
+        return code_arr
+
+    def _json_transfer_tray_model_item_code(self, item):
+        code_arr = []
+        for i in item.transfer_tray_model_ids:
+            code_arr.append(i.code)
+        return code_arr
+
+    def _json_vice_tray_item_code(self, item):
+        code_arr = []
+        for i in item.vice_tray_model_ids:
+            code_arr.append(i.code)
+        return code_arr
+
+    def _json_magnetic_tray_model_item_code(self, item):
+        code_arr = []
+        for i in item.magnetic_tray_model_ids:
+            code_arr.append(i.code)
+        return code_arr
+
+    def _json_pneumatic_tray_model_item_code(self, item):
+        code_arr = []
+        for i in item.pneumatic_tray_model_ids:
+            code_arr.append(i.code)
+        return code_arr
+
+    # 注册到cloud的功能夹具中
+    def register_functional_fixture(self):
+        registration_url = 'api/functional_fixture/create'
+        sf_sync_config = self.env['res.config.settings'].get_values()
+        token = sf_sync_config['token']
+        sf_secret_key = sf_sync_config['sf_secret_key']
+        headers = Common.get_headers(self, token, sf_secret_key)
+        strurl = sf_sync_config['sf_url'] + self.registration_url
+        objs_self = self.search([('code', '=', self.code)])
+        functional_fixture_list = []
+        if objs_self:
+            for item in objs_self:
+                val = {
+                    'factory_token': token,
+                    'name': item.name,
+                    'code': item.code,
+                    'type_code': self.env['sf.functional.fixture.type'].search(
+                        [('id', '=', item.type_id.id)]).code,
+                    'zero_chuck_model_codes': self.env['sf.functional.fixture']._json_zero_chuck_model_item_code(
+                        item),
+                    'transfer_tray_model_codes': self.env['sf.functional.fixture']._json_transfer_tray_model_item_code(
+                        item),
+                    'pneumatic_tray_model_codes': self.env[
+                        'sf.functional.fixture']._json_pneumatic_tray_model_item_code(
+                        item),
+                    'magnetic_tray_model_codes': self.env['sf.functional.fixture']._json_magnetic_tray_model_item_code(
+                        item),
+                    'vice_tray_model_codes': self.env['sf.functional.fixture']._json_vice_tray_item_code(
+                        item),
+                }
+                functional_fixture_list.append(val)
+            # kw = machine_tool_list
+            kw = json.dumps(functional_fixture_list, ensure_ascii=False)
+            r = requests.post(strurl, json={}, data={'kw': kw, 'token': token}, headers=headers)
+            ret = r.json()
+            self.code = ret['message']
+
+            if r == 200:
+                self.registration_status = "已注册"
+                return "功能夹具注册成功"
+        else:
+            raise ValidationError("没有功能夹具注册信息")
diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml
index 274d9d64..eadd81f2 100644
--- a/sf_base/views/base_view.xml
+++ b/sf_base/views/base_view.xml
@@ -25,43 +25,49 @@
                 <field name="code"/>
                 <field name="name"/>
                 <field name="manufacturer_model_number"/>
-                <field name="tag_ids" widget="many2many_tags"  optional="hide"/>
+                <field name="tag_ids" widget="many2many_tags" optional="hide"/>
                 <field name="image_brand"/>
             </tree>
         </field>
     </record>
 
-    <!--    <record model="ir.ui.view" id="form_sf_machine_brand">-->
-    <!--        <field name="name">form.sf.machine.brand</field>-->
-    <!--        <field name="model">sf.machine.brand</field>-->
-    <!--        <field name="arch" type="xml">-->
-    <!--            <form string="品牌">-->
-    <!--                &lt;!&ndash;                <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>&ndash;&gt;-->
-    <!--                <field name="image_brand" widget='image' class="oe_avatar" options="{'preview_image': 'image_128'}"/>-->
-    <!--                <div class="oe_title">-->
-    <!--                    <label for="code" string="编码"/>-->
-    <!--                    <h2 class="d-flex">-->
-    <!--                        <field name="code" readonly="True"/>-->
-    <!--                    </h2>-->
-    <!--                </div>-->
-    <!--                <group>-->
-    <!--                    <group>-->
-    <!--                        <field name="name" required="True"/>-->
-    <!--                        <field name="tag_ids"-->
-    <!--                               widget="many2many_tags"-->
-    <!--                               options="{'color_field': 'color', 'no_create_edit': True}"-->
-    <!--                               required="True"/>-->
-    <!--                    </group>-->
-    <!--                </group>-->
-    <!--            </form>-->
-    <!--        </field>-->
-    <!--    </record>-->
+    <record model="ir.ui.view" id="form_sf_machine_brand">
+        <field name="name">form.sf.machine.brand</field>
+        <field name="model">sf.machine.brand</field>
+        <field name="arch" type="xml">
+            <form string="品牌" create="0" edit="0" delete="0">
+                <sheet>
+                    <!--                <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>-->
+                    <field name="image_brand" widget='image' class="oe_avatar"
+                           options="{'preview_image': 'image_128'}" string="log"/>
+                    <!--                    <div class="oe_title">-->
+                    <!--                        <label for="code" string="编码"/>-->
+                    <!--                        <h2 class="d-flex">-->
+                    <!--                            <field name="code" readonly="True"/>-->
+                    <!--                        </h2>-->
+                    <!--                    </div>-->
+                    <group>
+                        <group>
+                            <field name="code"/>
+                            <field name="name"/>
+                            <field name="tag_ids"
+                                   widget="many2many_tags"
+                                   options="{'color_field': 'color', 'no_create_edit': True}"
+                            />
+                            <field name="manufacturer_model_number"/>
+                            <field name="remark"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
 
     <record id="action_sf_machine_brand" model="ir.actions.act_window">
         <field name="name">品牌</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">sf.machine.brand</field>
-        <field name="view_mode">tree</field>
+        <field name="view_mode">tree,form</field>
     </record>
 
     #------------------机床型号------------------
@@ -81,7 +87,7 @@
         <field name="name">tree.sf.machine_tool.type</field>
         <field name="model">sf.machine_tool.type</field>
         <field name="arch" type="xml">
-            <tree string="机床型号" create="0" edit="0" delete="0">
+            <tree string="机床型号">
                 <field name="code"/>
                 <field name="name"/>
                 <field name="brand_id"/>
@@ -96,81 +102,110 @@
         <field name="model">sf.machine_tool.type</field>
         <field name="arch" type="xml">
             <form string="机床型号" create="0" edit="0" delete="0">
-                <group string="基本信息">
+                <sheet>
                     <group>
-                        <field name="code" force_save="1" readonly="1"/>
-                        <field name="name" required="1"/>
-                        <field name="machine_tool_category" required="1"/>
-                        <field name="brand_id" required="1"
-                               domain="[('tag_ids', '=', '机床')]"
-                               options="{'no_create': True}"/>
+                        <group>
+                            <field name="code" force_save="1" readonly="1"/>
+                            <field name="name" required="1"/>
+                            <field name="brand_id" required="1"
+                                   domain="[('tag_ids', '=', '机床')]"
+                                   options="{'no_create': True}"/>
+                            <field name="machine_tool_category" required="1"/>
+                        </group>
+                        <group>
+                            <field name="machine_tool_picture" widget="image" nolabel="1"/>
+                        </group>
                     </group>
-                    <group>
-                        <field name="machine_tool_picture" widget="image" nolabel="1"/>
-
-                    </group>
-                </group>
-                <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="number_of_knife_library" required="1" options="{'format': false}"/>
-                        <field name="number_of_axles" required="1" 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" options="{'format': false}"/>
-                            <span>&amp;nbsp;</span>
-                            <label for="y_axis" string="y"/>
-                            <field name="y_axis" class="o_address_zip" required="1" options="{'format': false}"/>
-                            <span>&amp;nbsp;</span>
-                            <label for="z_axis" string="z"/>
-                            <field name="z_axis" class="o_address_zip" required="1" 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"
-                                   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"
-                                   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="feed_speed" required="1"/>
-                        <field name="tool_speed" required="1"/>
-                        <field name="distance" required="1"/>
-                        <field name="rotate_speed" string="主轴转速(min)" required="1" options="{'format': false}"/>
-                        <field name="precision" required="1" string="X轴定位精度(mm)(mm)"/>
-
-                    </group>
-                </group>
-                <group string="其它">
-                    <field name="remark"/>
-                </group>
+                    <notebook>
+                        <page string="基本信息">
+                            <group>
+                                <group string="基础参数">
+                                    <field name="control_system_id" required="1" options="{'no_create': True}"/>
+                                    <label for="workbench_L" string="工作台尺寸(mm)"/>
+                                    <div class="test_model">
+                                        <label for="workbench_L" string="长"/>
+                                        <field name="workbench_L" class="o_address_zip" required="1"
+                                               options="{'format': false}"/>
+                                        <span>&amp;nbsp;</span>
+                                        <label for="workbench_W" string="宽"/>
+                                        <field name="workbench_W" class="o_address_zip" required="1"
+                                               options="{'format': false}"/>
+                                    </div>
+                                    <label for="machine_tool_L" string="机床尺寸(mm)"/>
+                                    <div class="test_model">
+                                        <label for="machine_tool_L" string="长"/>
+                                        <field name="machine_tool_L" class="o_address_zip" required="1"
+                                               options="{'format': false}"/>
+                                        <span>&amp;nbsp;</span>
+                                        <label for="machine_tool_W" string="宽"/>
+                                        <field name="machine_tool_W" class="o_address_zip" required="1"
+                                               options="{'format': false}"/>
+                                        <label for="machine_tool_H" string="高"/>
+                                        <field name="machine_tool_H" class="o_address_zip" required="1"
+                                               options="{'format': false}"/>
+                                    </div>
+                                    <field name="feed_speed" required="1"/>
+                                    <field name="precision" required="1" string="X轴定位精度(mm)"/>
+                                    <field name="workpiece_load" required="1"/>
+                                    <field name="number_of_knife_library" required="1" options="{'format': false}"/>
+                                    <field name="lead_screw" required="1"/>
+                                    <field name="number_of_axles" required="1" 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"
+                                               options="{'format': false}"/>
+                                        <span>&amp;nbsp;</span>
+                                        <label for="y_axis" string="y"/>
+                                        <field name="y_axis" class="o_address_zip" required="1"
+                                               options="{'format': false}"/>
+                                        <span>&amp;nbsp;</span>
+                                        <label for="z_axis" string="z"/>
+                                        <field name="z_axis" class="o_address_zip" required="1"
+                                               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"
+                                               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"
+                                               attrs="{'invisible': [('number_of_axles', 'in', ['三轴','四轴'])]}"
+                                               options="{'format': false}"/>
+                                    </div>
+                                </group>
+                                <group string="主轴">
+                                    <field name="taper" required="1"/>
+                                    <field name="rotate_speed" string="主轴转速(min)" required="1"
+                                           options="{'format': false}"/>
+                                    <field name="heightened_way" required="1"/>
+                                    <field name="torque" required="1"/>
+                                    <field name="motor_power" required="1"/>
+                                    <field name="distance" required="1"/>
+                                </group>
+                                <group>
+                                    <field name="guide_rail" required="1"/>
+                                </group>
+                                <group string="刀具">
+                                    <field name="knife_type" required="1"/>
+                                    <field name="tool_speed" required="1"/>
+                                    <field name="tool_long_max" required="1"/>
+                                    <field name="tool_diameter_max" required="1"/>
+                                    <field name="tool_quality_max" required="1"/>
+                                </group>
+                            </group>
+                            <group string="其它">
+                                <field name="remark"/>
+                            </group>
+                        </page>
+                    </notebook>
+                </sheet>
             </form>
         </field>
     </record>
@@ -207,7 +242,7 @@
         <field name="name">tree.sf.machine_tool.category</field>
         <field name="model">sf.machine_tool.category</field>
         <field name="arch" type="xml">
-            <tree string="机床类型">
+            <tree string="机床类型" create="0" edit="0" delete="0">
                 <field name="code"/>
                 <field name="name"/>
                 <field name="category"/>
@@ -216,42 +251,35 @@
         </field>
     </record>
 
-    <record model="ir.ui.view" id="form_sf_machine_tool_category">
-        <field name="name">form.sf.machine_tool.category</field>
-        <field name="model">sf.machine_tool.category</field>
-        <field name="arch" type="xml">
-            <form string="机床类型">
-                <group string="基本信息" name="base_info">
-                    <group>
-                        <field name="code" force_save="1" readonly="1"/>
-                        <field name="name" required="1"/>
-                    </group>
-                    <group>
-                        <field name="category" readonly="1"/>
-                    </group>
-                </group>
+    <!--    <record model="ir.ui.view" id="form_sf_machine_tool_category">-->
+    <!--        <field name="name">form.sf.machine_tool.category</field>-->
+    <!--        <field name="model">sf.machine_tool.category</field>-->
+    <!--        <field name="arch" type="xml">-->
+    <!--            <form string="机床类型">-->
+    <!--                <group string="基本信息" name="base_info">-->
+    <!--                    <group>-->
+    <!--                        <field name="code" force_save="1" readonly="1"/>-->
+    <!--                        <field name="name" required="1"/>-->
+    <!--                    </group>-->
+    <!--                    <group>-->
+    <!--                        <field name="category" readonly="1"/>-->
+    <!--                    </group>-->
+    <!--                </group>-->
 
-                <group string="其它">
-                    <field name="remark"/>
-                </group>
+    <!--                <group string="其它">-->
+    <!--                    <field name="remark"/>-->
+    <!--                </group>-->
 
 
-            </form>
-        </field>
-    </record>
+    <!--            </form>-->
+    <!--        </field>-->
+    <!--    </record>-->
 
     <record id="action_sf_machine_tool_category" model="ir.actions.act_window">
         <field name="name">机床类型</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">sf.machine_tool.category</field>
-        <field name="view_mode">tree,form</field>
-        <field name="help" type="html">
-            <p class="o_view_nocontent_smiling_face">
-                [机床类型] 还没有哦！点左上角的[创建]按钮，沙发归你了!
-            </p>
-            <p>
-            </p>
-        </field>
+        <field name="view_mode">tree</field>
     </record>
 
     #------------------机床注册------------------
@@ -378,13 +406,13 @@
         </field>
     </record>
 
-    #------------------控制系统------------------
+    #------------------数控系统------------------
 
     <record model="ir.ui.view" id="search_sf_machine_control_system_view">
         <field name="name">search.sf.machine.control_system</field>
         <field name="model">sf.machine.control_system</field>
         <field name="arch" type="xml">
-            <search string="控制系统">
+            <search string="数控系统">
                 <field name="name" string="模糊搜索"
                        filter_domain="['|',('name', 'ilike', self),('code', 'ilike', self)]"/>
             </search>
@@ -395,7 +423,7 @@
         <field name="name">tree.sf.machine.control_system</field>
         <field name="model">sf.machine.control_system</field>
         <field name="arch" type="xml">
-            <tree string="控制系统" create="0" edit="0" delete="0">
+            <tree string="数控系统" create="0" edit="0" delete="0">
                 <field name="code"/>
                 <field name="name"/>
                 <field name="brand_id"/>
@@ -424,7 +452,7 @@
     <!--    </record>-->
 
     <record id="action_sf_machine_control_system" 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.machine.control_system</field>
         <field name="view_mode">tree</field>
diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml
index f73e4dcf..e15d644c 100644
--- a/sf_base/views/common_view.xml
+++ b/sf_base/views/common_view.xml
@@ -2,24 +2,24 @@
 <odoo>
     <data>
         <!--加工工艺-->
-        <record model="ir.ui.view" id="sf_processing_technology_form">
-            <field name="model">sf.processing.technology</field>
-            <field name="arch" type="xml">
-                <form string="加工工艺" create="0" edit="0" delete="0">
-                    <group>
-                        <group>
-                            <field name="process_encode" readonly="1"/>
-                        </group>
-                        <group>
-                            <field name="name" required="1"/>
-                        </group>
-                    </group>
-                    <group>
-                        <field name="remark"/>
-                    </group>
-                </form>
-            </field>
-        </record>
+        <!--        <record model="ir.ui.view" id="sf_processing_technology_form">-->
+        <!--            <field name="model">sf.processing.technology</field>-->
+        <!--            <field name="arch" type="xml">-->
+        <!--                <form string="加工工艺" create="0" edit="0" delete="0">-->
+        <!--                    <group>-->
+        <!--                        <group>-->
+        <!--                            <field name="process_encode" readonly="1"/>-->
+        <!--                        </group>-->
+        <!--                        <group>-->
+        <!--                            <field name="name" required="1"/>-->
+        <!--                        </group>-->
+        <!--                    </group>-->
+        <!--                    <group>-->
+        <!--                        <field name="remark"/>-->
+        <!--                    </group>-->
+        <!--                </form>-->
+        <!--            </field>-->
+        <!--        </record>-->
         <record model="ir.ui.view" id="sf_processing_technology_tree">
             <field name="model">sf.processing.technology</field>
             <field name="arch" type="xml">
@@ -75,7 +75,7 @@
         <record model="ir.ui.view" id="sf_production_process_category_tree">
             <field name="model">sf.production.process.category</field>
             <field name="arch" type="xml">
-                <tree string="表面工艺类别"  default_order="sequence, id" create="0" edit="0" delete="0">
+                <tree string="表面工艺类别" default_order="sequence, id" create="0" edit="0" delete="0">
                     <field name="sequence" widget="handle" string="序号"/>
                     <field name="code" readonly="1"/>
                     <field name="name"/>
@@ -131,7 +131,7 @@
                                             <sheet>
                                                 <group>
                                                     <group>
-                                                        <field name="code" />
+                                                        <field name="code"/>
                                                         <field name="name" string="参数名"/>
                                                     </group>
                                                     <group>
@@ -186,44 +186,50 @@
         <record model="ir.ui.view" id="sf_materials_model_form">
             <field name="model">sf.materials.model</field>
             <field name="arch" type="xml">
-                <form string="材料型号" create="0" edit="0" delete="0">
-                    <group>
+                <form string="材料型号" create="0" edit="1" delete="0">
+                    <sheet>
                         <group>
-                            <field name="materials_no" readonly="1"/>
-                            <field name="name" required="1"/>
-                            <field name="gain_way" required="1"/>
+                            <group>
+                                <field name="materials_no" readonly="1"/>
+                                <field name="gain_way" required="1"/>
+                                <field name="density" readonly="1"/>
+                            </group>
+                            <group>
+                                <field name="name" readonly="1"/>
+                                <field name="need_h" default="false" readonly="1"/>
+                                <field name="mf_materia_post" attrs="{'invisible':[('need_h','=',False)]} "
+                                       readonly="1"/>
+                            </group>
+                            <group>
+                                <field name='materials_id' default="default" invisible="1"/>
+                            </group>
                         </group>
+                        <notebook>
+                            <page string="供应商">
+                                <field name='supplier_ids'>
+                                    <tree editable='bottom'>
+                                        <field name="sequence" widget="handle" string="序号"/>
+                                        <field name="partner_id" string="名称"/>
+                                    </tree>
+                                </field>
+                            </page>
+                        </notebook>
                         <group>
-                            <field name="density" required="1"/>
-                            <field name="need_h" default="false"/>
-                            <field name="mf_materia_post" attrs="{'invisible':[('need_h','=',False)]} "/>
+                            <field name="remark" readonly="1"/>
                         </group>
-                        <group>
-                            <field name='materials_id' default="default" invisible="1"/>
-                        </group>
-                    </group>
-                    <group>
-                        <field name='supplier_ids'>
-                            <tree editable='bottom'>
-                                <field name="sequence" widget="handle" string="序号"/>
-                                <field name="partner_id" string="名称"/>
-                            </tree>
-                        </field>
-                    </group>
-                    <group>
-                        <field name="remark"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
         <record model="ir.ui.view" id="sf_materials_model_tree">
             <field name="model">sf.materials.model</field>
             <field name="arch" type="xml">
-                <tree string="材料型号" create="0" edit="0" delete="0">
-                    <field name="materials_no"/>
-                    <field name="name"/>
-                    <field name="need_h"/>
-                    <field name="density"/>
+                <tree string="材料型号" create="0" delete="0">
+                    <field name="materials_no" readonly="1"/>
+                    <field name="name" readonly="1"/>
+                    <field name="gain_way"/>
+                    <field name="need_h" readonly="1"/>
+                    <field name="density" readonly="1"/>
                     <field name='materials_id' invisible="1"/>
                 </tree>
             </field>
@@ -247,28 +253,33 @@
             <field name="model">sf.production.materials</field>
             <field name="arch" type="xml">
                 <form string="材料" create="0" edit="0" delete="0">
-                    <group string="详情">
+                    <sheet>
                         <group>
-                            <field name="materials_no" readonly="1" default="编码"/>
+                            <group>
+                                <field name="materials_no" readonly="1" default="编码"/>
+                            </group>
+                            <group>
+                                <field name="name" required="1"/>
+                            </group>
+                            <notebook>
+                                <page string="型号">
+                                    <field name="materials_model_ids" widget="ony2many">
+                                        <tree string="材料型号">
+                                            <field name="materials_no"/>
+                                            <field name="name"/>
+                                            <field name="need_h"/>
+                                            <field name="mf_materia_post"/>
+                                            <field name="density"/>
+                                            <field name='materials_id' default="default" invisible="1"/>
+                                        </tree>
+                                    </field>
+                                </page>
+                            </notebook>
                         </group>
                         <group>
-                            <field name="name" required="1"/>
+                            <field name="remark"/>
                         </group>
-                        <field name="materials_model_ids" widget="ony2many">
-                            <tree string="材料型号">
-                                <field name="materials_no"/>
-                                <field name="name"/>
-                                <field name="need_h"/>
-                                <field name="mf_materia_post"/>
-                                <field name="density"/>
-                                <field name='materials_id' default="default" invisible="1"/>
-                            </tree>
-                        </field>
-
-                    </group>
-                    <group>
-                        <field name="remark"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -372,14 +383,16 @@
                     <header>
                         <field name='state' widget="radio" options="{'horizontal': True}"/>
                     </header>
-                    <group string="基本信息" name="group1">
-                        <group>
-                            <field name="code" required="1"/>
+                    <sheet>
+                        <group name="group1">
+                            <group>
+                                <field name="code" required="1"/>
+                            </group>
+                            <group>
+                                <field name="name" required="1"/>
+                            </group>
                         </group>
-                        <group>
-                            <field name="name" required="1"/>
-                        </group>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/sf_base/views/fixture_view.xml b/sf_base/views/fixture_view.xml
index cef36ff2..65cf2ce1 100644
--- a/sf_base/views/fixture_view.xml
+++ b/sf_base/views/fixture_view.xml
@@ -177,15 +177,15 @@
         <field name="arch" type="xml">
             <form string="夹具型号" create="0" edit="0" delete="0">
                 <sheet>
-                    <group string="基本信息">
+                    <group>
                         <group>
                             <field name="code" force_save="1"/>
                             <field name="name"/>
-                            <field name="brand_id"/>
+                            <field name="brand_id" options="{'no_create': True}"/>
                             <field name="manufacturer_model_number"/>
-                            <field name="fixture_material_id"/>
+                            <field name="fixture_material_id" options="{'no_create': True}"/>
                             <field name="fixture_material_type" invisible="1"/>
-                            <field name="multi_mounting_type_id"/>
+                            <field name="multi_mounting_type_id" options="{'no_create': True}"/>
                         </group>
                         <group>
                             <!--                            <field name="upload_model_file" widget="many2many_binary"/>-->
@@ -193,60 +193,68 @@
                                    attrs="{'invisible': [('model_file', '=', False)]}"/>
                         </group>
                     </group>
-                    <group string="参数"
-                           attrs='{"invisible": [("fixture_material_type","not in",("气动托盘","转接板(锁板)托盘","磁吸托盘","虎钳托盘","零点卡盘"))]}'>
-                        <group>
-                            <label for="length" string="尺寸[mm]"/>
-                            <div class="test_model">
-                                <label for="length" string="长"/>
-                                <field name="length" class="o_address_zip"
-                                       options="{'format': false}"/>
-                                <label for="width" string="宽"/>
-                                <field name="width" class="o_address_zip"
-                                       options="{'format': false}"/>
-                                <label for="height" string="高"/>
-                                <field name="height" class="o_address_zip"
-                                       options="{'format': false}"/>
-                            </div>
-                            <field name="weight"></field>
-                            <label for="length" string="夹持工件最大尺寸[mm]"
-                                   attrs='{"invisible": [("fixture_material_type","=",("零点卡盘"))]}'/>
-                            <div class="test_model"
-                                 attrs='{"invisible": [("fixture_material_type","=",("零点卡盘"))]}'>
-                                <label for="clamp_workpiece_length_max" string="长"/>
-                                <field name="clamp_workpiece_length_max" class="o_address_zip"
-                                       options="{'format': false}"
-                                       attrs="{'required': [('fixture_material_type', 'in',('气动托盘','转接板(锁板)托盘','磁吸托盘','虎钳托盘'))]}"/>
-                                <label for="clamp_workpiece_width_max" string="宽"/>
-                                <field name="clamp_workpiece_width_max" class="o_address_zip"
-                                       options="{'format': false}"
-                                       attrs="{'required': [('fixture_material_type', 'in',('气动托盘','转接板(锁板)托盘','磁吸托盘','虎钳托盘'))]}"/>
-                                <label for="clamp_workpiece_height_max" string="高"/>
-                                <field name="clamp_workpiece_height_max" class="o_address_zip"
-                                       options="{'format': false}"
-                                       attrs="{'required': [('fixture_material_type', 'in',('气动托盘','转接板(锁板)托盘','磁吸托盘','虎钳托盘'))]}"/>
-                            </div>
-                            <field name="clamp_workpiece_diameter_max"
-                                   attrs="{'invisible': [('fixture_material_type','=','零点卡盘')],'required': [('fixture_material_type', 'in',('气动托盘','转接板(锁板)托盘','磁吸托盘','虎钳托盘'))]}"/>
-                            <field name="maximum_carrying_weight"></field>
-                            <field name="maximum_clamping_force"></field>
-                        </group>
-                        <group>
-                            <field name="materials_model_id"/>
-                            <field name="clamping_way"
-                                   attrs='{"invisible": [("fixture_material_type","not in",("气动托盘","磁吸托盘","虎钳托盘"))]}'/>
-                            <field name="port_type"
-                                   attrs='{"invisible": [("fixture_material_type","not in",("气动托盘","磁吸托盘","虎钳托盘"))]}'/>
-                            <field name="through_hole_size"
-                                   attrs='{"invisible": [("fixture_material_type","!=",("转接板(锁板)托盘"))]}'/>
-                            <field name="screw_size"
-                                   attrs='{"invisible": [("fixture_material_type","!=",("转接板(锁板)托盘"))]}'/>
-                            <field name="driving_way"
-                                   attrs='{"invisible": [("fixture_material_type","not in",("虎钳托盘","零点卡盘"))]}'/>
-                            <field name="apply_machine_tool_type_id"
-                                   attrs='{"invisible": [("fixture_material_type","!=",("零点卡盘"))]}'/>
-                        </group>
-                    </group>
+                    <notebook>
+                        <page string="参数"
+                              attrs='{"invisible": [("fixture_material_type","not in",("气动托盘","转接板(锁板)托盘","磁吸托盘","虎钳托盘","零点卡盘"))]}'>
+                            <group>
+                                <group>
+                                    <label for="length" string="尺寸(mm)"/>
+                                    <div class="test_model">
+                                        <label for="length" string="长"/>
+                                        <field name="length" class="o_address_zip"
+                                               options="{'format': false}"/>
+                                        <span>&amp;nbsp;</span>
+                                        <label for="width" string="宽"/>
+                                        <field name="width" class="o_address_zip"
+                                               options="{'format': false}"/>
+                                        <span>&amp;nbsp;</span>
+                                        <label for="height" string="高"/>
+                                        <field name="height" class="o_address_zip"
+                                               options="{'format': false}"/>
+                                    </div>
+                                    <field name="weight"></field>
+                                    <field name="materials_model_id" options="{'no_create': True}"/>
+                                    <field name="clamping_way"
+                                           attrs='{"invisible": [("fixture_material_type","not in",("气动托盘","磁吸托盘","虎钳托盘"))]}'/>
+                                    <field name="port_type"
+                                           attrs='{"invisible": [("fixture_material_type","not in",("气动托盘","磁吸托盘","虎钳托盘"))]}'/>
+                                    <field name="through_hole_size"
+                                           attrs='{"invisible": [("fixture_material_type","!=",("转接板(锁板)托盘"))]}'/>
+                                    <field name="screw_size"
+                                           attrs='{"invisible": [("fixture_material_type","!=",("转接板(锁板)托盘"))]}'/>
+                                    <field name="driving_way"
+                                           attrs='{"invisible": [("fixture_material_type","not in",("虎钳托盘","零点卡盘"))]}'/>
+                                    <field name="apply_machine_tool_type_ids" widget="many2many_tags"
+                                           attrs='{"invisible": [("fixture_material_type","!=",("零点卡盘"))]}'/>
+                                </group>
+                                <group>
+                                    <label for="length" string="夹持工件最大尺寸(mm)"
+                                           attrs='{"invisible": [("fixture_material_type","=",("零点卡盘"))]}'/>
+                                    <div class="test_model"
+                                         attrs='{"invisible": [("fixture_material_type","=",("零点卡盘"))]}'>
+                                        <label for="clamp_workpiece_length_max" string="长"/>
+                                        <field name="clamp_workpiece_length_max" class="o_address_zip"
+                                               options="{'format': false}"
+                                               attrs="{'required': [('fixture_material_type', 'in',('气动托盘','转接板(锁板)托盘','磁吸托盘','虎钳托盘'))]}"/>
+                                        <span>&amp;nbsp;</span>
+                                        <label for="clamp_workpiece_width_max" string="宽"/>
+                                        <field name="clamp_workpiece_width_max" class="o_address_zip"
+                                               options="{'format': false}"
+                                               attrs="{'required': [('fixture_material_type', 'in',('气动托盘','转接板(锁板)托盘','磁吸托盘','虎钳托盘'))]}"/>
+                                        <span>&amp;nbsp;</span>
+                                        <label for="clamp_workpiece_height_max" string="高"/>
+                                        <field name="clamp_workpiece_height_max" class="o_address_zip"
+                                               options="{'format': false}"
+                                               attrs="{'required': [('fixture_material_type', 'in',('气动托盘','转接板(锁板)托盘','磁吸托盘','虎钳托盘'))]}"/>
+                                    </div>
+                                    <field name="clamp_workpiece_diameter_max" string="夹持工件最大直径(mm)"
+                                           attrs="{'invisible': [('fixture_material_type','=','零点卡盘')],'required': [('fixture_material_type', 'in',('气动托盘','转接板(锁板)托盘','磁吸托盘','虎钳托盘'))]}"/>
+                                    <field name="maximum_carrying_weight"></field>
+                                    <field name="maximum_clamping_force"></field>
+                                </group>
+                            </group>
+                        </page>
+                    </notebook>
                 </sheet>
             </form>
         </field>
diff --git a/sf_base/views/functional_fixture_view.xml b/sf_base/views/functional_fixture_view.xml
index 0a763393..4239ceba 100644
--- a/sf_base/views/functional_fixture_view.xml
+++ b/sf_base/views/functional_fixture_view.xml
@@ -81,7 +81,7 @@
         <field name="name">功能夹具</field>
         <field name="model">sf.functional.fixture</field>
         <field name="arch" type="xml">
-            <tree string="功能夹具" create="0" edit="0" delete="0">
+            <tree string="功能夹具">
                 <field name="code"/>
                 <field name="name"/>
                 <field name="type_id"/>
@@ -93,7 +93,12 @@
         <field name="name">功能夹具</field>
         <field name="model">sf.functional.fixture</field>
         <field name="arch" type="xml">
-            <form string="功能夹具" create="0" edit="0" delete="0">
+            <form string="功能夹具">
+<!--                <header>-->
+<!--                    <field name="registration_status" invisible="1"/>-->
+<!--                    <button type="object" class="oe_highlight" name='register_functional_fixture' string="注册"-->
+<!--                            attrs="{'invisible': [('registration_status','=','已注册')]}"/>-->
+<!--                </header>-->
                 <sheet>
                     <group string="基本信息">
                         <group>
@@ -101,15 +106,19 @@
                             <field name="name"/>
                             <field name="type_id"/>
                             <field name="type" invisible="1"/>
-                            <field name="zero_chuck_model_ids" widget="many2many_tags"/>
+                            <field name="zero_chuck_model_ids" widget="many2many_tags" options="{'no_create': True}"/>
                             <field name="transfer_tray_model_ids" widget="many2many_tags"
-                                   attrs="{'invisible': [('type', '!=', '转接板(锁板)式')]}"/>
+                                   options="{'no_create': True}"
+                                   attrs='{"invisible": [("type","!=","转接板(锁板)式")],"required": [("type", "=", "转接板(锁板)式")]}'/>
                             <field name="pneumatic_tray_model_ids" widget="many2many_tags"
-                                   attrs="{'invisible': [('type', '!=', '气动式')]}"/>
+                                   options="{'no_create': True}"
+                                   attrs='{"invisible": [("type","!=","气动式")],"required": [("type", "=", "气动式")]}'/>
                             <field name="magnetic_tray_model_ids" widget="many2many_tags"
-                                   attrs="{'invisible': [('type', '!=', '磁吸式')]}"/>
+                                   options="{'no_create': True}"
+                                   attrs='{"invisible": [("type","!=","磁吸式")],"required": [("type", "=", "磁吸式")]}'/>
                             <field name="vice_tray_model_ids" widget="many2many_tags"
-                                   attrs="{'invisible': [('type', '!=', '虎钳式')]}"/>
+                                   options="{'no_create': True}"
+                                   attrs='{"invisible": [("type","!=","虎钳式")],"required": [("type", "=", "虎钳式")]}'/>
                         </group>
                     </group>
                 </sheet>
diff --git a/sf_base/views/menu_view.xml b/sf_base/views/menu_view.xml
index 1806e42a..9525bbd3 100644
--- a/sf_base/views/menu_view.xml
+++ b/sf_base/views/menu_view.xml
@@ -139,7 +139,7 @@
         <menuitem
                 id="menu_sf_machine_control_system"
                 parent="menu_sf_base"
-                name="控制系统"
+                name="数控系统"
                 sequence="1"
                 action="action_sf_machine_control_system"/>
 
diff --git a/sf_base/views/tool_menu.xml b/sf_base/views/tool_menu.xml
index a1c976d5..91d95b37 100644
--- a/sf_base/views/tool_menu.xml
+++ b/sf_base/views/tool_menu.xml
@@ -7,14 +7,14 @@
             <field name="name">刀具物料</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.cutting.tool.material</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree</field>
         </record>
 <!--         刀具类型action -->
         <record id="action_sf_cutting_tool_type" model="ir.actions.act_window">
             <field name="name">刀具类型</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.cutting.tool.type</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree</field>
         </record>
 <!--         刀具型号action -->
         <record id="action_sf_cutting_tool" model="ir.actions.act_window">
@@ -35,7 +35,7 @@
             <field name="name">功能刀具类型</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.functional.cutting.tool.model</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree</field>
         </record>
 
 <!--         刀具 -->
diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index 4b02fefb..ccb98a7d 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -1,99 +1,114 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
     <data>
-<!-- ================================================刀具物料================================================ -->
-    <record id="view_cutting_tool_material_tree" model="ir.ui.view">
-        <field name="name">sf.cutting.tool.material.tree</field>
-        <field name="model">sf.cutting.tool.material</field>
-        <field name="arch" type="xml">
-            <tree string="刀具物料">
-                <field name="code"/>
-                <field name="name"/>
-                <field name="remark"/>
-            </tree>
-        </field>
-    </record>
+        <!-- ================================================刀具物料================================================ -->
+        <record id="view_cutting_tool_material_tree" model="ir.ui.view">
+            <field name="name">sf.cutting.tool.material.tree</field>
+            <field name="model">sf.cutting.tool.material</field>
+            <field name="arch" type="xml">
+                <tree string="刀具物料" create="0" edit="0" delete="0">
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="remark"/>
+                </tree>
+            </field>
+        </record>
+
+        <!--    <record id="view_cutting_tool_material_form" model="ir.ui.view">-->
+        <!--        <field name="name">sf.cutting.tool.material.form</field>-->
+        <!--        <field name="model">sf.cutting.tool.material</field>-->
+        <!--        <field name="arch" type="xml">-->
+        <!--            <form string="刀具物料">-->
+        <!--                <sheet>-->
+        <!--                    <group col='1'>-->
+        <!--                        <group string='基本信息'>-->
+        <!--                            <group>-->
+        <!--                            <field name="code"/>-->
+        <!--                            <field name="name"/>-->
+        <!--                            </group>-->
+        <!--                            <group>-->
+        <!--                                <field name="remark"/>-->
+        <!--                            </group>-->
+
+        <!--                        </group>-->
+        <!--                    </group>-->
+        <!--                </sheet>-->
+        <!--            </form>-->
+        <!--        </field>-->
+        <!--    </record>-->
+
+        <record model="ir.ui.view" id="view_cutting_tool_material_search">
+            <field name="name">sf.cutting.tool.material.search</field>
+            <field name="model">sf.cutting.tool.material</field>
+            <field name="arch" type="xml">
+                <search string="刀具物料">
+                    <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
+                    <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
+
+                </search>
+            </field>
+        </record>
+
+        <!-- ================================================功能刀具================================================ -->
+        <record id="view_functional_cutting_tool_tree" model="ir.ui.view">
+            <field name="name">sf.functional.cutting.tool.tree</field>
+            <field name="model">sf.functional.cutting.tool</field>
+            <field name="arch" type="xml">
+                <tree string="功能刀具">
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="mrs_cutting_tool_type_id"/>
+                    <field name="mrs_cutting_tool_integral_model_ids" optional="hide"/>
+                    <field name="mrs_cutting_tool_blade_model_ids" optional="hide"/>
+                    <field name="mrs_cutting_tool_cutterbar_model_ids" optional="hide"/>
+                    <field name="mrs_cutting_tool_cutterpad_model_ids" optional="hide"/>
+                    <field name="mrs_cutting_tool_cutterhandle_model_ids" optional="hide"/>
+                    <field name="mrs_cutting_tool_cutterhead_model_ids" optional="hide"/>
+                    <field name="image" widget='image'/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_functional_cutting_tool_form" model="ir.ui.view">
+            <field name="name">sf.functional.cutting.tool.form</field>
+            <field name="model">sf.functional.cutting.tool</field>
+            <field name="arch" type="xml">
+                <form string="功能刀具">
+                    <sheet>
+                        <group col='1'>
+                            <group string='基本信息'>
+                                <group>
+                                    <field name="code"/>
+                                    <field name="name"/>
+                                    <field name="mrs_cutting_tool_type_id"
+                                           options="{'no_create': True, 'no_quick_create': True}"/>
+                                    <field name="mrs_cutting_tool_model_id"
+                                           options="{'no_create': True, 'no_quick_create': True}"
+                                           attrs="{'invisible': True}"/>
+                                    <field name="mrs_cutting_tool_integral_model_ids"
+                                           options="{'no_create': True, 'no_quick_create': True}"
+                                           widget="many2many_tags"/>
+                                    <field name="mrs_cutting_tool_blade_model_ids"
+                                           options="{'no_create': True, 'no_quick_create': True}"
+                                           widget="many2many_tags"/>
+                                    <field name="mrs_cutting_tool_cutterbar_model_ids"
+                                           options="{'no_create': True, 'no_quick_create': True}"
+                                           widget="many2many_tags"/>
+                                    <field name="mrs_cutting_tool_cutterpad_model_ids"
+                                           options="{'no_create': True, 'no_quick_create': True}"
+                                           widget="many2many_tags"/>
+                                    <field name="mrs_cutting_tool_cutterhandle_model_ids"
+                                           options="{'no_create': True, 'no_quick_create': True}"
+                                           widget="many2many_tags"/>
+                                    <field name="mrs_cutting_tool_cutterhead_model_ids"
+                                           options="{'no_create': True, 'no_quick_create': True}"
+                                           widget="many2many_tags"/>
+                                </group>
+                                <group>
+                                    <field name="image" nolabel="1" widget="image"/>
+                                </group>
 
-    <record id="view_cutting_tool_material_form" model="ir.ui.view">
-        <field name="name">sf.cutting.tool.material.form</field>
-        <field name="model">sf.cutting.tool.material</field>
-        <field name="arch" type="xml">
-            <form string="刀具物料">
-                <sheet>
-                    <group col='1'>
-                        <group string='基本信息'>
-                            <group>
-                            <field name="code"/>
-                            <field name="name"/>
                             </group>
-                            <group>
-                                <field name="remark"/>
-                            </group>
-
-                        </group>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_cutting_tool_material_search">
-        <field name="name">sf.cutting.tool.material.search</field>
-        <field name="model">sf.cutting.tool.material</field>
-        <field name="arch" type="xml">
-            <search string="刀具物料">
-                <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
-                <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
-
-            </search>
-        </field>
-    </record>
-
-<!-- ================================================功能刀具================================================ -->
-    <record id="view_functional_cutting_tool_tree" model="ir.ui.view">
-        <field name="name">sf.functional.cutting.tool.tree</field>
-        <field name="model">sf.functional.cutting.tool</field>
-        <field name="arch" type="xml">
-            <tree string="功能刀具">
-                <field name="code"/>
-                <field name="name"/>
-                <field name="mrs_cutting_tool_type_id"/>
-                <field name="mrs_cutting_tool_integral_model_ids" optional="hide"/>
-                <field name="mrs_cutting_tool_blade_model_ids" optional="hide"/>
-                <field name="mrs_cutting_tool_cutterbar_model_ids" optional="hide"/>
-                <field name="mrs_cutting_tool_cutterpad_model_ids" optional="hide"/>
-                <field name="mrs_cutting_tool_cutterhandle_model_ids" optional="hide"/>
-                <field name="mrs_cutting_tool_cutterhead_model_ids" optional="hide"/>
-                <field name="image" widget='image'/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_functional_cutting_tool_form" model="ir.ui.view">
-        <field name="name">sf.functional.cutting.tool.form</field>
-        <field name="model">sf.functional.cutting.tool</field>
-        <field name="arch" type="xml">
-            <form string="功能刀具">
-                <sheet>
-                    <group col='1'>
-                        <group string='基本信息'>
-                            <group>
-                                <field name="code"/>
-                                <field name="name"/>
-                                <field name="mrs_cutting_tool_type_id" options="{'no_create': True, 'no_quick_create': True}"/>
-                                <field name="mrs_cutting_tool_model_id" options="{'no_create': True, 'no_quick_create': True}" attrs="{'invisible': True}"/>
-                                <field name="mrs_cutting_tool_integral_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
-                                <field name="mrs_cutting_tool_blade_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
-                                <field name="mrs_cutting_tool_cutterbar_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
-                                <field name="mrs_cutting_tool_cutterpad_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
-                                <field name="mrs_cutting_tool_cutterhandle_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
-                                <field name="mrs_cutting_tool_cutterhead_model_ids" options="{'no_create': True, 'no_quick_create': True}" widget="many2many_tags"/>
-                            </group>
-                            <group>
-                                <field name="image" nolabel="1" widget="image"/>
-                            </group>
-
-                        </group>
                             <group string='参数信息'>
                                 <group>
                                     <field name="diameter"/>
@@ -114,284 +129,365 @@
                                     <field name="applicable_range"/>
                                 </group>
                             </group>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
 
-    <record model="ir.ui.view" id="view_functional_cutting_tool_search">
-        <field name="name">sf.functional.cutting.tool.search</field>
-        <field name="model">sf.functional.cutting.tool</field>
-        <field name="arch" type="xml">
-            <search string="功能刀具">
-               <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
-                <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
-            </search>
-        </field>
-    </record>
+        <record model="ir.ui.view" id="view_functional_cutting_tool_search">
+            <field name="name">sf.functional.cutting.tool.search</field>
+            <field name="model">sf.functional.cutting.tool</field>
+            <field name="arch" type="xml">
+                <search string="功能刀具">
+                    <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
+                    <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
+                </search>
+            </field>
+        </record>
 
 
-<!-- ================================================功能刀具类型================================================ -->
-    <record id="view_cutter_function_tree" model="ir.ui.view">
-        <field name="name">sf.cutter.function.tree</field>
-        <field name="model">sf.functional.cutting.tool.model</field>
-        <field name="arch" type="xml">
-            <tree string="功能刀具类型">
-                <field name="name"/>
-                <field name="code"/>
-                <field name="remark"/>
-            </tree>
-        </field>
-    </record>
-    <record id="view_cutter_function_form" model="ir.ui.view">
-        <field name="name">sf.cutter.function.form</field>
-        <field name="model">sf.functional.cutting.tool.model</field>
-        <field name="arch" type="xml">
-            <form string="功能刀具类型">
-                <sheet>
-                    <group string="功能刀具类型">
-                    <group>
-                        <field name="code"/>
-                        <field name="name"/>
-                    </group>
-                    <group>
-                        <field name="remark"/>
-                    </group>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
+        <!-- ================================================功能刀具类型================================================ -->
+        <record id="view_cutter_function_tree" model="ir.ui.view">
+            <field name="name">sf.cutter.function.tree</field>
+            <field name="model">sf.functional.cutting.tool.model</field>
+            <field name="arch" type="xml">
+                <tree string="功能刀具类型" create="0" delete="0" edit="0">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="remark"/>
+                </tree>
+            </field>
+        </record>
+        <!--    <record id="view_cutter_function_form" model="ir.ui.view">-->
+        <!--        <field name="name">sf.cutter.function.form</field>-->
+        <!--        <field name="model">sf.functional.cutting.tool.model</field>-->
+        <!--        <field name="arch" type="xml">-->
+        <!--            <form string="功能刀具类型">-->
+        <!--                <sheet>-->
+        <!--                    <group string="功能刀具类型">-->
+        <!--                    <group>-->
+        <!--                        <field name="code"/>-->
+        <!--                        <field name="name"/>-->
+        <!--                    </group>-->
+        <!--                    <group>-->
+        <!--                        <field name="remark"/>-->
+        <!--                    </group>-->
+        <!--                    </group>-->
+        <!--                </sheet>-->
+        <!--            </form>-->
+        <!--        </field>-->
+        <!--    </record>-->
 
-<!--     功能刀具类型搜索 -->
-    <record model="ir.ui.view" id="view_cutter_function_search">
-        <field name="name">sf.cutter.function.search</field>
-        <field name="model">sf.functional.cutting.tool.model</field>
-        <field name="arch" type="xml">
-            <search string="功能刀具类型">
-                <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
-                <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
-            </search>
-        </field>
-    </record>
+        <!--     功能刀具类型搜索 -->
+        <record model="ir.ui.view" id="view_cutter_function_search">
+            <field name="name">sf.cutter.function.search</field>
+            <field name="model">sf.functional.cutting.tool.model</field>
+            <field name="arch" type="xml">
+                <search string="功能刀具类型">
+                    <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
+                    <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
+                </search>
+            </field>
+        </record>
 
-<!-- ================================================刀具型号================================================ -->
-    <record id="view_cutting_tool_model_tree" model="ir.ui.view">
-        <field name="name">sf.cutting.tool.model.tree</field>
-        <field name="model">sf.cutting.tool.model</field>
-        <field name="arch" type="xml">
-            <tree string="刀具型号">
-                <field name="code"/>
-                <field name="name"/>
-                <field name="mrs_cutting_tool_material_id"/>
-                <field name="image" widget='image'/>
-            </tree>
-        </field>
-    </record>
+        <!-- ================================================刀具型号================================================ -->
+        <record id="view_cutting_tool_model_tree" model="ir.ui.view">
+            <field name="name">sf.cutting.tool.model.tree</field>
+            <field name="model">sf.cutting.tool.model</field>
+            <field name="arch" type="xml">
+                <tree string="刀具型号">
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="mrs_cutting_tool_material_id"/>
+                    <field name="image" widget='image'/>
+                </tree>
+            </field>
+        </record>
 
-    <record id="view_cutting_tool_model_form" model="ir.ui.view">
-        <field name="name">sf.cutting.tool.model.form</field>
-        <field name="model">sf.cutting.tool.model</field>
-        <field name="arch" type="xml">
-            <form string="刀具型号">
-                <sheet>
-                    <group col='1'>
-                        <group string='基本信息'>
-                            <group>
-                                <field name="code"/>
-                                <field name="name"/>
-                                <field name="mrs_cutting_tool_material_id" options="{'no_create': True, 'no_quick_create': True}"/>
-                                <field name="mrs_machine_brand_id" options="{'no_create': True, 'no_quick_create': True}"/>
-                                <field name="mrs_materials_model_id" options="{'no_create': True, 'no_quick_create': True}"/>
-                                <field name="mrs_cutting_tool_type_id" options="{'no_create': True, 'no_quick_create': True}"/>
+        <record id="view_cutting_tool_model_form" model="ir.ui.view">
+            <field name="name">sf.cutting.tool.model.form</field>
+            <field name="model">sf.cutting.tool.model</field>
+            <field name="arch" type="xml">
+                <form string="刀具型号">
+                    <sheet>
+                        <group col='1'>
+                            <group string='基本信息'>
+                                <group>
+                                    <field name="code"/>
+                                    <field name="name"/>
+                                    <field name="mrs_cutting_tool_material_id"
+                                           options="{'no_create': True, 'no_quick_create': True}"/>
+                                    <field name="mrs_machine_brand_id"
+                                           options="{'no_create': True, 'no_quick_create': True}"/>
+                                    <field name="mrs_materials_model_id"
+                                           options="{'no_create': True, 'no_quick_create': True}"/>
+                                    <field name="mrs_cutting_tool_type_id"
+                                           options="{'no_create': True, 'no_quick_create': True}"/>
+                                </group>
+                                <group>
+                                    <field name="image" nolabel="1" widget="image"/>
+                                </group>
                             </group>
-                            <group>
-                                <field name="image" nolabel="1" widget="image"/>
+                            <group string='参数信息'>
+                                <group>
+                                    <field name="hide_integral" invisible="1"/>
+                                    <field name="hide_blade" invisible="1"/>
+                                    <field name="hide_cutter_bar" invisible="1"/>
+                                    <field name="hide_cutter_pad" invisible="1"/>
+                                    <field name="hide_handler" invisible="1"/>
+                                    <field name="hide_chuck" invisible="1"/>
+                                    <field name="mrs_cutting_tool_material_name" invisible="1"/>
+
+                                    <field name="integral_total_length"
+                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+                                    <field name="integral_shank_length"
+                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+                                    <field name="integral_blade_length"
+                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+                                    <field name="integral_diameter"
+                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+                                    <field name="integral_blade_number"
+                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+                                    <field name="integral_accuracy"
+                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+                                    <field name="integral_hardness"
+                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+
+                                    <field name="blade_length"
+                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+                                    <field name="blade_width"
+                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+                                    <field name="blade_height"
+                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+                                    <field name="blade_top_angle"
+                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+                                    <field name="blade_front_angle"
+                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+                                    <field name="blade_rear_angle"
+                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+
+                                    <field name="bar_c_diameter"
+                                           attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
+                                    <field name="bar_total_length"
+                                           attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
+                                    <field name="bar_blade_number"
+                                           attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
+                                    <field name="bar_d_diameter"
+                                           attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
+                                    <field name="bar_wrench"
+                                           attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
+
+
+                                    <field name="pad_c_diameter"
+                                           attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
+                                    <field name="pad_total_length"
+                                           attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
+                                    <field name="pad_blade_number"
+                                           attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
+                                    <field name="pad_d_diameter"
+                                           attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
+                                    <field name="pad_wrench"
+                                           attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
+
+
+                                    <field name="handle_length"
+                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                    <field name="handle_flange_length"
+                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                    <field name="handle_flange_diameter"
+                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                    <field name="handle_weight"
+                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                    <field name="handle_body_accuracy"
+                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                    <field name="handle_clamping_diameter_min"
+                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                    <field name="handle_clamping_diameter_max"
+                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+
+
+                                    <field name="chuck_accuracy"
+                                           attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
+                                    <field name="chuck_diameter"
+                                           attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
+                                    <field name="chuck_inner_diameter"
+                                           attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
+                                    <field name="chuck_height"
+                                           attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
+
+
+                                </group>
+                                <group>
+
+                                    <field name="integral_front_angle"
+                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+                                    <field name="integral_rear_angle"
+                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+                                    <field name="integral_main_included_angle"
+                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+                                    <field name="integral_coating_material"
+                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+                                    <field name="integral_nut"
+                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+                                    <field name="integral_scope"
+                                           attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
+
+
+                                    <field name="blade_main_included_angle"
+                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+                                    <field name="blade_r_angle"
+                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+                                    <field name="blade_coating_material"
+                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+                                    <field name="blade_hardness"
+                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+                                    <field name="blade_radius"
+                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+                                    <field name="blade_nut"
+                                           attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
+
+
+                                    <field name="bar_screw"
+                                           attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
+                                    <field name="bar_radius"
+                                           attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
+                                    <field name="bar_hardness"
+                                           attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
+                                    <field name="bar_scope"
+                                           attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
+
+
+                                    <field name="pad_screw"
+                                           attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
+                                    <field name="pad_radius"
+                                           attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
+                                    <field name="pad_accuracy"
+                                           attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
+                                    <field name="pad_hardness"
+                                           attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
+                                    <field name="pad_scope"
+                                           attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
+
+
+                                    <field name="handle_nut"
+                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                    <field name="handle_clamping_range"
+                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                    <field name="handle_detection_accuracy"
+                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                    <field name="handle_detection_hardness"
+                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                    <field name="handle_standard_speed"
+                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                    <field name="handle_jump_accuracy"
+                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+                                    <field name="handle_max_speed"
+                                           attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
+
+                                    <field name="chuck_nut"
+                                           attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
+                                    <field name="chuck_clamping_range"
+                                           attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
+                                    <field name="chuck_feature"
+                                           attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
+                                </group>
+                            </group>
+                            <group string='其他信息'>
+                                <group>
+                                    <field name="mrs_cutting_tool_model_blade_cutter_bar_ids" widget="many2many_tags"
+                                           options="{'no_create': True, 'no_quick_create': True}"
+                                           attrs="{'invisible': [('hide_blade', '=', False)]}"/>
+                                    <field name="mrs_cutting_tool_model_bar_blade_ids" widget="many2many_tags"
+                                           options="{'no_create': True, 'no_quick_create': True}"
+                                           attrs="{'invisible': [('hide_cutter_bar', '=', False)]}"/>
+                                    <field name="mrs_cutting_tool_model_pad_blade_ids" widget="many2many_tags"
+                                           options="{'no_create': True, 'no_quick_create': True}"
+                                           attrs="{'invisible': [('hide_cutter_pad', '=', False)]}"/>
+                                    <field name="mrs_cutting_tool_model_handle_chuck_model_ids" widget="many2many_tags"
+                                           options="{'no_create': True, 'no_quick_create': True}"
+                                           attrs="{'invisible': [('hide_handler', '=', False)]}"/>
+                                    <field name="mrs_cutting_tool_model_chuck_handle_model_ids" widget="many2many_tags"
+                                           options="{'no_create': True, 'no_quick_create': True}"
+                                           attrs="{'invisible': [('hide_chuck', '=', False)]}"/>
+                                </group>
+                                <group>
+                                    <field name="mrs_cutting_tool_model_blade_cutter_pad_ids" widget="many2many_tags"
+                                           options="{'no_create': True, 'no_quick_create': True}"
+                                           attrs="{'invisible': [('hide_blade', '=', False)]}"/>
+                                </group>
                             </group>
                         </group>
-                        <group string='参数信息'>
-                             <group>
-                                <field name="hide_integral" invisible="1"/>
-                                <field name="hide_blade" invisible="1"/>
-                                <field name="hide_cutter_bar" invisible="1"/>
-                                <field name="hide_cutter_pad" invisible="1"/>
-                                <field name="hide_handler" invisible="1"/>
-                                <field name="hide_chuck" invisible="1"/>
-                                <field name="mrs_cutting_tool_material_name" invisible="1"/>
+                    </sheet>
+                </form>
+            </field>
+        </record>
 
-                                <field name="integral_total_length" attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-                                <field name="integral_shank_length" attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-                                <field name="integral_blade_length" attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-                                <field name="integral_diameter" attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-                                <field name="integral_blade_number" attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-                                <field name="integral_accuracy" attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-                                <field name="integral_hardness" attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-
-                                <field name="blade_length" attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-                                <field name="blade_width" attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-                                <field name="blade_height" attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-                                <field name="blade_top_angle" attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-                                <field name="blade_front_angle" attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-                                <field name="blade_rear_angle" attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-
-                                <field name="bar_c_diameter" attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
-                                <field name="bar_total_length" attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
-                                <field name="bar_blade_number" attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
-                                <field name="bar_d_diameter" attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
-                                <field name="bar_wrench" attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
+        <!--     刀具型号搜索 -->
+        <record id="view_cutting_tool_model_search" model="ir.ui.view">
+            <field name="name">sf.cutting.tool.model.search</field>
+            <field name="model">sf.cutting.tool.model</field>
+            <field name="arch" type="xml">
+                <search string="刀具型号">
+                    <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
+                    <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
+                    <searchpanel class="account_root">
+                        <field name="mrs_cutting_tool_material_id" icon="fa-filter"/>
+                    </searchpanel>
+                </search>
+            </field>
+        </record>
 
 
-                                <field name="pad_c_diameter" attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
-                                <field name="pad_total_length" attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
-                                <field name="pad_blade_number" attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
-                                <field name="pad_d_diameter" attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
-                                <field name="pad_wrench" attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
+        <!-- ================================================刀具类型================================================ -->
+        <record id="view_cutting_tool_type_tree" model="ir.ui.view">
+            <field name="name">sf.cutting.tool.type.tree</field>
+            <field name="model">sf.cutting.tool.type</field>
+            <field name="arch" type="xml">
+                <tree string="刀具类型" create="0" edit="0" delete="0">
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="mrs_cutting_tool_material_id"/>
+                    <field name="remark"/>
+                </tree>
+            </field>
+        </record>
 
+        <!--    <record id="view_cutting_tool_type_form" model="ir.ui.view">-->
+        <!--        <field name="name">sf.cutting.tool.type.form</field>-->
+        <!--        <field name="model">sf.cutting.tool.type</field>-->
+        <!--        <field name="arch" type="xml">-->
+        <!--            <form string="刀具类型">-->
+        <!--                <sheet>-->
+        <!--                    <group string="刀具类型">-->
+        <!--                    <group>-->
+        <!--                        <field name="code"/>-->
+        <!--                        <field name="name"/>-->
+        <!--                        <field name="mrs_cutting_tool_material_id" options="{'no_create': True, 'no_quick_create': True}"/>-->
+        <!--                    </group>-->
+        <!--                    <group>-->
+        <!--                        <field name="remark"/>-->
+        <!--                    </group>-->
+        <!--                    </group>-->
+        <!--                </sheet>-->
+        <!--            </form>-->
+        <!--        </field>-->
+        <!--    </record>-->
 
-                                <field name="handle_length" attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                <field name="handle_flange_length" attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                <field name="handle_flange_diameter" attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                <field name="handle_weight" attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                <field name="handle_body_accuracy" attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                <field name="handle_clamping_diameter_min" attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                <field name="handle_clamping_diameter_max" attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-
-
-                                <field name="chuck_accuracy" attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
-                                <field name="chuck_diameter" attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
-                                <field name="chuck_inner_diameter" attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
-                                <field name="chuck_height" attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
-
-
-                             </group>
-                             <group>
-
-                                <field name="integral_front_angle" attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-                                <field name="integral_rear_angle" attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-                                <field name="integral_main_included_angle" attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-                                <field name="integral_coating_material" attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-                                <field name="integral_nut" attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-                                <field name="integral_scope" attrs="{'invisible': [('hide_integral', '=', False)], 'required': [('hide_integral', '!=', False)]}"/>
-
-
-                                <field name="blade_main_included_angle" attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-                                <field name="blade_r_angle" attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-                                <field name="blade_coating_material" attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-                                <field name="blade_hardness" attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-                                <field name="blade_radius" attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-                                <field name="blade_nut" attrs="{'invisible': [('hide_blade', '=', False)], 'required': [('hide_blade', '!=', False)]}"/>
-
-
-                                <field name="bar_screw" attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
-                                <field name="bar_radius" attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
-                                <field name="bar_hardness" attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
-                                <field name="bar_scope" attrs="{'invisible': [('hide_cutter_bar', '=', False)], 'required': [('hide_cutter_bar', '!=', False)]}"/>
-
-
-                                <field name="pad_screw" attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
-                                <field name="pad_radius" attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
-                                <field name="pad_accuracy" attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
-                                <field name="pad_hardness" attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
-                                <field name="pad_scope" attrs="{'invisible': [('hide_cutter_pad', '=', False)], 'required': [('hide_cutter_pad', '!=', False)]}"/>
-
-
-                                <field name="handle_nut" attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                <field name="handle_clamping_range" attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                <field name="handle_detection_accuracy" attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                <field name="handle_detection_hardness" attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                <field name="handle_standard_speed" attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                <field name="handle_jump_accuracy" attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-                                <field name="handle_max_speed" attrs="{'invisible': [('hide_handler', '=', False)], 'required': [('hide_handler', '!=', False)]}"/>
-
-                                <field name="chuck_nut" attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
-                                <field name="chuck_clamping_range" attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
-                                <field name="chuck_feature" attrs="{'invisible': [('hide_chuck', '=', False)], 'required': [('hide_chuck', '!=', False)]}"/>
-                             </group>
-                        </group>
-                        <group string='其他信息'>
-                            <group>
-                                <field name="mrs_cutting_tool_model_blade_cutter_bar_ids" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}" attrs="{'invisible': [('hide_blade', '=', False)]}"/>
-                                <field name="mrs_cutting_tool_model_bar_blade_ids" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}" attrs="{'invisible': [('hide_cutter_bar', '=', False)]}"/>
-                                <field name="mrs_cutting_tool_model_pad_blade_ids" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}" attrs="{'invisible': [('hide_cutter_pad', '=', False)]}"/>
-                                <field name="mrs_cutting_tool_model_handle_chuck_model_ids" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}" attrs="{'invisible': [('hide_handler', '=', False)]}"/>
-                                <field name="mrs_cutting_tool_model_chuck_handle_model_ids" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}" attrs="{'invisible': [('hide_chuck', '=', False)]}"/>
-                            </group>
-                            <group>
-                                <field name="mrs_cutting_tool_model_blade_cutter_pad_ids" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}" attrs="{'invisible': [('hide_blade', '=', False)]}"/>
-                            </group>
-                        </group>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-<!--     刀具型号搜索 -->
-    <record id="view_cutting_tool_model_search" model="ir.ui.view">
-        <field name="name">sf.cutting.tool.model.search</field>
-        <field name="model">sf.cutting.tool.model</field>
-        <field name="arch" type="xml">
-            <search string="刀具型号">
-                <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
-                <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
-                <searchpanel class="account_root">
-                    <field name="mrs_cutting_tool_material_id" icon="fa-filter"/>
-                </searchpanel>
-            </search>
-        </field>
-    </record>
-
-
-<!-- ================================================刀具类型================================================ -->
-    <record id="view_cutting_tool_type_tree" model="ir.ui.view">
-        <field name="name">sf.cutting.tool.type.tree</field>
-        <field name="model">sf.cutting.tool.type</field>
-        <field name="arch" type="xml">
-            <tree string="刀具类型">
-                <field name="code"/>
-                <field name="name"/>
-                <field name="mrs_cutting_tool_material_id"/>
-                <field name="remark"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_cutting_tool_type_form" model="ir.ui.view">
-        <field name="name">sf.cutting.tool.type.form</field>
-        <field name="model">sf.cutting.tool.type</field>
-        <field name="arch" type="xml">
-            <form string="刀具类型">
-                <sheet>
-                    <group string="刀具类型">
-                    <group>
-                        <field name="code"/>
-                        <field name="name"/>
-                        <field name="mrs_cutting_tool_material_id" options="{'no_create': True, 'no_quick_create': True}"/>
-                    </group>
-                    <group>
-                        <field name="remark"/>
-                    </group>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-<!--     刀具类型搜索 -->
-    <record id="view_cutting_tool_type_search" model="ir.ui.view">
-        <field name="name">sf.cutting.tool.type.search</field>
-        <field name="model">sf.cutting.tool.type</field>
-        <field name="arch" type="xml">
-            <search string="刀具类型">
-                <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
-                <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
-                <searchpanel class="account_root">
-                    <field name="mrs_cutting_tool_material_id" icon="fa-filter"/>
-                </searchpanel>
-            </search>
-        </field>
-    </record>
+        <!--     刀具类型搜索 -->
+        <record id="view_cutting_tool_type_search" model="ir.ui.view">
+            <field name="name">sf.cutting.tool.type.search</field>
+            <field name="model">sf.cutting.tool.type</field>
+            <field name="arch" type="xml">
+                <search string="刀具类型">
+                    <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
+                    <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
+                    <searchpanel class="account_root">
+                        <field name="mrs_cutting_tool_material_id" icon="fa-filter"/>
+                    </searchpanel>
+                </search>
+            </field>
+        </record>
 
     </data>
 </odoo>
diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index e7bd62a9..3fcdcf1b 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -278,7 +278,7 @@
                                        attrs='{"invisible": [("fixture_material_type","!=",("转接板(锁板)托盘"))]}'/>
                                 <field name="fixture_driving_way"
                                        attrs='{"invisible": [("fixture_material_type","not in",("虎钳托盘","零点卡盘"))]}'/>
-                                <field name="fixture_apply_machine_tool_type_id"
+                                <field name="fixture_apply_machine_tool_type_ids"
                                        attrs='{"invisible": [("fixture_material_type","!=",("零点卡盘"))]}'/>
                             </group>
                         </group>
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 710fdb63..85f8313f 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -147,7 +147,8 @@ class ResProductMo(models.Model):
     fixture_maximum_carrying_weight = fields.Float(string="最大承载重量[kg]", digits=(16, 4))
     fixture_maximum_clamping_force = fields.Integer(string="最大夹持力[n]", size=8)
     fixture_driving_way = fields.Char(string="驱动方式")
-    fixture_apply_machine_tool_type_id = fields.Many2one('sf.machine_tool.type', string="适用机床型号")
+    fixture_apply_machine_tool_type_ids = fields.Many2many('sf.machine_tool.type', 'rel_product_machine_tool_type',
+                                                           string="适用机床型号")
     fixture_through_hole_size = fields.Integer(string="过孔大小[mm]", size=6)
     fixture_screw_size = fields.Integer(string="螺牙大小[mm]", size=6)
 
@@ -205,7 +206,7 @@ class ResProductMo(models.Model):
                     item.fixture_clamp_workpiece_width_max = item.fixture_model_id.clamp_workpiece_width_max
                     item.fixture_clamp_workpiece_height_max = item.fixture_model_id.clamp_workpiece_height_max
                     item.fixture_clamp_workpiece_diameter_max = item.fixture_model_id.clamp_workpiece_diameter_max
-                    item.fixture_apply_machine_tool_type_id = item.fixture_model_id.apply_machine_tool_type_id.id
+                    item.fixture_apply_machine_tool_type_id = self._get_ids(item.fixture_model_id.apply_machine_tool_type_ids)
 
     @api.onchange('cutting_tool_model_id')
     def _onchange_cutting_tool_model_id(self):