Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug

# Conflicts:
#	sf_base/views/base_view.xml
#	sf_mrs_connect/models/sync_common.py

mrp_workorder/static/src/scss/table_custom.scss

@@ -7,7 +7,7 @@
 }
 
 html .o_web_client > .o_action_manager > .o_action {
-  height: unset !important;
+  //height: unset !important;
   overflow: scroll !important;
 }
 
@@ -26,3 +26,7 @@ html .o_web_client > .o_action_manager > .o_action {
   background-color: unset !important;
   min-height: unset !important;
 }
+
+.o_form_view .o_form_view_container {
+  height: unset !important;
+}

sf_base/models/base.py

@@ -36,10 +36,10 @@ class MachineBrand(models.Model):
     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)
 
+    
 # 机床
 class MachineTool(models.Model):
     _name = 'sf.machine_tool'
@@ -316,6 +316,7 @@ class MachineToolCategory(models.Model):
     code = fields.Char('编码')
     name = fields.Char('名称')
     remark = fields.Text('备注')
+    active = fields.Boolean('有效', default=True)
     category = fields.Selection([('shukong', u'数控'), ('putong', u'普通')], string=u'机床类别',
                              default='shukong')
 

sf_base/models/fixture.py

@@ -1,8 +1,4 @@
 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):
@@ -36,7 +32,6 @@ class FixtureModel(models.Model):
     fixture_material_type = fields.Char(string="夹具物料类型", related='fixture_material_id.name', store=True)
     multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型")
     brand_id = fields.Many2one('sf.machine.brand', string="品牌")
-    manufacturer_model_number = fields.Char(string="厂家型号")
     clamping_way = fields.Char(string="装夹方式")
     port_type = fields.Char(string="接口类型")
     model_file = fields.Binary(string="3D模型图")
@@ -56,5 +51,7 @@ class FixtureModel(models.Model):
                                                    string="适用机床型号")
     through_hole_size = fields.Integer(string="过孔大小[mm]", size=6)
     screw_size = fields.Integer(string="螺牙大小[mm]", size=6)
+    active = fields.Boolean('有效', default=True)
+
 
 

sf_base/models/fixture_base.py

@@ -1,240 +0,0 @@
-from odoo import models, fields
-
-'''============================定位元件型号====================================='''
-
-
-class FixtureSettingElement(models.Model):
-    _name = 'sf.fixture.setting.element'
-    _description = "定位元件型号"
-
-    code = fields.Char(string='编码', readonly=True)
-    name = fields.Char(string="型号名称", readonly=True)
-    setting_ele_type_id = fields.Many2one('sf.setting.element.type', string="定位元件类型", readonly=True)
-    brand_id = fields.Many2one('sf.machine.brand', string="品牌", readonly=True)
-
-    length = fields.Char(string='长度(mm)', readonly=True)
-    width = fields.Char(string='宽度(mm)', readonly=True)
-    height = fields.Char(string='高度(mm)', readonly=True)
-    diameter = fields.Char(string='直径(mm)', readonly=True)
-
-    material_type_id = fields.Many2one('sf.materials.model', string='材料型号', readonly=True)
-    hardness = fields.Char(string='硬度(°)', readonly=True)
-    chucking_power = fields.Char(string='夹持力', readonly=True)
-    surface_treatment = fields.Char(string='表面处理', readonly=True)
-    accuracy_grade = fields.Char(string='精度等级', readonly=True)
-
-    picture = fields.Binary(string="图片", readonly=True)
-    comment = fields.Text(string='备注', readonly=True)
-
-
-'''=============================定位原件类型============================================='''
-
-
-class SettingElementType(models.Model):
-    _name = 'sf.setting.element.type'
-    _description = "定位原件类型"
-
-    code = fields.Char(string='编码', readonly=True)
-    name = fields.Char(string='定位原件类型', readonly=True)
-    comment = fields.Text(string='备注', readonly=True)
-
-
-'''==============================夹紧元件型号=============================================='''
-
-
-class FixtureClampingElement(models.Model):
-    _name = 'sf.fixture.clamping.element'
-    _description = "夹紧元件型号"
-
-    code = fields.Char(string='编码', readonly=True)
-    name = fields.Char(string="型号名称", readonly=True)
-    clamping_ele_type_id = fields.Many2one('sf.clamping.element.type', string="夹紧元件类型", readonly=True)
-    brand_id = fields.Many2one('sf.machine.brand', string="品牌", readonly=True)
-
-    length = fields.Char(string='长度(mm)', readonly=True)
-    width = fields.Char(string='宽度(mm)', readonly=True)
-    height = fields.Char(string='高度(mm)', readonly=True)
-    diameter = fields.Char(string='直径(mm)', readonly=True)
-
-    material_type_id = fields.Many2one('sf.materials.model', string='材料型号', readonly=True)
-    hardness = fields.Char(string='硬度(°)', readonly=True)
-    chucking_power = fields.Char(string='夹持力', readonly=True)
-    surface_treatment = fields.Char(string='夹持方式', readonly=True)
-    accuracy_grade = fields.Char(string='精度等级', readonly=True)
-
-    picture = fields.Binary(string="图片", readonly=True)
-    comment = fields.Text(string='备注', readonly=True)
-
-
-'''============================夹紧元件类型======================================='''
-
-
-# 夹紧元件类型
-class ClampingElementType(models.Model):
-    _name = "sf.clamping.element.type"
-    _description = "夹紧元件类型"
-
-    code = fields.Char(string='编码', readonly=True)
-    name = fields.Char(name='夹紧元件类型', readonly=True)
-    comment = fields.Text(string='备注', readonly=True)
-
-
-'''=========================对刀夹具型号====================================='''
-
-
-class FixtureToolSetting(models.Model):
-    _name = 'sf.fixture.tool.setting'
-    _description = "对刀夹具型号"
-
-    code = fields.Char(string='编码', readonly=True)
-    name = fields.Char(string="型号名称", readonly=True)
-    tool_setting_type_id = fields.Many2one('sf.tool.setting.type', string="对刀夹具类型", readonly=True)
-    brand_id = fields.Many2one('sf.machine.brand', string="品牌", readonly=True)
-
-    length = fields.Char(string='长度(mm)', readonly=True)
-    width = fields.Char(string='宽度(mm)', readonly=True)
-    height = fields.Char(string='高度(mm)', readonly=True)
-    diameter = fields.Char(string='直径(mm)', readonly=True)
-
-    material_type_id = fields.Many2one('sf.materials.model', string='材料型号', readonly=True)
-    hardness = fields.Char(string='硬度(°)', readonly=True)
-    chucking_power = fields.Char(string='夹持力', readonly=True)
-    clamp_mode = fields.Char(string='夹持方式', readonly=True)
-    accuracy_grade = fields.Char(string='精度等级', readonly=True)
-    max_clamp_diameter = fields.Char('最大夹持直接(mm)', readonly=True)
-
-    picture = fields.Binary(string="图片", readonly=True)
-    comment = fields.Text(string='备注', readonly=True)
-
-
-'''===========================对刀夹具类型=========================================='''
-
-
-class ToolSettingType(models.Model):
-    _name = 'sf.tool.setting.type'
-    _description = "对刀夹具类型"
-
-    code = fields.Char('编码', readonly=True)
-    name = fields.Char(string='对刀夹具类型', readonly=True)
-    comment = fields.Text(string='备注', readonly=True)
-
-
-'''==========================定位装置型号======================================='''
-
-
-class FixtureLocatingDevice(models.Model):
-    _name = 'sf.fixture.locating.device'
-    _description = "定位装置型号"
-
-    code = fields.Char(string='编码', readonly=True)
-    name = fields.Char(string="型号名称", readonly=True)
-    locating_device_type_id = fields.Many2one('sf.locating.device.type', string="定位装置类型", readonly=True)
-    brand_id = fields.Many2one('sf.machine.brand', string="品牌", readonly=True)
-
-    length = fields.Char(string='长度(mm)', readonly=True)
-    width = fields.Char(string='宽度(mm)', readonly=True)
-    height = fields.Char(string='高度(mm)', readonly=True)
-    diameter = fields.Char(string='直径(mm)', readonly=True)
-
-    material_type_id = fields.Many2one('sf.materials.model', string='材料型号', readonly=True)
-    weight = fields.Char(string='重量(kg)', readonly=True)
-    accuracy_grade = fields.Char(string='精度等级', readonly=True)
-    locate_mode_ids = fields.Many2many('sf.locating.device.locate.mode', string='定位装置定位方式', readonly=True)
-    max_bearing_capacity = fields.Char(string='最大承载力', readonly=True)
-
-    picture = fields.Binary(string="图片", readonly=True)
-    comment = fields.Text(string='备注', readonly=True)
-
-
-'''==============================定位装置类型================================'''
-
-
-# 定位装置型号
-class LocatingDeviceType(models.Model):
-    _name = 'sf.locating.device.type'
-    _description = "定位装置类型"
-
-    code = fields.Char('编码', readonly=True)
-    name = fields.Char(string='定位装置类型', readonly=True)
-    comment = fields.Text(string='备注', readonly=True)
-
-
-'''============================定位装置定位方式========================================'''
-
-
-# 定位装置定位方式
-class LocatingDeviceLocateMode(models.Model):
-    _name = 'sf.locating.device.locate.mode'
-    _description = "定位装置定位方式"
-
-    code = fields.Char('编码', readonly=True)
-    name = fields.Char('定位方式', readonly=True)
-    name_id = fields.Many2many('sf.fixture.locating.device', string='定位装置', readonly=True)
-    comment = fields.Text(string='备注', readonly=True)
-
-
-'''===========================导向元件型号===================================='''
-
-
-class FixtureGuideElement(models.Model):
-    _name = 'sf.fixture.guide.element'
-    _description = "导向元件型号"
-
-    code = fields.Char(string='编码', readonly=True)
-    name = fields.Char(string="型号名称", readonly=True)
-    guide_ele_type_id = fields.Many2one('sf.guide.element.type', string="导向元件类型", readonly=True)
-    brand_id = fields.Many2one('sf.machine.brand', string="品牌", readonly=True)
-
-    length = fields.Char(string='长度(mm)', readonly=True)
-    width = fields.Char(string='宽度(mm)', readonly=True)
-    height = fields.Char(string='高度(mm)', readonly=True)
-    diameter = fields.Char(string='直径(mm)', readonly=True)
-
-    material_type_id = fields.Many2one('sf.materials.model', string='材料型号', readonly=True)
-    weight = fields.Char(string='重量', readonly=True)
-    accuracy_grade = fields.Char(string='精度等级', readonly=True)
-    guide_ele_guide_mode_id = fields.Many2many('sf.guide.element.guide.mode', string='导向元件导向方式', readonly=True)
-    scope_of_application = fields.Char(string='适用范围', readonly=True)
-    guide_ele_way_to_install_id = fields.Many2many('sf.guide.element.way.to.install', string='导向元件安装方式',
-                                                   readonly=True)
-
-    picture = fields.Binary(string="图片", readonly=True)
-    comment = fields.Text(string='备注', readonly=True)
-
-
-'''=============================导向元件类型============================================'''
-
-
-class GuideElementType(models.Model):
-    _name = 'sf.guide.element.type'
-    _description = "导向元件类型"
-
-    code = fields.Char(string='编码', readonly=True)
-    name = fields.Char(string="导向元件类型", readonly=True)
-    comment = fields.Text(string='备注', readonly=True)
-
-
-'''================================导向元件导向方式=========================================='''
-
-
-class GuideElementGuideMode(models.Model):
-    _name = 'sf.guide.element.guide.mode'
-    _description = "导向元件导向方式"
-
-    code = fields.Char(string='编码', readonly=True)
-    name = fields.Char(string="导向元件导向方式", readonly=True)
-    name_id = fields.Many2many('sf.fixture.guide.element', string='导向元件', readonly=True)
-    comment = fields.Text(string='备注', readonly=True)
-
-
-'''=============================导向元件安装方式==========================================='''
-
-
-class GuideElementWayToInstall(models.Model):
-    _name = 'sf.guide.element.way.to.install'
-    _description = '导向元件安装方式'
-
-    code = fields.Char(string='编码', readonly=True)
-    name = fields.Char(string="导向元件安装方式", readonly=True)
-    name_id = fields.Many2many('sf.fixture.guide.element', string='导向元件', readonly=True)
-    comment = fields.Text(string='备注', readonly=True)

sf_base/models/functional_fixture.py

@@ -37,7 +37,7 @@ class FunctionalFixture(models.Model):
     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)
-
+    active = fields.Boolean('有效', default=True)
 
     @api.onchange('type_id')
     def _onchange_type_id(self):

sf_base/models/tool_base.py

@@ -15,6 +15,7 @@ class CuttingToolMaterial(models.Model):
     code = fields.Char('编码')
     name = fields.Char('名称')
     remark = fields.Char('备注')
+    active = fields.Boolean('有效', default=True)
 
 
 # 功能刀具
@@ -43,6 +44,7 @@ class FunctionalCuttingTool(models.Model):
     is_standard = fields.Boolean('是否标准刀')
     applicable_range = fields.Char('适用范围')
     image = fields.Binary('图片')
+    active = fields.Boolean('有效', default=True)
 
 
 # 功能刀具类型
@@ -53,6 +55,7 @@ class FunctionalCuttingToolModel(models.Model):
     name = fields.Char('名称')
     code = fields.Char('编码')
     remark = fields.Char('备注')
+    active = fields.Boolean('有效', default=True)
 
 
 # 整体式刀具
@@ -82,6 +85,7 @@ class IntegralCuttingTool(models.Model):
     chuck_model = fields.Many2many('sf.chuck', string='适用夹头型号')
     scope = fields.Char('适用范围')
     image = fields.Binary('图片')
+    active = fields.Boolean('有效', default=True)
 
 
 # 整体式刀具类型

sf_base/models/tool_base_new.py

@@ -12,6 +12,7 @@ class CuttingToolMaterial(models.Model):
     code = fields.Char('编码')
     name = fields.Char('名称')
     remark = fields.Char('备注')
+    active = fields.Boolean('有效', default=True)
 
 
 # 功能刀具
@@ -21,57 +22,60 @@ class FunctionalCuttingTool(models.Model):
 
     code = fields.Char('编码')
     name = fields.Char('名称')
+    active = fields.Boolean('有效', default=True)
     mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型')
     mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', string='刀具型号')
 
-    # 整体式刀具型号
-    mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', 'rel_integral_model_functional_sf',
-                                                            string='整体式刀具型号', domain=
-                                                            [('mrs_cutting_tool_material_name', '=', '整体式刀具')])
-    # 刀片型号
-    mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'rel_blade_model_functional_sf',
-                                                         string='刀片型号', domain=
-                                                         [('mrs_cutting_tool_material_name', '=', '刀片')])
-    # 刀杆型号
-    mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
-                                                             'rel_cutterbar_model_functional_sf',
-                                                             string='刀杆型号', domain=
-                                                             [('mrs_cutting_tool_material_name', '=', '刀杆')])
-    # 刀盘型号
-    mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
-                                                             'rel_cutterpad_model_functional_sf',
-                                                             string='刀盘型号', domain=
-                                                             [('mrs_cutting_tool_material_name', '=', '刀盘')])
-    # 刀柄型号
-    mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
-                                                                'rel_cutterhandle_model_functional_sf', string='刀柄型号',
-                                                                domain=
-                                                                [('mrs_cutting_tool_material_name', '=', '刀柄')])
-    # 夹头型号
-    mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
-                                                              'rel_cutterhead_model_functional_sf',
-                                                              string='夹头型号', domain=
-                                                              [('mrs_cutting_tool_material_name', '=', '夹头')])
-
-    diameter = fields.Float('直径(mm)')
-    tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
-                                  string='刀具等级')
-    machining_accuracy = fields.Float('加工精度(mm)')
-    tool_length = fields.Float('装刀长')
-    blade_number = fields.Integer('刃数')
-    integral_blade_length = fields.Float('整体刃长(mm)')
-    effective_blade_length = fields.Float('有效刃长(mm)')
-    max_life = fields.Float('最大寿命值')
-    is_standard = fields.Boolean('是否标准刀')
-    applicable_range = fields.Char('适用范围')
-    image = fields.Binary('图片')
-
-    def _get_functional_tool_model_ids(self, functional_tool_model_code):
-        functional_tool_model_ids = []
-        for item in functional_tool_model_code:
-            functional_tool_model = self.env['sf.cutting.tool.model'].search([('code', '=', item)])
-            functional_tool_model_ids.append(functional_tool_model.id)
-        return [(6, 0, functional_tool_model_ids)]
+    # # 整体式刀具型号
+    # mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', 'rel_integral_model_functional_sf',
+    #                                                        string='整体式刀具型号', domain=
+    #                                                        [('cutting_tool_type', '=', '整体式刀具')])
+    # # 刀片型号
+    # mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'rel_blade_model_functional_sf',
+    #                                                     string='刀片型号', domain=
+    #                                                     [('cutting_tool_type', '=', '刀片')])
+    # # 刀杆型号
+    # mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
+    #                                                         'rel_cutterbar_model_functional_sf',
+    #                                                         string='刀杆型号', domain=
+    #                                                         [('cutting_tool_type', '=', '刀杆')])
+    # # 刀盘型号
+    # mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
+    #                                                         'rel_cutterpad_model_functional_sf',
+    #                                                         string='刀盘型号', domain=
+    #                                                         [('cutting_tool_type', '=', '刀盘')])
+    # # 刀柄型号
+    # mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
+    #                                                            'rel_cutterhandle_model_functional_sf',
+    #                                                            string='刀柄型号',
+    #                                                            domain=
+    #                                                            [('cutting_tool_type', '=', '刀柄')])
+    # # 夹头型号
+    # mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
+    #                                                          'rel_cutterhead_model_functional_sf',
+    #                                                          string='夹头型号', domain=
+    #                                                          [('cutting_tool_type', '=', '夹头')])
+    #
+    # diameter = fields.Float('直径(mm)')
+    # tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
+    #                               string='刀具等级')
+    # machining_accuracy = fields.Float('加工精度(mm)')
+    # tool_length = fields.Float('装刀长')
+    # blade_number = fields.Integer('刃数')
+    # integral_blade_length = fields.Float('整体刃长(mm)')
+    # effective_blade_length = fields.Float('有效刃长(mm)')
+    # max_life = fields.Float('最大寿命值')
+    # is_standard = fields.Boolean('是否标准刀')
+    # applicable_range = fields.Char('适用范围')
+    # image = fields.Binary('图片')
+    # active = fields.Boolean('有效', default=True)
+    #
+    # def _get_functional_tool_model_ids(self, functional_tool_model_code):
+    #     functional_tool_model_ids = []
+    #     for item in functional_tool_model_code:
+    #         functional_tool_model = self.env['sf.cutting.tool.model'].search([('code', '=', item)])
+    #         functional_tool_model_ids.append(functional_tool_model.id)
+    #     return [(6, 0, functional_tool_model_ids)]
 
 
 # 功能刀具类型
@@ -82,6 +86,7 @@ class FunctionalCuttingToolModel(models.Model):
     name = fields.Char('名称', required=True)
     code = fields.Char('编码', required=True)
     remark = fields.Char('备注')
+    active = fields.Boolean('有效', default=True)
 
 
 # 刀具型号
@@ -91,214 +96,93 @@ class CuttingToolModel(models.Model):
 
     name = fields.Char('名称')
     code = fields.Char('编码')
-    mrs_machine_brand_id = fields.Many2one('sf.machine.brand', '品牌')
-    mrs_materials_model_id = fields.Many2one('sf.materials.model', '材料型号')
-    # 关联刀具物料
-    mrs_cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料', required=True)
-    # 关联刀具物料名称
-    mrs_cutting_tool_material_name = fields.Char(related='mrs_cutting_tool_material_id.name', string='刀具物料名称',
-                                                 store=True)
-    # 关联刀具类型
-    mrs_cutting_tool_type_id = fields.Many2one(
-        'sf.cutting.tool.type', '刀具类型',
-        domain="[('mrs_cutting_tool_material_id.name', '=', mrs_cutting_tool_material_name)]", required=True)
-
-    # 整体式刀具特有字段
-    integral_code = fields.Char('整体式刀具编码')
-    integral_accuracy = fields.Float('精度(μm)')
-    integral_hardness = fields.Float('加工硬度(HRC)')
-    integral_coating_material = fields.Char('涂层材质')
-    integral_total_length = fields.Float('总长度(mm)')
-    integral_shank_length = fields.Float('柄部长度(mm)')
-    integral_blade_length = fields.Float('刃部长度(mm)')
-    integral_diameter = fields.Float('直径(mm)')
-    integral_blade_number = fields.Integer('刃数')
-    integral_front_angle = fields.Float('前角(°)')
-    integral_rear_angle = fields.Float('后角(°)')
-    integral_main_included_angle = fields.Float('主偏角(°)')
-    integral_nut = fields.Float('配对螺母(mm)')
-    integral_scope = fields.Char('适用范围')
-
-    # 刀片特有字段
-    blade_code = fields.Char('刀片编码')
-    blade_coating_material = fields.Char('涂层材质')
-    blade_length = fields.Float('长度L(mm)')
-    blade_width = fields.Float('宽度D(mm)')
-    blade_height = fields.Float('高度T(mm)')
-    blade_top_angle = fields.Float('顶角(°)')
-    blade_front_angle = fields.Float('前角(°)')
-    blade_rear_angle = fields.Float('后角(°)')
-    blade_main_included_angle = fields.Float('主偏角(°)')
-    blade_r_angle = fields.Float('R角(°)')
-    blade_hardness = fields.Char('加工硬度')
-    blade_accuracy = fields.Char('精度等级')
-    blade_radius = fields.Float('刀尖半径(mm)')
-    blade_nut = fields.Float('配对螺母(mm)')
-    mrs_cutting_tool_model_blade_cutter_bar_ids = fields.Many2many(
+    cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', string='刀具物料')
+    cutting_tool_type = fields.Char(string="刀具物料类型", related='cutting_tool_material_id.name', store=True)
+    cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', string='刀具类型',
+                                           )
+    brand_id = fields.Many2one('sf.machine.brand', '品牌')
+    tool_length = fields.Integer('长度(mm)', size=6)
+    tool_width = fields.Integer('宽度(mm)', size=6)
+    tool_height = fields.Integer('高度(mm)', size=6)
+    tool_thickness = fields.Integer('厚度(mm)', size=6)
+    tool_weight = fields.Float('重量(kg)', size=4)
+    coating_material = fields.Char('涂层材质')
+    # 整体式刀具参数
+    total_length = fields.Float('总长度(mm)')
+    shank_length = fields.Float('柄部长度(mm)')
+    blade_length = fields.Float('刃部长度(mm)')
+    diameter = fields.Float('直径(mm)')
+    blade_number = fields.Integer('刃数')
+    front_angle = fields.Float('前角(°)')
+    rear_angle = fields.Float('后角(°)')
+    main_included_angle = fields.Float('主偏角(°)')
+    material_model_id = fields.Many2one('sf.materials.model', '材料型号')
+    nut = fields.Float('配对螺母(mm)')
+    # 适用夹头型号可以多选
+    chuck_ids = fields.Many2many(
         'sf.cutting.tool.model',
-        relation='sf_cutting_tool_model_blade_cutter_bar_rel',
+        relation='cutting_tool_model_handle_chuck_rel',
         column1='model_id_1',
         column2='model_id_2',
-        domain="[('mrs_cutting_tool_material_id.name', '=', '刀杆')]",
-        string='适用刀杆型号',
-        default=lambda self: [],  # 使用空列表作为默认值
-    )
-    mrs_cutting_tool_model_blade_cutter_pad_ids = fields.Many2many(
+        domain="[('cutting_tool_type', '=', '夹头')]",
+        string='适用夹头型号')
+    # 刀片参数
+    top_angle = fields.Float('顶角(°)')
+    jump_accuracy = fields.Float('径跳精度(um)')
+    working_hardness = fields.Char('加工硬度(hrc)')
+    cutter_bar_ids = fields.Many2many(
         'sf.cutting.tool.model',
-        relation='sf_cutting_tool_model_blade_cutter_pad_rel',
+        relation='cutting_tool_model_blade_cutter_bar_rel',
         column1='model_id_1',
         column2='model_id_2',
-        domain="[('mrs_cutting_tool_material_id.name', '=', '刀盘')]",
-        string='适用刀盘型号',
-        default=lambda self: [],  # 使用空列表作为默认值
+        domain="[('cutting_tool_type', '=', '刀杆')]",
+        string='适用刀杆型号'
     )
-
-    # 刀杆特有字段
-    bar_code = fields.Char('刀杆编码')
-    bar_c_diameter = fields.Float('C柄径(mm)')
-    bar_total_length = fields.Float('L总长(mm)')
-    bar_blade_number = fields.Integer('刃数')
-    bar_d_diameter = fields.Float('D刃径(mm)')
-    mrs_cutting_tool_model_bar_blade_ids = fields.Many2many(
+    cutter_pad_ids = fields.Many2many(
         'sf.cutting.tool.model',
-        relation='sf_cutting_tool_model_bar_blade_rel',
+        relation='cutting_tool_model_blade_cutter_pad_rel',
         column1='model_id_1',
         column2='model_id_2',
-        domain="[('mrs_cutting_tool_material_id.name', '=', '刀片')]",
-        string='适用刀片型号',
-        default=lambda self: [],  # 使用空列表作为默认值
+        domain="[('cutting_tool_type', '=', '刀盘')]",
+        string='适用刀盘型号'  # 使用空列表作为默认值
     )
-    bar_wrench = fields.Float('配对扳手(mm)')
-    bar_screw = fields.Float('配备螺丝(mm)')
-    bar_radius = fields.Float('刀尖圆角半径')
-    bar_accuracy = fields.Char('精度等级')
-    bar_hardness = fields.Char('硬度(°)')
-    bar_scope = fields.Char('适用范围')
-
-    # 刀盘特有字段
-    pad_code = fields.Char('刀盘编码')
-    pad_c_diameter = fields.Float('C柄径(mm)')
-    pad_total_length = fields.Float('L总长(mm)')
-    pad_blade_number = fields.Integer('刃数')
-    pad_d_diameter = fields.Float('D刃径(mm)')
-    mrs_cutting_tool_model_pad_blade_ids = fields.Many2many(
+    # 刀杆/参数
+    blade_diameter = fields.Float('刃径(mm)')
+    blade_ids = fields.Many2many(
         'sf.cutting.tool.model',
-        relation='sf_cutting_tool_model_pad_blade_rel',
+        relation='cutting_tool_model_pad_blade_rel',
         column1='model_id_1',
         column2='model_id_2',
-        domain="[('mrs_cutting_tool_material_id.name', '=', '刀片')]",
-        string='适用刀片型号',
-        default=lambda self: [],  # 使用空列表作为默认值
+        domain="[('cutting_tool_type', '=', '刀片')]",
+        string='适用刀片型号'  # 使用空列表作为默认值
     )
-    pad_wrench = fields.Float('配对扳手(mm)')
-    pad_screw = fields.Float('配备螺丝(mm)')
-    pad_radius = fields.Float('刀尖圆角半径')
-    pad_accuracy = fields.Char('精度等级')
-    pad_hardness = fields.Char('硬度(°)')
-    pad_scope = fields.Char('适用范围')
-
-    # 刀柄特有字段
-    handle_code = fields.Char('刀柄编码')
-    # 柄长L(mm)、法兰柄长L1(mm)、法兰直径D1(mm)
-    handle_length = fields.Float('柄长L(mm)')
-    handle_diameter = fields.Float('直径D(mm)')
-    handle_flange_length = fields.Float('法兰柄长L1(mm)')
-    handle_flange_diameter = fields.Float('法兰直径D1(mm)')
-    # 夹持直径min、夹持直径max、径跳精度、最大转速n/min、3D模型图
-    handle_clamping_diameter_min = fields.Float('夹持直径min')
-    handle_clamping_diameter_max = fields.Float('夹持直径max')
-    handle_jump_accuracy = fields.Float('径跳精度')
-    handle_max_speed = fields.Float('最大转速n/min')
-    handle_weight = fields.Float('重量(kg)')
-    handle_body_accuracy = fields.Float('本体精度(mm)')
-    handle_nut = fields.Float('配对螺母(mm)')
-    mrs_cutting_tool_model_handle_chuck_model_ids = fields.Many2many(
+    wrench = fields.Float('配对扳手(mm)')
+    screw = fields.Float('配备螺丝(mm)')
+    accuracy_level = fields.Char('精度等级')
+    # 刀柄参数
+    diameter_max = fields.Float('最大直径(mm)')
+    clamping_diameter = fields.Float('夹持直径(mm)')
+    flange_length = fields.Float('法兰柄长度(mm)')
+    flange_diameter = fields.Float('法兰直径(mm)')
+    # 夹头参数
+    outer_diameter = fields.Float('外径(mm)')
+    inner_diameter = fields.Float('内径(mm)')
+    handle_ids = fields.Many2many(
         'sf.cutting.tool.model',
-        relation='sf_cutting_tool_model_handle_chuck_rel',
+        relation='cutting_tool_model_chuck_handle_rel',
         column1='model_id_1',
         column2='model_id_2',
-        domain="[('mrs_cutting_tool_material_id.name', '=', '夹头')]",
-        string='适用夹头型号',
-
+        domain="[('cutting_tool_type', '=', '刀柄')]",
+        string='适用刀柄型号'
     )
-    handle_clamping_range = fields.Float('夹持范围(mm)')
-    handle_detection_accuracy = fields.Float('检测精度')
-    handle_detection_hardness = fields.Char('检测硬度')
-    handle_standard_speed = fields.Float('标准转速')
+    active = fields.Boolean('有效', default=True)
 
-    # 夹头特有字段
-    chuck_code = fields.Char('夹头编码')
-    chuck_accuracy = fields.Float('精度(mm)')
-    # 夹持直径min、夹持直径max、3D模型图
-    chuck_clamping_diameter_min = fields.Float('夹持直径min')
-    chuck_clamping_diameter_max = fields.Float('夹持直径max')
-    chuck_diameter = fields.Float('外径(mm)')
-    chuck_inner_diameter = fields.Float('内径(mm)')
-    chuck_height = fields.Float('高度(mm)')
-    chuck_nut = fields.Float('配对螺母(mm)')
-    mrs_cutting_tool_model_chuck_handle_model_ids = fields.Many2many(
-        'sf.cutting.tool.model',
-        relation='sf_cutting_tool_model_chuck_handle_rel',
-        column1='model_id_1',
-        column2='model_id_2',
-        domain="[('mrs_cutting_tool_material_id.name', '=', '刀柄')]",
-        string='适用刀柄型号',
-        default=lambda self: [],  # 使用空列表作为默认值
-    )
-    chuck_clamping_range = fields.Float('夹持范围(mm)')
-    chuck_feature = fields.Char('特性')
-
-    image = fields.Binary('图片')
-    three_d_model = fields.Many2one('ir.attachment', '3D模型')
-
-    hide_integral = fields.Boolean(compute='_compute_hide_model_number', default=False, string='隐藏整体式刀具')
-    hide_blade = fields.Boolean(compute='_compute_hide_model_number', default=False, string='隐藏刀片')
-    hide_cutter_bar = fields.Boolean(compute='_compute_hide_model_number', default=False, string='隐藏刀杆')
-    hide_cutter_pad = fields.Boolean(compute='_compute_hide_model_number', default=False, string='隐藏刀盘')
-    hide_handler = fields.Boolean(compute='_compute_hide_model_number', default=False, string='隐藏刀柄')
-    hide_chuck = fields.Boolean(compute='_compute_hide_model_number', default=False, string='隐藏夹头')
-    hide_model = fields.Boolean(compute='_compute_hide_model_number', default=True, string='隐藏型号')
-    image_is_visible = fields.Boolean(compute='_compute_image_is_visible', default=True, string='隐藏图片')
-
-    @api.depends('mrs_cutting_tool_material_id')
-    def _compute_image_is_visible(self):
-        for record in self:
-            record.image_is_visible = not (record.hide_handler or record.hide_chuck)
-
-    @api.depends('mrs_cutting_tool_material_id')
-    def _compute_hide_model_number(self):
-        """
-        根据刀具物料类型，显示不同的字段
-        """
-        for record in self:
-            record.hide_integral = False
-            record.hide_blade = False
-            record.hide_cutter_bar = False
-            record.hide_cutter_pad = False
-            record.hide_handler = False
-            record.hide_chuck = False
-            record.hide_model = True
-
-            if record.mrs_cutting_tool_material_id and record.mrs_cutting_tool_material_id.name == '整体式刀具':
-                record.hide_model = False
-                record.hide_integral = True
-            elif record.mrs_cutting_tool_material_id and record.mrs_cutting_tool_material_id.name == '刀片':
-                record.hide_model = False
-                record.hide_blade = True
-            elif record.mrs_cutting_tool_material_id and record.mrs_cutting_tool_material_id.name == '刀杆':
-                record.hide_model = False
-                record.hide_cutter_bar = True
-            elif record.mrs_cutting_tool_material_id and record.mrs_cutting_tool_material_id.name == '刀盘':
-                record.hide_model = False
-                record.hide_cutter_pad = True
-            elif record.mrs_cutting_tool_material_id and record.mrs_cutting_tool_material_id.name == '刀柄':
-                record.hide_model = False
-                record.hide_handler = True
-            elif record.mrs_cutting_tool_material_id and record.mrs_cutting_tool_material_id.name == '夹头':
-                record.hide_model = False
-                record.hide_chuck = True
-            else:
-                record.hide_model = True
+    # @api.model
+    # def create(self, vals):
+    #     if vals.get('name', '/') == '/' or vals.get('name', '/') is False:
+    #         vals['name'] = '/'
+    #     obj = super(CuttingToolModel, self).create(vals)
+    #     return obj
 
 
 # 刀具类型
@@ -309,18 +193,6 @@ class CuttingToolType(models.Model):
     code = fields.Char('编码')
     name = fields.Char('名称')
     # 关联刀具物料
-    mrs_cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    # 整体式刀具类型特有字段
-    integral_tool_type_code = fields.Char('整体式刀具类型编码')
-    # 刀片类型特有字段
-    blade_type_code = fields.Char('刀片类型编码')
-    # 刀杆类型特有字段
-    bar_type_code = fields.Char('刀杆类型编码')
-    # 刀盘类型特有字段
-    pad_type_code = fields.Char('刀盘类型编码')
-    # 刀柄类型特有字段
-    handle_type_code = fields.Char('刀柄类型编码')
-    # 夹头类型特有字段
-    chuck_type_code = fields.Char('夹头类型编码')
-
+    cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料')
     remark = fields.Char('备注')
+    active = fields.Boolean('有效', default=True)

sf_base/views/base_view.xml

@@ -10,6 +10,7 @@
                 <!--                      filter_domain="[('name', 'ilike', self)]"/>-->
                 <field name="name" string="模糊搜索"
                        filter_domain="['|',('name', 'ilike', self),('code', 'ilike', self)]"/>
+                <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
                 <group string="分组">
                     <filter name="tag_ids" string="标签" domain="[]" context="{'group_by': 'tag_ids'}"/>
                 </group>
@@ -42,21 +43,18 @@
                     <!--                <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>-->
+                    <div class="oe_title">
+                        <h1>
+                            <field name="code" readonly="1"/>
+                        </h1>
+                    </div>
                     <group>
                         <group>
-                            <field name="code"/>
-                            <field name="name"/>
+                            <field name="name" string="名称"/>
                             <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>
@@ -81,6 +79,8 @@
             <search string="机床型号">
                 <field name="name" string="模糊搜索"
                        filter_domain="['|',('name', 'ilike', self),('remark', 'ilike', self)]"/>
+                <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
+
             </search>
         </field>
     </record>
@@ -89,9 +89,9 @@
         <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">
+            <tree string="机床型号" create="0" delete="0" edit="0">
                 <field name="code"/>
-                <field name="name"/>
+                <field name="name" string="名称"/>
                 <field name="brand_id"/>
                 <field name="remark"/>
                 <field name="machine_tool_picture" widget="image"/>
@@ -104,16 +104,19 @@
         <field name="model">sf.machine_tool.type</field>
         <field name="arch" type="xml">
             <form string="机床型号" create="0" edit="0" delete="0">
-
                 <sheet>
                     <div class="oe_title">
-                        <label for="name"/>
-                        <h1><field name="name" string="设备名称" placeholder="e.g. LED Monitor"/></h1>
+                        <h1>
+                            <field name="code"/>
+                        </h1>
                     </div>
                     <group>
                         <group>
+                            <label for="name"/>
+                            <h1>
+                                <field name="name" string="设备名称" placeholder="e.g. LED Monitor"/>
+                            </h1>
                             <field name="code" force_save="1" readonly="1"/>
-
                             <field name="brand_id" required="1"
                                    domain="[('tag_ids', '=', '机床')]"
                                    options="{'no_create': True}"/>
@@ -266,6 +269,7 @@
             <search string="机床类型">
                 <field name="name" string="模糊搜索"
                        filter_domain="['|',('name', 'ilike', self),('remark', 'ilike', self)]"/>
+                <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
             </search>
         </field>
     </record>
@@ -276,7 +280,7 @@
         <field name="arch" type="xml">
             <tree string="机床类型" create="0" edit="0" delete="0">
                 <field name="code"/>
-                <field name="name"/>
+                <field name="name" string="名称"/>
                 <field name="category"/>
                 <field name="remark"/>
             </tree>
@@ -355,10 +359,29 @@
                     <button type="object" class="oe_highlight" name='enroll_machine_tool' string="机床注册"
                             attrs="{'invisible': [('code','!=',False)]}"/>
                 </header>
+                <sheet>
                     <div class="oe_title">
-                        <label for="name"/>
-                        <h1><field name="name" string="设备名称" placeholder="e.g. LED Monitor"/></h1>
+                        <h1>
+                            <field name="MTcode"/>
+                        </h1>
                     </div>
+                    <group string="基本信息">
+                        <!--                        <group>-->
+                        <!--                            <field name="brand_id"-->
+                        <!--                                   required="1"-->
+                        <!--                                   domain="[('tag_ids', '=', '机床')]"-->
+                        <!--                                   options="{'no_create': True}"/>-->
+                        <!--                        </group>-->
+                        <group>
+                            <field name="name" required="1" string="设备名称" placeholder="e.g. LED Monitor"/>
+                            <field name="type_id" required="1" options="{'no_create': True}"
+                                   domain="[('brand_id', '=', brand_id)]"
+                                   attrs="{'invisible': [('brand_id','=',False)]}"/>
+                        </group>
+                        <!--                 <div class="oe_title">-->
+                        <!--                        <label for="name"/>-->
+                        <!--                        <h1><field name="name" string="设备名称" placeholder="e.g. LED Monitor"/></h1>-->
+                        <!--                    </div>-->
                         <group string="基本信息">
                             <group>
                                 <field name="MTcode" string="编码"/>
@@ -368,15 +391,15 @@
                                        options="{'no_create': True}"/>
                             </group>
                             <group>
-
                                 <field name="type_id" required="1" options="{'no_create': True}"
-                               domain="[('brand_id', '=', brand_id)]" attrs="{'invisible': [('brand_id','=',False)]}"/>
+                                       domain="[('brand_id', '=', brand_id)]"
+                                       attrs="{'invisible': [('brand_id','=',False)]}"/>
                             </group>
-
                             <group>
                                 <field name="code" readonly="1" string="行业编码" force_save="1"/>
                             </group>
                         </group>
+                    </group>
                     <notebook>
                         <page string="参数">
                             <group string="参数">
@@ -410,7 +433,8 @@
                                     </div>
                                 </group>
                                 <group>
-                                <field name="rotate_speed" required="1" string="转速(min)" options="{'format': false}"/>
+                                    <field name="rotate_speed" required="1" string="转速(min)"
+                                           options="{'format': false}"/>
                                     <field name="precision" required="1" string="加工精度(mm)"/>
                                     <field name="control_system_id" required="1" options="{'no_create': True}"/>
                                     <field name="state" widget="selection"/>
@@ -423,6 +447,7 @@
                             </group>
                         </page>
                     </notebook>
+                </sheet>
             </form>
         </field>
     </record>
@@ -451,6 +476,7 @@
             <search string="数控系统">
                 <field name="name" string="模糊搜索"
                        filter_domain="['|',('name', 'ilike', self),('code', 'ilike', self)]"/>
+                <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
             </search>
         </field>
     </record>

sf_base/views/common_view.xml

@@ -36,6 +36,7 @@
                 <search>
                     <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
                     <field name="process_encode" string="编码搜索" filter_domain="[('process_encode','ilike',self)]"/>
+                    <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
                 </search>
             </field>
         </record>
@@ -46,9 +47,13 @@
             <field name="arch" type="xml">
                 <form string="表面工艺类别" create="0" edit="0" delete="0">
                     <sheet>
+                        <div class="oe_title">
+                            <h1>
+                                <field name="code"/>
+                            </h1>
+                        </div>
                         <group>
                             <group>
-                                <field name="code" readonly="1"/>
                                 <field name="sequence"/>
                             </group>
                             <group>
@@ -77,8 +82,8 @@
             <field name="arch" type="xml">
                 <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"/>
+                    <field name="code" />
+                    <field name="name" string="名称"/>
                 </tree>
             </field>
         </record>
@@ -90,6 +95,7 @@
                 <search>
                     <field name="name" string="名称" filter_domain="[('name','ilike',self)]"/>
                     <field name="code" string="编码" filter_domain="[('code','ilike',self)]"/>
+                    <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
                 </search>
             </field>
         </record>
@@ -99,8 +105,8 @@
             <field name="model">sf.production.process</field>
             <field name="arch" type="xml">
                 <tree string="表面工艺" create="0" edit="0" delete="0">
-                    <field name="process_encode" readonly="1"/>
-                    <field name="name" readonly="1"/>
+                    <field name="process_encode" />
+                    <field name="name"  string="名称"/>
                     <field name="remark"/>
                 </tree>
             </field>
@@ -111,12 +117,14 @@
             <field name="arch" type="xml">
                 <form string="表面工艺" create="0" edit="0" delete="0">
                     <sheet>
+                        <div class="oe_title">
+                            <h1>
+                                <field name="process_encode"/>
+                            </h1>
+                        </div>
                         <group>
                             <group>
-                                <field name="process_encode" readonly="1"/>
-                            </group>
-                            <group>
-                                <field name="name" required="1"/>
+                                <field name="name" required="1" string="名称"/>
                             </group>
                             <notebook>
                                 <page string="可选参数">
@@ -179,6 +187,7 @@
                 <search>
                     <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
                     <field name="process_encode" string="编码搜索" filter_domain="[('process_encode','ilike',self)]"/>
+                    <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
                 </search>
             </field>
         </record>
@@ -188,14 +197,19 @@
             <field name="arch" type="xml">
                 <form string="材料型号" create="0" edit="1" delete="0">
                     <sheet>
+                        <div class="oe_title">
+                            <h1>
+                                <field name="materials_no" readonly="1" force_save="1"/>
+                            </h1>
+                        </div>
                         <group>
                             <group>
-                                <field name="materials_no" readonly="1"/>
+                                 <field name="name" 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"/>
@@ -241,10 +255,10 @@
                 <search>
                     <field name="name" string="型号名搜索" filter_domain="[('name','ilike',self)]"/>
                     <field name="materials_no" string="编码搜索" filter_domain="[('materials_no','ilike',self)]"/>
+                    <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
                     <searchpanel class="account_root">
                         <field name="materials_id" icon="fa-filter"/>
                     </searchpanel>
-
                 </search>
             </field>
         </record>
@@ -254,12 +268,14 @@
             <field name="arch" type="xml">
                 <form string="材料" create="0" edit="0" delete="0">
                     <sheet>
+                        <div class="oe_title">
+                            <h1>
+                                <field name="materials_no"/>
+                            </h1>
+                        </div>
                         <group>
                             <group>
-                                <field name="materials_no" readonly="1" default="编码"/>
-                            </group>
-                            <group>
-                                <field name="name" required="1"/>
+                                <field name="name" required="1" string="名称"/>
                             </group>
                             <notebook>
                                 <page string="型号">
@@ -288,7 +304,7 @@
             <field name="arch" type="xml">
                 <tree string="材料" create="0" edit="0" delete="0">
                     <field name="materials_no" readonly="1"/>
-                    <field name="name" readonly="1"/>
+                    <field name="name" string="名称"/>
                 </tree>
             </field>
         </record>
@@ -299,6 +315,7 @@
                 <search>
                     <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
                     <field name="materials_no" string="编码搜索" filter_domain="[('materials_no','ilike',self)]"/>
+                    <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
                 </search>
             </field>
         </record>
@@ -335,45 +352,6 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-<!--        #&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;托盘&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;-->
-<!--        <record id="action_sf_tray" model="ir.actions.act_window">-->
-<!--            <field name="name">托盘</field>-->
-<!--            <field name="type">ir.actions.act_window</field>-->
-<!--            <field name="res_model">sf.tray</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="help" type="html">-->
-<!--                <p class="o_view_nocontent_smiling_face">-->
-<!--                    创建托盘吧-->
-<!--                </p>-->
-<!--            </field>-->
-<!--        </record>-->
-
-<!--        <record id="view_sf_tray_search" model="ir.ui.view">-->
-<!--            <field name="name">sf.tray.search</field>-->
-<!--            <field name="model">sf.tray</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)]"/>-->
-<!--                    <group string="分组">-->
-<!--                        <filter name="state" string="状态" domain="[]" context="{'group_by': 'state'}"/>-->
-<!--                    </group>-->
-<!--                </search>-->
-
-<!--            </field>-->
-<!--        </record>-->
-
-<!--        <record model="ir.ui.view" id="tree_sf_tray_view">-->
-<!--            <field name="name">sf.tray.tree</field>-->
-<!--            <field name="model">sf.tray</field>-->
-<!--            <field name="arch" type="xml">-->
-<!--                <tree string="托盘">-->
-<!--                    <field name="code"/>-->
-<!--                    <field name="name"/>-->
-<!--                    <field name="state"/>-->
-<!--                </tree>-->
-<!--            </field>-->
-<!--        </record>-->
 
 <!--        <record model="ir.ui.view" id="sf_tray_form">-->
 <!--            <field name="name">sf.tray.form</field>-->

sf_base/views/fixture_base_view.xml

@@ -1,681 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-
-<!-- ======================================定位元件型号view视图==================================================   -->
-    <record id="sf_fixture_setting_element_view_tree" model="ir.ui.view">
-        <field name="name">定位元件型号</field>
-        <field name="model">sf.fixture.setting.element</field>
-        <field name="arch" type="xml">
-            <tree string="定位元件型号">
-                <field name="code"/>
-                <field name="name"/>
-                <field name="setting_ele_type_id"/>
-                <field name="brand_id"/>
-                <field name="picture" widget="image"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="sf_fixture_setting_element_view_form" model="ir.ui.view">
-        <field name="name">定位元件型号</field>
-        <field name="model">sf.fixture.setting.element</field>
-        <field name="arch" type="xml">
-            <form string="定位元件型号">
-                <sheet>
-                    <group string="基本信息">
-                        <group>
-                            <field name="code"/>
-                            <field name="name"/>
-                            <field name="setting_ele_type_id"/>
-                           <field name="brand_id"/>
-                        </group>
-                        <group>
-                           <field name="picture" widget="image" nolabel="1"/>
-                        </group>
-                    </group>
-                    <group string="参数">
-                        <group>
-                            <field name="length"/>
-                            <field name="width"/>
-                            <field name="height"/>
-                            <field name="diameter"/>
-                        </group>
-                        <group>
-                            <field name="material_type_id"/>
-                            <field name="hardness"/>
-                            <field name="surface_treatment"/>
-                            <field name="accuracy_grade"/>
-                            <field name="chucking_power"/>
-                        </group>
-                    </group>
-                    <group string="其他">
-                        <group>
-                            <field name="comment"/>
-                        </group>
-                    </group>
-
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="sf_fixture_setting_element_view_act" model="ir.actions.act_window">
-        <field name="name">定位元件型号</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.fixture.setting.element</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-
-
-<!-- ======================================定位原件类型==================================================   -->
-    <record id="sf_setting_element_type_view_tree" model="ir.ui.view">
-        <field name="name">定位原件类型</field>
-        <field name="model">sf.setting.element.type</field>
-        <field name="arch" type="xml">
-            <tree string="定位原件类型">
-                <field name="code"/>
-                <field name="name"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="sf_setting_element_type_view_form" model="ir.ui.view">
-        <field name="name">定位元件类型</field>
-        <field name="model">sf.setting.element.type</field>
-        <field name="arch" type="xml">
-            <form string="定位元件类型">
-                <sheet>
-                    <group string="基本信息">
-                        <group>
-                            <field name="code"/>
-                        </group>
-                        <group>
-                            <field name="name"/>
-                        </group>
-                    </group>
-                    <group string="其他">
-                        <field name="comment"/>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="sf_setting_element_type_view_act" model="ir.actions.act_window">
-        <field name="name">定位元件类型</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.setting.element.type</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-
-
-
-    <!-- ======================================夹紧元件型号==================================================   -->
-    <record id="sf_fixture_clamping_element_view_tree" model="ir.ui.view">
-        <field name="name">夹紧元件型号</field>
-        <field name="model">sf.fixture.clamping.element</field>
-        <field name="arch" type="xml">
-            <tree string="夹紧元件型号">
-                <field name="code"/>
-                <field name="name"/>
-                <field name="clamping_ele_type_id"/>
-                <field name="brand_id"/>
-                <field name="picture" widget="image"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="sf_fixture_clamping_element_view_form" model="ir.ui.view">
-        <field name="name">夹紧元件型号</field>
-        <field name="model">sf.fixture.clamping.element</field>
-        <field name="arch" type="xml">
-            <form string="夹紧元件型号">
-                <sheet>
-                    <group string="基本信息">
-                        <group>
-                            <field name="code"/>
-                            <field name="name"/>
-                            <field name="clamping_ele_type_id"/>
-                            <field name="brand_id"/>
-                        </group>
-                        <group>
-                            <field name="picture" widget="image" nolabel="1"/>
-                        </group>
-                    </group>
-                    <group string="参数">
-                        <group>
-                            <field name="length"/>
-                            <field name="width"/>
-                            <field name="height"/>
-                            <field name="diameter"/>
-                        </group>
-                        <group>
-                            <field name="material_type_id"/>
-                            <field name="hardness"/>
-                            <field name="chucking_power"/>
-                            <field name="surface_treatment"/>
-                            <field name="accuracy_grade"/>
-                        </group>
-                    </group>
-                    <group string="其他">
-                        <group>
-                            <field name="comment"/>
-                        </group>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="sf_fixture_clamping_element_view_act" model="ir.actions.act_window">
-        <field name="name">夹紧元件型号</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.fixture.clamping.element</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-
-
-
-    <!-- ======================================夹紧元件类型==================================================   -->
-    <record id="sf_clamping_element_type_view_tree" model="ir.ui.view">
-        <field name="name">夹紧元件类型</field>
-        <field name="model">sf.clamping.element.type</field>
-        <field name="arch" type="xml">
-            <tree string="夹紧元件类型">
-                <field name="code"/>
-                <field name="name"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="sf_clamping_element_type_view_form" model="ir.ui.view">
-        <field name="name">夹紧元件类型</field>
-        <field name="model">sf.clamping.element.type</field>
-        <field name="arch" type="xml">
-            <form string="夹紧元件类型">
-                <sheet>
-                    <group string="基本信息">
-                        <group>
-                            <field name="code"/>
-                        </group>
-                        <group>
-                            <field name="name"/>
-                        </group>
-                    </group>
-                    <group string="其他">
-                        <field name="comment"/>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="sf_clamping_element_type_view_act" model="ir.actions.act_window">
-        <field name="name">夹紧元件类型</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.clamping.element.type</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-
-
-     <!--  ===================================对刀夹具型号view视图============================================      -->
-    <record id="sf_fixture_tool_setting_view_tree" model="ir.ui.view">
-        <field name="name">对刀夹具型号</field>
-        <field name="model">sf.fixture.tool.setting</field>
-        <field name="arch" type="xml">
-            <tree string="对刀夹具型号">
-                <field name="code"/>
-                <field name="name"/>
-                <field name="tool_setting_type_id"/>
-                <field name="brand_id"/>
-                <field name="picture" widget="image"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="sf_fixture_tool_setting_view_form" model="ir.ui.view">
-        <field name="name">对刀夹具型号</field>
-        <field name="model">sf.fixture.tool.setting</field>
-        <field name="arch" type="xml">
-            <form string="对刀夹具型号">
-                <sheet>
-                    <group string="基本信息">
-                        <group>
-                            <field name="code"/>
-                            <field name="name"/>
-                            <field name="tool_setting_type_id"/>
-                            <field name="brand_id"/>
-                        </group>
-                        <group>
-                           <field name="picture" widget="image" nolabel="1"/>
-                        </group>
-                    </group>
-                    <group string="参数">
-                        <group>
-                            <field name="length"/>
-                            <field name="width"/>
-                            <field name="height"/>
-                            <field name="diameter"/>
-                            <field name="hardness"/>
-                        </group>
-                        <group>
-                            <field name="clamp_mode"/>
-                            <field name="accuracy_grade"/>
-                            <field name="max_clamp_diameter"/>
-                            <field name="material_type_id"/>
-                            <field name="chucking_power"/>
-                        </group>
-                    </group>
-                    <group string="其他">
-                        <group>
-                            <field name="comment"/>
-                        </group>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="sf_fixture_tool_setting_view_act" model="ir.actions.act_window">
-        <field name="name">对刀夹具型号</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.fixture.tool.setting</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-
-    <!--  ==================================对刀夹具类型view视图===============================================  -->
-    <record id="sf_tool_setting_type_view_tree" model="ir.ui.view">
-        <field name="name">对刀夹具类型</field>
-        <field name="model">sf.tool.setting.type</field>
-        <field name="arch" type="xml">
-            <tree string="对刀夹具类型">
-                <field name="code"/>
-                <field name="name"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="sf_tool_setting_type_view_form" model="ir.ui.view">
-        <field name="name">对刀夹具类型</field>
-        <field name="model">sf.tool.setting.type</field>
-        <field name="arch" type="xml">
-            <form string="对刀夹具类型">
-                <sheet>
-                    <group string="基本信息">
-                        <group>
-                            <field name="code"/>
-                        </group>
-                        <group>
-                            <field name="name"/>
-                        </group>
-                    </group>
-                    <group string="其他">
-                        <field name="comment"/>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="sf_tool_setting_type_view_act" model="ir.actions.act_window">
-        <field name="name">对刀夹具类型</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.tool.setting.type</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-
-
-     <!--     =================================定位装置型号view视图====================================      -->
-    <record id="sf_fixture_locating_device_view_tree" model="ir.ui.view">
-        <field name="name">定位装置型号</field>
-        <field name="model">sf.fixture.locating.device</field>
-        <field name="arch" type="xml">
-            <tree string="定位装置型号">
-                <field name="code"/>
-                <field name="name"/>
-                <field name="locating_device_type_id"/>
-                <field name="brand_id"/>
-                <field name="picture" widget="image"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="sf_fixture_locating_device_view_form" model="ir.ui.view">
-        <field name="name">定位装置型号</field>
-        <field name="model">sf.fixture.locating.device</field>
-        <field name="arch" type="xml">
-            <form string="定位装置型号">
-                <sheet>
-                    <group string="基本信息">
-                        <group>
-                            <field name="code"/>
-                            <field name="name"/>
-                            <field name="locating_device_type_id"/>
-                            <field name="brand_id"/>
-                        </group>
-                        <group>
-                           <field name="picture" widget="image" nolabel="1"/>
-                        </group>
-                    </group>
-                    <group string="参数">
-                        <group>
-                            <field name="length"/>
-                            <field name="width"/>
-                            <field name="height"/>
-                            <field name="diameter"/>
-                        </group>
-                        <group>
-                            <field name="material_type_id"/>
-                            <field name="weight"/>
-                            <field name="max_bearing_capacity"/>
-                            <field name="accuracy_grade"/>
-                            <field name="locate_mode_ids"/>
-                        </group>
-                    </group>
-                    <group string="其他">
-                        <group>
-                            <field name="comment"/>
-                        </group>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="sf_fixture_locating_device_view_act" model="ir.actions.act_window">
-        <field name="name">定位装置型号</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.fixture.locating.device</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-
-    <!--  ==========================================定位装置类型view视图===============================================  -->
-    <record id="sf_locating_device_type_view_tree" model="ir.ui.view">
-        <field name="name">定位装置类型</field>
-        <field name="model">sf.locating.device.type</field>
-        <field name="arch" type="xml">
-            <tree string="定位装置类型">
-                <field name="code"/>
-                <field name="name"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="sf_locating_device_type_view_form" model="ir.ui.view">
-        <field name="name">定位装置类型</field>
-        <field name="model">sf.locating.device.type</field>
-        <field name="arch" type="xml">
-            <form string="定位装置类型">
-                <sheet>
-                    <group string="基本信息">
-                        <group>
-                            <field name="code"/>
-                        </group>
-                        <group>
-                            <field name="name"/>
-                        </group>
-                    </group>
-                    <group string="其他">
-                        <field name="comment"/>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="sf_locating_device_type_view_act" model="ir.actions.act_window">
-        <field name="name">定位装置类型</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.locating.device.type</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-
-    <!--    ====================================定位装置定位方式view视图==========================================    -->
-    <record id="sf_locating_device_locate_mode_view_tree" model="ir.ui.view">
-        <field name="name">定位装置定位方式</field>
-        <field name="model">sf.locating.device.locate.mode</field>
-        <field name="arch" type="xml">
-            <tree string="定位装置定位方式">
-                <field name="code"/>
-                <field name="name"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="sf_locating_device_locate_mode_view_form" model="ir.ui.view">
-        <field name="name">定位装置定位方式</field>
-        <field name="model">sf.locating.device.locate.mode</field>
-        <field name="arch" type="xml">
-            <form string="定位装置定位方式">
-                <sheet>
-                    <group string="基本信息">
-                        <group>
-                            <field name="code"/>
-                            <field name="name_id"/>
-                        </group>
-                        <group>
-                            <field name="name"/>
-                        </group>
-                    </group>
-                    <group string="其他">
-                        <field name="comment"/>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="sf_locating_device_locate_mode_view_act" model="ir.actions.act_window">
-        <field name="name">定位装置定位方式</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.locating.device.locate.mode</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-
-    <!--    ======================================导向元件view视图===========================================      -->
-    <record id="sf_fixture_guide_element_view_tree" model="ir.ui.view">
-        <field name="name">导向元件型号</field>
-        <field name="model">sf.fixture.guide.element</field>
-        <field name="arch" type="xml">
-            <tree string="导向元件型号">
-                <field name="code"/>
-                <field name="name"/>
-                <field name="guide_ele_type_id"/>
-                <field name="brand_id"/>
-                <field name="picture" widget="image"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="sf_fixture_guide_element_view_form" model="ir.ui.view">
-        <field name="name">导向元件型号</field>
-        <field name="model">sf.fixture.guide.element</field>
-        <field name="arch" type="xml">
-            <form string="导向元件型号">
-                <sheet>
-                    <group string="基本信息">
-                        <group>
-                            <field name="code"/>
-                            <field name="name"/>
-                            <field name="guide_ele_type_id"/>
-                           <field name="brand_id"/>
-                        </group>
-                        <group>
-                           <field name="picture" widget="image" nolabel="1"/>
-                        </group>
-                    </group>
-                    <group string="参数">
-                        <group>
-                            <field name="length"/>
-                            <field name="width"/>
-                            <field name="height"/>
-                            <field name="diameter"/>
-                            <field name="guide_ele_way_to_install_id"/>
-                        </group>
-                        <group>
-                            <field name="material_type_id"/>
-                            <field name="accuracy_grade"/>
-                            <field name="weight"/>
-                            <field name="scope_of_application"/>
-                            <field name="guide_ele_guide_mode_id"/>
-                        </group>
-                    </group>
-                    <group string="其他">
-                        <group>
-                            <field name="comment"/>
-                        </group>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="sf_fixture_guide_element_view_act" model="ir.actions.act_window">
-        <field name="name">导向元件型号</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.fixture.guide.element</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-
-    <!--  ========================================导向元件类型view视图====================================  -->
-    <record id="sf_guide_element_type_view_tree" model="ir.ui.view">
-        <field name="name">导向元件类型</field>
-        <field name="model">sf.guide.element.type</field>
-        <field name="arch" type="xml">
-            <tree string="定位原件类型">
-                <field name="code"/>
-                <field name="name"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="sf_guide_element_type_view_form" model="ir.ui.view">
-        <field name="name">导向元件类型</field>
-        <field name="model">sf.guide.element.type</field>
-        <field name="arch" type="xml">
-            <form string="定位元件类型">
-                <sheet>
-                    <group string="基本信息">
-                        <group>
-                            <field name="code"/>
-                        </group>
-                        <group>
-                            <field name="name"/>
-                        </group>
-                    </group>
-                    <group string="其他">
-                        <field name="comment"/>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="sf_guide_element_type_view_act" model="ir.actions.act_window">
-        <field name="name">导向元件类型</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.guide.element.type</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-
-
-    <!--  ==========================================导向元件导向方式view视图========================================  -->
-    <record id="sf_guide_element_guide_mode_view_tree" model="ir.ui.view">
-        <field name="name">导向元件导向方式</field>
-        <field name="model">sf.guide.element.guide.mode</field>
-        <field name="arch" type="xml">
-            <tree string="导向元件导向方式">
-                <field name="code"/>
-                <field name="name"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="sf_guide_element_guide_mode_view_form" model="ir.ui.view">
-        <field name="name">导向元件导向方式</field>
-        <field name="model">sf.guide.element.guide.mode</field>
-        <field name="arch" type="xml">
-            <form string="导向元件导向方式">
-                <sheet>
-                    <group string="基本信息">
-                        <group>
-                            <field name="code"/>
-                            <field name="name_id"/>
-                        </group>
-                        <group>
-                            <field name="name"/>
-                        </group>
-                    </group>
-                    <group string="其他">
-                        <field name="comment"/>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="sf_guide_element_guide_mode_view_act" model="ir.actions.act_window">
-        <field name="name">导向元件导向方式</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.guide.element.guide.mode</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-
-
-    <!--  ==========================================导向元件安装方式view视图==============================================  -->
-    <record id="sf_guide_element_way_to_install_view_tree" model="ir.ui.view">
-        <field name="name">导向元件安装方式</field>
-        <field name="model">sf.guide.element.way.to.install</field>
-        <field name="arch" type="xml">
-            <tree string="导向元件导向方式">
-                <field name="code"/>
-                <field name="name"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="sf_guide_element_way_to_install_view_form" model="ir.ui.view">
-        <field name="name">导向元件安装方式</field>
-        <field name="model">sf.guide.element.way.to.install</field>
-        <field name="arch" type="xml">
-            <form string="导向元件导向方式">
-                <sheet>
-                    <group string="基本信息">
-                        <group>
-                            <field name="code"/>
-                            <field name="name_id"/>
-                        </group>
-                        <group>
-                            <field name="name"/>
-                        </group>
-                    </group>
-                    <group string="其他">
-                        <field name="comment"/>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="sf_guide_element_way_to_install_view_act" model="ir.actions.act_window">
-        <field name="name">导向元件安装方式</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.guide.element.way.to.install</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-
-
-</odoo>

sf_base/views/fixture_view.xml

@@ -13,7 +13,7 @@
                        filter_domain="[('name', 'ilike', self)]"/>
                 <field name="remark" string="备注"
                        filter_domain="[('remark', 'ilike', self)]"/>
-                <filter name="filter_active" string="未启用" domain="[('active','=',False)]"/>
+                <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
             </search>
         </field>
     </record>
@@ -24,10 +24,10 @@
         <field name="arch" type="xml">
             <tree string="夹具物料" create="0" edit="0" delete="0">
                 <field name="code"/>
-                <field name="name"/>
+                <field name="name" string="名称"/>
                 <field name="category"/>
                 <field name="remark"/>
-                <field name="active" string="启用"/>
+                <!--                <field name="active" string="启用"/>-->
             </tree>
         </field>
     </record>
@@ -77,7 +77,7 @@
                        filter_domain="[('name', 'ilike', self)]"/>
                 <field name="remark" string="备注"
                        filter_domain="[('remark', 'ilike', self)]"/>
-                <filter name="filter_active" string="未启用" domain="[('active','=',False)]"/>
+                <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
             </search>
         </field>
     </record>
@@ -89,9 +89,9 @@
         <field name="arch" type="xml">
             <tree string="联装类型" create="0" edit="0" delete="0">
                 <field name="code"/>
-                <field name="name"/>
+                <field name="name" string="名称"/>
                 <field name="remark"/>
-                <field name="active" string="启用"/>
+                <!--                <field name="active" string="启用"/>-->
             </tree>
         </field>
     </record>
@@ -150,6 +150,8 @@
                     <filter string='联装类型' name="multi_mounting_type_id" domain="[]"
                             context="{'group_by' : 'multi_mounting_type_id'}"/>
                 </group>
+                <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
+
                 <searchpanel class="account_root">
                     <field name="fixture_material_id" icon="fa-filter"/>
                 </searchpanel>
@@ -161,9 +163,9 @@
         <field name="name">夹具型号</field>
         <field name="model">sf.fixture.model</field>
         <field name="arch" type="xml">
-            <tree string="夹具型号" create="0" edit="0" delete="0">
+            <tree string="夹具型号">
                 <field name="code"/>
-                <field name="name"/>
+                <field name="name" string="名称"/>
                 <field name="brand_id"/>
                 <field name="fixture_material_id"/>
                 <field name="multi_mounting_type_id"/>
@@ -175,14 +177,16 @@
         <field name="name">夹具型号</field>
         <field name="model">sf.fixture.model</field>
         <field name="arch" type="xml">
-            <form string="夹具型号" create="0" edit="0" delete="0">
+            <form string="夹具型号">
                 <sheet>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="code" force_save="1" readonly="1"/>
+                        </h1>
+                    </div>
                     <group>
                         <group>
-                            <field name="code" force_save="1"/>
-                            <field name="name"/>
-                            <field name="brand_id" options="{'no_create': True}"/>
-                            <field name="manufacturer_model_number"/>
+                            <field name="name" string="名称"/>
                             <field name="fixture_material_id" options="{'no_create': True}"/>
                             <field name="fixture_material_type" invisible="1"/>
                             <field name="multi_mounting_type_id" options="{'no_create': True}"/>
@@ -195,9 +199,10 @@
                     </group>
                     <notebook>
                         <page string="参数"
-                              attrs='{"invisible": [("fixture_material_type","not in",("气动托盘","转接板(锁板)托盘","磁吸托盘","虎钳托盘","零点卡盘"))]}'>
+                              attrs='{"invisible": [("fixture_material_type","not in",("气动夹具","转接板(锁板)夹具","磁吸夹具","虎钳夹具","零点卡盘"))]}'>
                             <group>
                                 <group>
+                                    <field name="brand_id" options="{'no_create': True}"/>
                                     <label for="length" string="尺寸(mm)"/>
                                     <div class="test_model">
                                         <label for="length" string="长"/>
@@ -215,16 +220,16 @@
                                     <field name="weight"></field>
                                     <field name="materials_model_id" options="{'no_create': True}"/>
                                     <field name="clamping_way"
-                                           attrs='{"invisible": [("fixture_material_type","not in",("气动托盘","磁吸托盘","虎钳托盘"))]}'/>
+                                           attrs='{"invisible": [("fixture_material_type","not in",("气动夹具","磁吸夹具","虎钳夹具"))]}'/>
                                     <field name="port_type"
-                                           attrs='{"invisible": [("fixture_material_type","not in",("气动托盘","磁吸托盘","虎钳托盘"))]}'/>
+                                           attrs='{"invisible": [("fixture_material_type","not in",("气动夹具","磁吸夹具","虎钳夹具"))]}'/>
                                     <field name="through_hole_size"
-                                           attrs='{"invisible": [("fixture_material_type","!=",("转接板(锁板)托盘"))]}'/>
+                                           attrs='{"invisible": [("fixture_material_type","!=",("转接板(锁板)夹具"))]}'/>
                                     <field name="screw_size"
-                                           attrs='{"invisible": [("fixture_material_type","!=",("转接板(锁板)托盘"))]}'/>
+                                           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","not in",("虎钳夹具","零点卡盘"))]}'/>
+                                    <field name="apply_machine_tool_type_ids" widget="many2many_tags" options="{'no_create': True}"
                                            attrs='{"invisible": [("fixture_material_type","!=",("零点卡盘"))]}'/>
                                 </group>
                                 <group>
@@ -235,20 +240,20 @@
                                         <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',('气动托盘','转接板(锁板)托盘','磁吸托盘','虎钳托盘'))]}"/>
+                                               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',('气动托盘','转接板(锁板)托盘','磁吸托盘','虎钳托盘'))]}"/>
+                                               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',('气动托盘','转接板(锁板)托盘','磁吸托盘','虎钳托盘'))]}"/>
+                                               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',('气动托盘','转接板(锁板)托盘','磁吸托盘','虎钳托盘'))]}"/>
+                                           attrs="{'invisible': [('fixture_material_type','=','零点卡盘')],'required': [('fixture_material_type', 'in',('气动夹具','转接板(锁板)夹具','磁吸夹具','虎钳夹具'))]}"/>
                                     <field name="maximum_carrying_weight"></field>
                                     <field name="maximum_clamping_force"></field>
                                 </group>

sf_base/views/functional_fixture_view.xml

@@ -14,7 +14,7 @@
                        filter_domain="[('name', 'ilike', self)]"/>
                 <field name="remark" string="备注"
                        filter_domain="[('remark', 'ilike', self)]"/>
-                <filter name="filter_active" string="未启用" domain="[('active','=',False)]"/>
+                <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
             </search>
         </field>
     </record>
@@ -25,9 +25,9 @@
         <field name="arch" type="xml">
             <tree string="功能夹具类型" create="0" edit="0" delete="0">
                 <field name="code"/>
-                <field name="name"/>
+                <field name="name" string="名称"/>
                 <field name="remark"/>
-                <field name="active" string="启用"/>
+                <!--                <field name="active" string="启用"/>-->
             </tree>
         </field>
     </record>
@@ -73,6 +73,7 @@
                        filter_domain="[('code', 'ilike', self)]"/>
                 <field name="name" string="名称"
                        filter_domain="[('name', 'ilike', self)]"/>
+                <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
             </search>
         </field>
     </record>
@@ -83,7 +84,7 @@
         <field name="arch" type="xml">
             <tree string="功能夹具">
                 <field name="code"/>
-                <field name="name"/>
+                <field name="name" string="名称"/>
                 <field name="type_id"/>
             </tree>
         </field>
@@ -100,10 +101,14 @@
                 <!--                            attrs="{'invisible': [('registration_status','=','已注册')]}"/>-->
                 <!--                </header>-->
                 <sheet>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="code"/>
+                        </h1>
+                    </div>
                     <group string="基本信息">
                         <group>
-                            <field name="code"/>
-                            <field name="name"/>
+                            <field name="name" string="名称"/>
                             <field name="type_id"/>
                             <field name="type" invisible="1"/>
                             <field name="zero_chuck_model_ids" widget="many2many_tags" options="{'no_create': True}"/>

sf_base/views/tool_base_views.xml

@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <tree string="刀具物料">
                     <field name="code"/>
-                    <field name="name"/>
+                    <field name="name" string="名称"/>
                     <field name="remark"/>
                 </tree>
             </field>
@@ -24,7 +24,7 @@
                             <group string='基本信息'>
                                 <group>
                                 <field name="code"/>
-                                <field name="name"/>
+                                <field name="name" string="名称"/>
                                 </group>
                                 <group>
                                     <field name="remark"/>

sf_base/views/tool_views.xml

@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <tree string="刀具物料" create="0" edit="0" delete="0">
                     <field name="code"/>
-                    <field name="name"/>
+                    <field name="name" string="名称"/>
                     <field name="remark"/>
                 </tree>
             </field>
@@ -44,7 +44,7 @@
                 <search string="刀具物料">
                     <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
                     <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
-
+                    <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
                 </search>
             </field>
         </record>
@@ -56,15 +56,15 @@
             <field name="arch" type="xml">
                 <tree string="功能刀具">
                     <field name="code"/>
-                    <field name="name"/>
+                    <field name="name" string="名称"/>
                     <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'/>
+                    <!--                    <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>
@@ -79,56 +79,56 @@
                             <group string='基本信息'>
                                 <group>
                                     <field name="code"/>
-                                    <field name="name"/>
+                                    <field name="name" string="名称"/>
                                     <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"/>
+                                    <!--                                    <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"/>
-                                    <field name="tool_grade"/>
-                                    <field name="machining_accuracy"/>
-                                    <field name="tool_length"/>
-                                    <field name="blade_number"/>
-                                </group>
-                                <group>
-                                    <field name="integral_blade_length"/>
-                                    <field name="effective_blade_length"/>
-                                    <field name="max_life"/>
-                                    <field name="is_standard"/>
-                                </group>
-                            </group>
-                            <group string='其他信息'>
-                                <group>
-                                    <field name="applicable_range"/>
-                                </group>
-                            </group>
+                            <!--                            <group string='参数信息'>-->
+                            <!--                                <group>-->
+                            <!--                                    <field name="diameter"/>-->
+                            <!--                                    <field name="tool_grade"/>-->
+                            <!--                                    <field name="machining_accuracy"/>-->
+                            <!--                                    <field name="tool_length"/>-->
+                            <!--                                    <field name="blade_number"/>-->
+                            <!--                                </group>-->
+                            <!--                                <group>-->
+                            <!--                                    <field name="integral_blade_length"/>-->
+                            <!--                                    <field name="effective_blade_length"/>-->
+                            <!--                                    <field name="max_life"/>-->
+                            <!--                                    <field name="is_standard"/>-->
+                            <!--                                </group>-->
+                            <!--                            </group>-->
+                            <!--                            <group string='其他信息'>-->
+                            <!--                                <group>-->
+                            <!--                                    <field name="applicable_range"/>-->
+                            <!--                                </group>-->
+                            <!--                            </group>-->
                         </group>
                     </sheet>
                 </form>
@@ -142,6 +142,7 @@
                 <search string="功能刀具">
                     <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
                     <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
+                    <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
                 </search>
             </field>
         </record>
@@ -153,7 +154,7 @@
             <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="name" string="名称"/>
                     <field name="code"/>
                     <field name="remark"/>
                 </tree>
@@ -187,6 +188,7 @@
                 <search string="功能刀具类型">
                     <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
                     <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
+                    <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
                 </search>
             </field>
         </record>
@@ -196,11 +198,10 @@
             <field name="name">sf.cutting.tool.model.tree</field>
             <field name="model">sf.cutting.tool.model</field>
             <field name="arch" type="xml">
-                <tree string="刀具型号">
+                <tree string="刀具型号" edit="0" delete="0" create="0">
                     <field name="code"/>
-                    <field name="name"/>
-                    <field name="mrs_cutting_tool_material_id"/>
-                    <field name="image" widget='image'/>
+                    <field name="name" string="名称"/>
+                    <field name="cutting_tool_material_id"/>
                 </tree>
             </field>
         </record>
@@ -209,215 +210,114 @@
             <field name="name">sf.cutting.tool.model.form</field>
             <field name="model">sf.cutting.tool.model</field>
             <field name="arch" type="xml">
-                <form string="刀具型号">
+                <form string="刀具型号" edit="0" delete="0" create="0">
                     <sheet>
-                        <group col='1'>
-                            <group string='基本信息'>
-                                <group>
+                        <div class="oe_title">
+                            <h1>
                                 <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>
+                            </h1>
+                        </div>
                         <group>
-                                    <field name="image" nolabel="1" widget="image"/>
-                                </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"/>
-
-                                    <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="name" string="名称"/>
+                                <field name="cutting_tool_material_id"
+                                       options="{'no_create': True, 'no_quick_create': True}"/>
+                                <field name="cutting_tool_type" invisible="1"/>
+                            </group>
+                            <!--                            <group>-->
+                            <!--                                <field name="image" nolabel="1" widget="image"/>-->
+                            <!--                            </group>-->
+                        </group>
+                        <notebook>
+                            <page string="参数"
+                                  attrs="{'invisible': [('cutting_tool_type', '=', False)]}">
+                                <group>
+                                    <!--整体式刀具-->
+                                    <group>
+                                        <field name="brand_id"/>
+                                        <field name="cutting_tool_type_id" />
+                                        <field name="material_model_id"/>
+                                        <field name="total_length"
+                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀柄'))]}"/>
+                                        <field name="shank_length"
+                                               attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
                                         <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)]}"/>
-
-
+                                               attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                        <!--刀片-->
+                                        <label for="tool_length" string="尺寸(mm)"
+                                               attrs='{"invisible": [("cutting_tool_type","not in",("刀片","刀杆","刀盘"))]}'/>
+                                        <div class="test_model"
+                                             attrs='{"invisible": [("cutting_tool_type","not in",("刀片","刀杆","刀盘"))]}'>
+                                            <label for="tool_length" string="长"/>
+                                            <field name="tool_length" class="o_address_zip"
+                                                   options="{'format': false}"/>
+                                            <label for="tool_width" string="宽"/>
+                                            <field name="tool_width" class="o_address_zip"
+                                                   options="{'format': false}"/>
+                                            <label for="tool_thickness" string="厚"/>
+                                            <field name="tool_thickness" class="o_address_zip"
+                                                   options="{'format': false}"/>
+                                        </div>
+                                        <field name="diameter"
+                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片','刀杆','刀盘'))]}"/>
+                                        <field name="blade_diameter"
+                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+                                        <field name="blade_number"
+                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片','刀杆','刀盘'))]}"/>
+                                        <field name="diameter_max"
+                                               attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                        <field name="flange_length"
+                                               attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                        <field name="flange_diameter"
+                                               attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                        <!--夹头-->
+                                        <field name="outer_diameter"
+                                               attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
+                                        <field name="inner_diameter"
+                                               attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
+                                        <field name="tool_height"
+                                               attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
+                                        <field name="tool_weight"
+                                               attrs='{"invisible": [("cutting_tool_type","not in",("夹头","刀柄"))]}'/>
+                                        <field name="clamping_diameter"
+                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头','刀柄'))]}"/>
+                                        <field name="cutter_bar_ids" widget="many2many_tags"
+                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
+                                        <field name="cutter_pad_ids" widget="many2many_tags"
+                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
+                                        <field name="blade_ids" widget="many2many_tags"
+                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+                                        <field name="chuck_ids" widget="many2many_tags"
+                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘','刀柄','整体式刀具'))]}"/>
+                                        <field name="handle_ids" widget="many2many_tags"
+                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头'))]}"/>
                                     </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>
+                                        <field name="jump_accuracy"
+                                               attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                        <field name="front_angle"
+                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
+                                        <field name="top_angle"
+                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
+                                        <field name="rear_angle"
+                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
+                                        <field name="main_included_angle"
+                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
+                                        <field name="coating_material"
+                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
+                                        <field name="accuracy_level"
+                                               attrs="{'invisible': [('cutting_tool_type', '=', '刀柄')]}"/>
+                                        <field name="working_hardness"/>
+                                        <field name="wrench"
+                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头','刀柄','刀杆','刀盘' ))]}"/>
+                                        <field name="screw"
+                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头','刀柄'))]}"/>
+                                        <field name="nut"
+                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
                                     </group>
                                 </group>
+                            </page>
+                        </notebook>
                     </sheet>
                 </form>
             </field>
@@ -431,8 +331,9 @@
                 <search string="刀具型号">
                     <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
                     <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
+                    <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
                     <searchpanel class="account_root">
-                        <field name="mrs_cutting_tool_material_id" icon="fa-filter"/>
+                        <field name="cutting_tool_material_id" icon="fa-filter"/>
                     </searchpanel>
                 </search>
             </field>
@@ -446,8 +347,8 @@
             <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="name" string="名称"/>
+                    <field name="cutting_tool_material_id"/>
                     <field name="remark"/>
                 </tree>
             </field>
@@ -482,8 +383,9 @@
                 <search string="刀具类型">
                     <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
                     <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
+                    <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
                     <searchpanel class="account_root">
-                        <field name="mrs_cutting_tool_material_id" icon="fa-filter"/>
+                        <field name="cutting_tool_material_id" icon="fa-filter"/>
                     </searchpanel>
                 </search>
             </field>

sf_dlm/views/product_template_view.xml

@@ -30,7 +30,7 @@
                     <field name="cutting_tool_material_id" attrs="{'invisible': [('categ_type', '!=', '刀具')]}"/>
                     <field name="cutting_tool_model_id"
                            attrs="{'invisible': [('categ_type', '!=', '刀具')]}"
-                           domain="[('mrs_cutting_tool_material_id','=',cutting_tool_material_id)]"/>
+                           domain="[('cutting_tool_material_id','=',cutting_tool_material_id)]"/>
                     <field name="fixture_material_id" attrs="{'invisible': [('categ_type', '!=', '夹具')]}"/>
                     <field name="fixture_model_id" string="型号"
                            attrs="{'invisible': [('categ_type', '!=', '夹具')]}"
@@ -79,155 +79,101 @@
                     <page string="刀具物料参数" attrs="{'invisible': [('categ_type', '!=', '刀具')]}">
                         <group>
                             <!--整体式刀具-->
-                            <group attrs="{'invisible': ['|','|',('cutting_tool_model_id','=',False),('categ_type', '!=', '刀具'),('cutting_tool_type', '!=', '整体式刀具')]}">
-                                <field name="brand_id"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'required': [('cutting_tool_type', '=', '整体式刀具')]}"/>
-                                <field name="cutting_tool_total_length"/>
-                                <field name="cutting_tool_shank_length"/>
-                                <field name="cutting_tool_blade_length"/>
-                                <field name="cutting_tool_diameter"/>
-                                <field name="cutting_tool_nut"
+                            <group attrs="{'invisible': [('categ_type', '!=', '刀具')]}">
+                                <field name="brand_id" options="{'no_create': True}"/>
+                                <field name="materials_type_id" options="{'no_create': True}"/>
+                                <field name="cutting_tool_type_id" options="{'no_create': True}"/>
+                                <field name="cutting_tool_total_length"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀柄'))]}"/>
+                                <field name="cutting_tool_shank_length"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="cutting_tool_blade_number"
+                                <field name="cutting_tool_blade_length"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                            </group>
-                            <group attrs="{'invisible': ['|','|',('cutting_tool_model_id','=',False),('categ_type', '!=', '刀具'),('cutting_tool_type', '!=', '整体式刀具')]}">
-                                <field name="cutting_tool_material_model_id"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'required': [('cutting_tool_type', '=', '整体式刀具')]}"/>
-                                <field name="cutting_tool_front_angle"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="cutting_tool_rear_angle"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="cutting_tool_main_included_angle"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                            </group>
-                            <group attrs="{'invisible': ['|',('categ_type', '!=', '刀具'),('cutting_tool_type', '!=', '整体式刀具')]}">
-                                <field name="cutting_tool_chuck_model_ids" widget="many2many_tags"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'required': [('cutting_tool_type', '=', '整体式刀具')]}"/>
-                                <field name="cutting_tool_scope"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                            </group>
                                 <!--刀片-->
-                            <group attrs="{'invisible': ['|','|',('cutting_tool_model_id','=',False),('categ_type', '!=', '刀具'),('cutting_tool_type', '!=', '刀片')]}">
-                                <field name="brand_id"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'required': [('cutting_tool_type', '=', '刀片')]}"/>
-                                <field name="cutting_tool_top_angle"/>
-                                <field name="cutting_tool_front_angle"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
-                                <field name="cutting_tool_rear_angle"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
-                                <field name="cutting_tool_main_included_angle"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
-                                <field name="cutting_tool_r_angle"/>
-                                <field name="cutting_tool_working_hardness"
-                                       attrs="{'required': [('cutting_tool_type', '=', '刀片')]}"/>
-                            </group>
-                            <group attrs="{'invisible': ['|','|',('cutting_tool_model_id','=',False),('categ_type', '!=', '刀具'),('cutting_tool_type', '!=', '刀片')]}">
-                                <field name="cutting_tool_material_model_id"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'required': [('cutting_tool_type', '=', '刀片')]}"/>
-                                <label for="tool_length" string="尺寸[mm]"/>
-                                <div class="o_address_format">
-                                    <label for="tool_length" string="长度L"/>
-                                    <field name="tool_length" class="o_address_zip"/>
-                                    <label for="tool_width" string="宽度D"/>
-                                    <field name="tool_width" class="o_address_zip"/>
-                                    <label for="tool_height" string="高度T"
-                                           attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
-                                    <field name="tool_height" class="o_address_zip"
-                                           attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <label for="tool_length" string="尺寸(mm)"
+                                       attrs='{"invisible": [("cutting_tool_type","not in",("刀片","刀杆","刀盘"))]}'/>
+                                <div class="test_model"
+                                     attrs='{"invisible": [("cutting_tool_type","not in",("刀片","刀杆","刀盘"))]}'>
+                                    <label for="tool_length" string="长"/>
+                                    <field name="tool_length" class="o_address_zip"
+                                           options="{'format': false}"/>
+                                    <label for="tool_width" string="宽"/>
+                                    <field name="tool_width" class="o_address_zip"
+                                           options="{'format': false}"/>
+                                    <label for="tool_thickness" string="厚"/>
+                                    <field name="tool_thickness" class="o_address_zip"
+                                           options="{'format': false}"/>
                                 </div>
-                                <field name="cutting_tool_radius"/>
-                                <field name="cutting_tool_nut"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
-                                <field name="cutting_tool_cutter_bar_ids" widget="many2many_tags"/>
-                                <field name="cutting_tool_cutter_pad_ids" widget="many2many_tags"/>
-                            </group>
-
-                            <!--刀杆/刀盘-->
-                            <group attrs="{'invisible': ['|','|',('cutting_tool_model_id','=',False),('categ_type', '!=', '刀具'),('cutting_tool_type', 'not in', ['刀杆','刀盘'])]}">
-                                <field name="brand_id"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ['刀杆','刀盘'])],'required': [('cutting_tool_type', 'not in', ['刀杆','刀盘'])]}"/>
-                                <field name="cutting_tool_c_diameter"/>
-                                <field name="cutting_tool_d_diameter"/>
-                                <field name="cutting_tool_l_total_length"/>
-                                <field name="cutting_tool_wrench"/>
-                                <field name="cutting_tool_screw"/>
-                                <field name="cutting_tool_blade_ids" widget="many2many_tags"/>
-                                <field name="cutting_tool_scope"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ['刀杆','刀盘'])]}"/>
-
-                            </group>
-                            <group attrs="{'invisible': ['|','|',('cutting_tool_model_id','=',False),('categ_type', '!=', '刀具'),('cutting_tool_type', 'not in', ['刀杆','刀盘'])]}">
-                                <field name="cutting_tool_material_model_id"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ['刀杆','刀盘'])],'required': [('cutting_tool_type', 'not in', ['刀杆','刀盘'])]}"/>
-                                <field name="cutting_tool_rounded_corner"/>
-                                <field name="cutting_tool_accuracy_level"/>
+                                <field name="cutting_tool_diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片','刀杆','刀盘'))]}"/>
+                                <field name="cutting_tool_blade_diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
                                 <field name="cutting_tool_blade_number"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ['刀杆','刀盘'])]}"/>
-                                <field name="cutting_tool_hardness"/>
-                            </group>
-                            <!--刀柄-->
-                            <group attrs="{'invisible': ['|','|',('cutting_tool_model_id','=',False),('categ_type', '!=', '刀具'),('cutting_tool_type', '!=', '刀柄')]}">
-                                <field name="brand_id"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'required': [('cutting_tool_type', '=', '刀柄')]}"/>
-                                <field name="cutting_tool_handle_length"/>
-                                <field name="cutting_tool_length1"/>
-                                <field name="cutting_tool_diameter1"/>
-                                <field name="cutting_tool_body_accuracy"/>
-                                <field name="cutting_tool_nut"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片','刀杆','刀盘'))]}"/>
+                                <field name="cutting_tool_diameter_max"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
-                                <field name="cutting_tool_clamping_range"
+                                <field name="cutting_tool_flange_length"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                <field name="cutting_tool_flange_diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
-                                <field name="tool_weight"/>
-                                <field name="cutting_tool_chuck_model_ids" widget="many2many_tags"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'required': [('cutting_tool_type', '=', '刀柄')]}"/>
-                            </group>
-                            <group attrs="{'invisible':['|','|',('cutting_tool_model_id','=',False),('categ_type', '!=', '刀具'),('cutting_tool_type', '!=', '刀柄')]}">
-                                <field name="cutting_tool_material_model_id"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'required': [('cutting_tool_type', '=', '刀柄')]}"/>
-                                <field name="cutting_tool_detection_accuracy"/>
-                                <field name="cutting_tool_detection_hardness"/>
-                                <field name="cutting_tool_standard_speed"/>
-                            </group>
                                 <!--夹头-->
-                            <group attrs="{'invisible': ['|','|',('cutting_tool_model_id','=',False),('categ_type', '!=', '刀具'),('cutting_tool_type', '!=', '夹头')]}">
-                                <field name="brand_id"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')],'required': [('cutting_tool_type', '=', '夹头')]}"/>
-                                <field name="cutting_tool_outer_diameter"/>
-                                <field name="cutting_tool_inner_diameter"/>
-                                <field name="cutting_tool_accuracy"/>
-                                <field name="cutting_tool_nut"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
-                                <field name="cutting_tool_clamping_range"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
-                                <field name="cutting_tool_handle_model_ids" widget="many2many_tags"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
+                                <field name="cutting_tool_outer_diameter"
+                                       attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
+                                <field name="cutting_tool_inner_diameter"
+                                       attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
+                                <field name="tool_height" attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
+                                <field name="tool_weight"
+                                       attrs='{"invisible": [("cutting_tool_type","not in",("夹头","刀柄"))]}'/>
+                                <field name="cutting_tool_clamping_diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头','刀柄'))]}"/>
+                                <field name="cutting_tool_cutter_bar_ids" widget="many2many_tags"
+                                       options="{'no_create': True}"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
+                                <field name="cutting_tool_cutter_pad_ids" widget="many2many_tags"
+                                       options="{'no_create': True}"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
+                                <field name="cutting_tool_blade_ids" widget="many2many_tags"
+                                       options="{'no_create': True}"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+                                <field name="cutting_tool_chuck_ids" widget="many2many_tags"
+                                       options="{'no_create': True}"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘','刀柄','整体式刀具'))]}"/>
+                                <field name="cutting_tool_handle_ids" widget="many2many_tags"
+                                       options="{'no_create': True}"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头'))]}"/>
                             </group>
-                            <group attrs="{'invisible': ['|','|',('cutting_tool_model_id','=',False),('categ_type', '!=', '刀具'),('cutting_tool_type', '!=', '夹头')]}">
-                                <field name="cutting_tool_material_model_id"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')],'required': [('cutting_tool_type', '=', '夹头')]}"/>
-                                <field name="tool_height" string="高度[mm]"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
-                                <field name="cutting_tool_feature"/>
+                            <group attrs="{'invisible': [('categ_type', '!=', '刀具')]}">
+                                <field name="cutting_tool_jump_accuracy"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                <field name="cutting_tool_front_angle"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
+                                <field name="cutting_tool_top_angle"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
+                                <field name="cutting_tool_rear_angle"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
+                                <field name="cutting_tool_main_included_angle"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
+                                <field name="coating_material"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
+                                <field name="cutting_tool_accuracy_level"
+                                       attrs="{'invisible': [('cutting_tool_type', '=', '刀柄')]}"/>
+                                <field name="cutting_tool_working_hardness"/>
+                                <field name="cutting_tool_wrench"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头','刀柄','刀杆','刀盘' ))]}"/>
+                                <field name="cutting_tool_screw"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头','刀柄'))]}"/>
+                                <field name="cutting_tool_nut"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
                             </group>
                         </group>
                     </page>
                     <page string="夹具物料参数" attrs="{'invisible': [('categ_type', '!=', '夹具')]}">
+                        <group attrs='{"invisible": [("fixture_material_type","not in",("气动夹具","转接板(锁板)夹具","磁吸夹具","虎钳夹具","零点卡盘"))]}'>
                             <group>
-                            <group attrs='{"invisible": ["|",("fixture_model_id", "=", False),("fixture_material_type","not in",("气动托盘","转接板(锁板)托盘","磁吸托盘","虎钳托盘","零点卡盘"))]}'>
                                 <field name="brand_id"/>
-                                <field name="fixture_multi_mounting_type_id"/>
-                            </group>
-                            <group>
-                                <field name="fixture_model_file" widget="Viewer3D" string="模型" readonly="1"
-                                       force_save="1"
-                                       attrs="{'invisible': [('fixture_model_file', '=', False)]}"/>
-                            </group>
-                        </group>
-                        <group string="参数"
-                               attrs='{"invisible": ["|",("fixture_model_id", "=", False),("fixture_material_type","not in",("气动托盘","转接板(锁板)托盘","磁吸托盘","虎钳托盘","零点卡盘"))]}'>
-                            <group>
-                                <label for="tool_length" string="尺寸[mm]"/>
+                                <field name="fixture_multi_mounting_type_id" options="{'no_create': True}"
+                                       attrs="{'required': [('categ_type', '=', '夹具')]}"/>
+                                <label for="tool_length" string="尺寸(mm)"/>
                                 <div class="o_address_format">
                                     <label for="tool_length" string="长"/>
                                     <field name="tool_length" class="o_address_zip"
@@ -242,43 +188,44 @@
                                            options="{'format': false}"/>
                                 </div>
                                 <field name="tool_weight"></field>
-                                <label for="fixture_clamp_workpiece_length_max" string="夹持工件最大尺寸[mm]"
+                                <label for="fixture_clamp_workpiece_length_max" string="夹持工件最大尺寸(mm)"
                                        attrs='{"invisible": [("fixture_material_type","=",("零点卡盘"))]}'/>
                                 <div class="o_address_format"
                                      attrs='{"invisible": [("fixture_material_type","=",("零点卡盘"))]}'>
                                     <label for="fixture_clamp_workpiece_length_max" string="长"/>
                                     <field name="fixture_clamp_workpiece_length_max" class="o_address_zip"
                                            options="{'format': false}"
-                                           attrs="{'required': [('fixture_material_type', 'in',('气动托盘','转接板(锁板)托盘','磁吸托盘','虎钳托盘'))]}"/>
+                                           attrs="{'required': [('fixture_material_type', 'in',('气动夹具','转接板(锁板)夹具','磁吸夹具','虎钳夹具'))]}"/>
                                     <!--                                    <span>&amp;nbsp;</span>-->
                                     <label for="fixture_clamp_workpiece_width_max" string="宽"/>
                                     <field name="fixture_clamp_workpiece_width_max" class="o_address_zip"
                                            options="{'format': false}"
-                                           attrs="{'required': [('fixture_material_type', 'in',('气动托盘','转接板(锁板)托盘','磁吸托盘','虎钳托盘'))]}"/>
+                                           attrs="{'required': [('fixture_material_type', 'in',('气动夹具','转接板(锁板)夹具','磁吸夹具','虎钳夹具'))]}"/>
                                     <!--                                    <span>&amp;nbsp;</span>-->
                                     <label for="fixture_clamp_workpiece_height_max" string="高"/>
                                     <field name="fixture_clamp_workpiece_height_max" class="o_address_zip"
                                            options="{'format': false}"
-                                           attrs="{'required': [('fixture_material_type', 'in',('气动托盘','转接板(锁板)托盘','磁吸托盘','虎钳托盘'))]}"/>
+                                           attrs="{'required': [('fixture_material_type', 'in',('气动托盘','转接板(锁板)夹具','磁吸夹具','虎钳夹具'))]}"/>
                                 </div>
                                 <field name="fixture_clamp_workpiece_diameter_max"
-                                       attrs="{'invisible': [('fixture_material_type','=','零点卡盘')],'required': [('fixture_material_type', 'in',('气动托盘','转接板(锁板)托盘','磁吸托盘','虎钳托盘'))]}"/>
+                                       attrs="{'invisible': [('fixture_material_type','=','零点卡盘')],'required': [('fixture_material_type', 'in',('气动夹具','转接板(锁板)夹具','磁吸夹具','虎钳夹具'))]}"/>
                                 <field name="fixture_maximum_carrying_weight"></field>
                                 <field name="fixture_maximum_clamping_force"></field>
                             </group>
                             <group>
-                                <field name="materials_type_id"/>
+                                <field name="materials_type_id" options="{'no_create': True}"/>
                                 <field name="fixture_clamping_way"
-                                       attrs='{"invisible": [("fixture_material_type","not in",("气动托盘","磁吸托盘","虎钳托盘"))]}'/>
+                                       attrs='{"invisible": [("fixture_material_type","not in",("气动夹具","磁吸夹具","虎钳夹具"))]}'/>
                                 <field name="fixture_port_type"
-                                       attrs='{"invisible": [("fixture_material_type","not in",("气动托盘","磁吸托盘","虎钳托盘"))]}'/>
+                                       attrs='{"invisible": [("fixture_material_type","not in",("气动夹具","磁吸夹具","虎钳夹具"))]}'/>
                                 <field name="fixture_through_hole_size"
-                                       attrs='{"invisible": [("fixture_material_type","!=",("转接板(锁板)托盘"))]}'/>
+                                       attrs='{"invisible": [("fixture_material_type","!=",("转接板(锁板)夹具"))]}'/>
                                 <field name="fixture_screw_size"
-                                       attrs='{"invisible": [("fixture_material_type","!=",("转接板(锁板)托盘"))]}'/>
+                                       attrs='{"invisible": [("fixture_material_type","!=",("转接板(锁板)夹具"))]}'/>
                                 <field name="fixture_driving_way"
-                                       attrs='{"invisible": [("fixture_material_type","not in",("虎钳托盘","零点卡盘"))]}'/>
-                                <field name="fixture_apply_machine_tool_type_ids"
+                                       attrs='{"invisible": [("fixture_material_type","not in",("虎钳夹具","零点卡盘"))]}'/>
+                                <field name="fixture_apply_machine_tool_type_ids" options="{'no_create': True}"
+                                       widget="many2many_tags"
                                        attrs='{"invisible": [("fixture_material_type","!=",("零点卡盘"))]}'/>
                             </group>
                         </group>

sf_manufacturing/models/product_template.py

@@ -10,10 +10,10 @@ class ResProductMo(models.Model):
         string='产品的类别', related='categ_id.type',
         store=True)
     model_name = fields.Char('模型名称')
-    model_long = fields.Float('模型长[mm]', digits=(16, 3))
-    model_width = fields.Float('模型宽[mm]', digits=(16, 3))
-    model_height = fields.Float('模型高[mm]', digits=(16, 3))
-    model_volume = fields.Float('模型体积[m³]')
+    model_long = fields.Float('模型长(mm)', digits=(16, 3))
+    model_width = fields.Float('模型宽(mm)', digits=(16, 3))
+    model_height = fields.Float('模型高(mm)', digits=(16, 3))
+    model_volume = fields.Float('模型体积(m³)')
     model_machining_precision = fields.Selection([
         ('0.10', '±0.10mm'),
         ('0.05', '±0.05mm'),
@@ -22,9 +22,9 @@ class ResProductMo(models.Model):
         ('0.01', '±0.01mm')], string='加工精度')
     model_processing_panel = fields.Char('模型加工面板')
     model_remark = fields.Char('模型备注说明')
-    length = fields.Float('长[mm]', digits=(16, 3))
-    width = fields.Float('宽[mm]', digits=(16, 3))
-    height = fields.Float('高[mm]', digits=(16, 3))
+    length = fields.Float('长(mm)', digits=(16, 3))
+    width = fields.Float('宽(mm)', digits=(16, 3))
+    height = fields.Float('高(mm)', digits=(16, 3))
     single_manufacturing = fields.Boolean(string="单个制造")
 
     model_code = fields.Char('模型编码')
@@ -44,43 +44,45 @@ class ResProductMo(models.Model):
 
     cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', string='型号',
                                             )
+    cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', string='刀具类型',
+                                           domain="[('cutting_tool_material_id.name', '=', cutting_tool_type)]")
 
     brand_id = fields.Many2one('sf.machine.brand', '品牌')
-    tool_length = fields.Integer('长度L[mm]', size=6)
-    tool_width = fields.Integer('宽度D[mm])', size=6)
-    tool_height = fields.Integer('高度T[mm]', size=6)
-    tool_weight = fields.Float('重量[kg]', size=4)
+    tool_length = fields.Integer('长度(mm)', size=6)
+    tool_width = fields.Integer('宽度(mm)', size=6)
+    tool_height = fields.Integer('高度(mm)', size=6)
+    tool_thickness = fields.Integer('厚度(mm)', size=6)
+    tool_weight = fields.Float('重量(kg)', size=4)
+    coating_material = fields.Char('涂层材质')
     # 整体式刀具参数
-    cutting_tool_total_length = fields.Float('总长度[mm]')
-    cutting_tool_shank_length = fields.Float('柄部长度[mm]')
-    cutting_tool_blade_length = fields.Float('刃部长度[mm]')
-    cutting_tool_diameter = fields.Float('直径[mm]')
+    cutting_tool_total_length = fields.Float('总长度(mm)')
+    cutting_tool_shank_length = fields.Float('柄部长度(mm)')
+    cutting_tool_blade_length = fields.Float('刃部长度(mm)')
+    cutting_tool_diameter = fields.Float('直径(mm)')
     cutting_tool_blade_number = fields.Integer('刃数')
-    cutting_tool_front_angle = fields.Float('前角[°]')
-    cutting_tool_rear_angle = fields.Float('后角[°]')
-    cutting_tool_main_included_angle = fields.Float('主偏角[°]')
-    cutting_tool_material_model_id = fields.Many2one('sf.materials.model', '材料型号')
-    cutting_tool_nut = fields.Float('配对螺母[mm]')
+    cutting_tool_front_angle = fields.Float('前角(°)')
+    cutting_tool_rear_angle = fields.Float('后角(°)')
+    cutting_tool_main_included_angle = fields.Float('主偏角(°)')
+    # cutting_tool_material_model_id = fields.Many2one('sf.materials.model', '材料型号')
+    cutting_tool_nut = fields.Float('配对螺母(mm)')
     # 适用夹头型号可以多选
-    cutting_tool_chuck_model_ids = fields.Many2many(
+    cutting_tool_chuck_ids = fields.Many2many(
         'sf.cutting.tool.model',
         relation='product_cutting_tool_model_handle_chuck_rel',
         column1='model_id_1',
         column2='model_id_2',
-        domain="[('mrs_cutting_tool_material_id.name', '=', '夹头')]",
+        domain="[('cutting_tool_type', '=', '夹头')]",
         string='适用夹头型号')
-    cutting_tool_scope = fields.Char('适用范围')
     # 刀片参数
-
-    cutting_tool_top_angle = fields.Float('顶角[°]')
-    cutting_tool_r_angle = fields.Float('R角[°]')
-    cutting_tool_working_hardness = fields.Char('加工硬度')
+    cutting_tool_top_angle = fields.Float('顶角(°)')
+    cutting_tool_jump_accuracy = fields.Float('径跳精度(um)')
+    cutting_tool_working_hardness = fields.Char('加工硬度(hrc)')
     cutting_tool_cutter_bar_ids = fields.Many2many(
         'sf.cutting.tool.model',
         relation='product_cutting_tool_model_blade_cutter_bar_rel',
         column1='model_id_1',
         column2='model_id_2',
-        domain="[('mrs_cutting_tool_material_id.name', '=', '刀杆')]",
+        domain="[('cutting_tool_type', '=', '刀杆')]",
         string='适用刀杆型号'
     )
     cutting_tool_cutter_pad_ids = fields.Many2many(
@@ -88,50 +90,38 @@ class ResProductMo(models.Model):
         relation='product_cutting_tool_model_blade_cutter_pad_rel',
         column1='model_id_1',
         column2='model_id_2',
-        domain="[('mrs_cutting_tool_material_id.name', '=', '刀盘')]",
+        domain="[('cutting_tool_type', '=', '刀盘')]",
         string='适用刀盘型号'  # 使用空列表作为默认值
     )
-    cutting_tool_radius = fields.Float('刀尖半径[mm]')
-    # 刀杆/刀盘参数
-    cutting_tool_c_diameter = fields.Float('C柄径[mm]')
-    cutting_tool_l_total_length = fields.Float('L总长[mm]')
-    cutting_tool_d_diameter = fields.Float('D刃径[mm]')
+    # 刀杆/参数
+    cutting_tool_blade_diameter = fields.Float('刃径(mm)')
     cutting_tool_blade_ids = fields.Many2many(
         'sf.cutting.tool.model',
         relation='product_cutting_tool_model_pad_blade_rel',
         column1='model_id_1',
         column2='model_id_2',
-        domain="[('mrs_cutting_tool_material_id.name', '=', '刀片')]",
+        domain="[('cutting_tool_type', '=', '刀片')]",
         string='适用刀片型号'  # 使用空列表作为默认值
     )
-    cutting_tool_wrench = fields.Float('配对扳手[mm]')
-    cutting_tool_screw = fields.Float('配备螺丝[mm]')
+    cutting_tool_wrench = fields.Float('配对扳手(mm)')
+    cutting_tool_screw = fields.Float('配备螺丝(mm)')
     cutting_tool_accuracy_level = fields.Char('精度等级')
-    cutting_tool_rounded_corner = fields.Float('刀尖圆角半径[mm]')
-    cutting_tool_hardness = fields.Char('硬度[°]')
     # 刀柄参数
-    cutting_tool_handle_length = fields.Float('L[mm]')
-    cutting_tool_length1 = fields.Float('L1[mm]')
-    cutting_tool_diameter1 = fields.Float('D1[mm]')
-
-    cutting_tool_body_accuracy = fields.Float('本体精度[mm]')
-    cutting_tool_clamping_range = fields.Float('夹持范围[mm]')
-    cutting_tool_detection_accuracy = fields.Float('检测精度')
-    cutting_tool_detection_hardness = fields.Float('检测硬度')
-    cutting_tool_standard_speed = fields.Float('标准转速')
+    cutting_tool_diameter_max = fields.Float('最大直径(mm)')
+    cutting_tool_clamping_diameter = fields.Float('夹持直径(mm)')
+    cutting_tool_flange_length = fields.Float('法兰柄长度(mm)')
+    cutting_tool_flange_diameter = fields.Float('法兰直径(mm)')
     # 夹头参数
-    cutting_tool_accuracy = fields.Float('精度[mm]')
-    cutting_tool_outer_diameter = fields.Float('外径[mm]')
-    cutting_tool_inner_diameter = fields.Float('内径[mm]')
-    cutting_tool_handle_model_ids = fields.Many2many(
+    cutting_tool_outer_diameter = fields.Float('外径(mm)')
+    cutting_tool_inner_diameter = fields.Float('内径(mm)')
+    cutting_tool_handle_ids = fields.Many2many(
         'sf.cutting.tool.model',
         relation='product_cutting_tool_model_chuck_handle_rel',
         column1='model_id_1',
         column2='model_id_2',
-        domain="[('mrs_cutting_tool_material_id.name', '=', '刀柄')]",
+        domain="[('cutting_tool_type', '=', '刀柄')]",
         string='适用刀柄型号'
     )
-    cutting_tool_feature = fields.Char('特性')
     # 夹具参数
     fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料")
     fixture_model_id = fields.Many2one('sf.fixture.model', string="夹具型号")
@@ -140,17 +130,57 @@ class ResProductMo(models.Model):
     fixture_clamping_way = fields.Char(string="装夹方式")
     fixture_port_type = fields.Char(string="接口类型")
     fixture_model_file = fields.Binary(string="3D模型图")
-    fixture_clamp_workpiece_length_max = fields.Integer(string="夹持工件长度MAX[mm]", size=6)
-    fixture_clamp_workpiece_width_max = fields.Integer(string="夹持工件宽度MAX[mm]", size=6)
-    fixture_clamp_workpiece_height_max = fields.Integer(string="夹持工件高度MAX[mm]", size=6)
-    fixture_clamp_workpiece_diameter_max = fields.Float(string="夹持工件直径MAX[mm]", digits=(16, 6))
-    fixture_maximum_carrying_weight = fields.Float(string="最大承载重量[kg]", digits=(16, 4))
-    fixture_maximum_clamping_force = fields.Integer(string="最大夹持力[n]", size=8)
+    fixture_clamp_workpiece_length_max = fields.Integer(string="夹持工件长度MAX(mm)", size=6)
+    fixture_clamp_workpiece_width_max = fields.Integer(string="夹持工件宽度MAX(mm)", size=6)
+    fixture_clamp_workpiece_height_max = fields.Integer(string="夹持工件高度MAX(mm)", size=6)
+    fixture_clamp_workpiece_diameter_max = fields.Float(string="夹持工件直径MAX(mm)", digits=(16, 6))
+    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_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)
+    fixture_through_hole_size = fields.Integer(string="过孔大小(mm)", size=6)
+    fixture_screw_size = fields.Integer(string="螺牙大小(mm)", size=6)
+    # 注册状态
+    register_state = fields.Selection([('未注册', '未注册'), ('已注册', '已注册'), ('注册失败', '注册失败')],
+                                      string='注册状态', default='未注册')
+    industry_code = fields.Char('行业编码', readonly=True)
+
+    def _json_apply_machine_tool_type_item_code(self, item):
+        code_arr = []
+        for i in item.product_id.fixture_apply_machine_tool_type_ids:
+            code_arr.append(i.code)
+        return code_arr
+
+    def _json_chuck_item_code(self, item):
+        code_arr = []
+        for i in item.product_id.cutting_tool_chuck_ids:
+            code_arr.append(i.code)
+        return code_arr
+
+    def _json_cutter_bar_item_code(self, item):
+        code_arr = []
+        for i in item.product_id.cutting_tool_cutter_bar_ids:
+            code_arr.append(i.code)
+        return code_arr
+
+    def _json_cutter_pad_item_code(self, item):
+        code_arr = []
+        for i in item.product_id.cutting_tool_cutter_pad_ids:
+            code_arr.append(i.code)
+        return code_arr
+
+    def _json_blade_item_code(self, item):
+        code_arr = []
+        for i in item.product_id.cutting_tool_blade_ids:
+            code_arr.append(i.code)
+        return code_arr
+
+    def _json_handle_item_code(self, item):
+        code_arr = []
+        for i in item.product_id.cutting_tool_handle_ids:
+            code_arr.append(i.code)
+        return code_arr
 
     def _get_ids(self, param):
         type_ids = []
@@ -170,7 +200,7 @@ class ResProductMo(models.Model):
     @api.onchange('cutting_tool_material_id')
     def _onchange_cutting_tool_material_id(self):
         for item in self:
-            if item.cutting_tool_material_id.id != item.cutting_tool_model_id.mrs_cutting_tool_material_id.id:
+            if item.cutting_tool_material_id.id != item.cutting_tool_model_id.cutting_tool_material_id.id:
                 item.cutting_tool_model_id = False
 
     @api.onchange('fixture_material_id')
@@ -182,7 +212,7 @@ class ResProductMo(models.Model):
     @api.onchange('fixture_model_id')
     def _onchange_fixture_model_id(self):
         for item in self:
-            if self.fixture_material_type in ['气动托盘', '转接板(锁板)托盘', '磁吸托盘', '虎钳托盘', '零点卡盘']:
+            if self.fixture_material_type in ['气动夹具', '转接板(锁板)夹具', '磁吸夹具', '虎钳夹具', '零点卡盘']:
                 item.brand_id = item.fixture_model_id.brand_id.id
                 item.fixture_multi_mounting_type_id = item.fixture_model_id.multi_mounting_type_id.id
                 item.fixture_model_file = item.fixture_model_id.model_file
@@ -193,162 +223,100 @@ class ResProductMo(models.Model):
                 item.materials_type_id = item.fixture_model_id.materials_model_id.id
                 item.fixture_maximum_carrying_weight = item.fixture_model_id.maximum_carrying_weight
                 item.fixture_maximum_clamping_force = item.fixture_model_id.maximum_clamping_force
-                if self.fixture_material_type in ['零点卡盘', '转接板(锁板)托盘']:
+                if self.fixture_material_type in ['零点卡盘', '转接板(锁板)夹具']:
                     item.fixture_clamping_way = item.fixture_model_id.clamping_way
                     item.fixture_port_type = item.fixture_model_id.port_type
-                if self.fixture_material_type in ['气动托盘', '转接板(锁板)托盘', '磁吸托盘']:
+                if self.fixture_material_type in ['气动夹具', '转接板(锁板)夹具', '磁吸夹具']:
                     item.fixture_driving_way = item.fixture_model_id.driving_way
-                if self.fixture_material_type in ['气动托盘', '磁吸托盘', '虎钳托盘', '零点卡盘']:
+                if self.fixture_material_type in ['气动夹具', '磁吸夹具', '虎钳夹具', '零点卡盘']:
                     item.fixture_through_hole_size = item.fixture_model_id.through_hole_size
                     item.fixture_screw_size = item.fixture_model_id.screw_size
-                if self.fixture_material_type in ['气动托盘', '转接板(锁板)托盘', '磁吸托盘', '虎钳托盘']:
+                if self.fixture_material_type in ['气动夹具', '转接板(锁板)夹具', '磁吸夹具', '虎钳夹具']:
                     item.fixture_clamp_workpiece_length_max = item.fixture_model_id.clamp_workpiece_length_max
                     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 = self._get_ids(item.fixture_model_id.apply_machine_tool_type_ids)
+                    item.fixture_apply_machine_tool_type_ids = 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):
         for item in self:
-            if self.cutting_tool_type == '整体式刀具':
-                item.brand_id = item.cutting_tool_model_id.mrs_machine_brand_id.id
-                item.cutting_tool_total_length = item.cutting_tool_model_id.integral_total_length
-                item.cutting_tool_shank_length = item.cutting_tool_model_id.integral_shank_length
-                item.cutting_tool_blade_length = item.cutting_tool_model_id.integral_blade_length
-                item.cutting_tool_diameter = item.cutting_tool_model_id.integral_diameter
-                item.cutting_tool_nut = item.cutting_tool_model_id.integral_nut
-                item.cutting_tool_blade_number = item.cutting_tool_model_id.integral_blade_number
-                item.cutting_tool_material_model_id = item.cutting_tool_model_id.mrs_materials_model_id.id
-                item.cutting_tool_front_angle = item.cutting_tool_model_id.integral_front_angle
-                item.cutting_tool_rear_angle = item.cutting_tool_model_id.integral_rear_angle
-                item.cutting_tool_main_included_angle = item.cutting_tool_model_id.integral_main_included_angle
-                item.cutting_tool_chuck_model_ids = self._get_ids(
-                    item.cutting_tool_model_id.mrs_cutting_tool_model_handle_chuck_model_ids)
-                item.cutting_tool_scope = item.cutting_tool_model_id.integral_scope
-                item.image_1920 = '' if not item.cutting_tool_model_id.image else item.cutting_tool_model_id.image
-            elif self.cutting_tool_type == '刀片':
-                item.brand_id = item.cutting_tool_model_id.mrs_machine_brand_id.id
-                item.cutting_tool_top_angle = item.cutting_tool_model_id.blade_top_angle
-                item.cutting_tool_front_angle = item.cutting_tool_model_id.blade_front_angle
-                item.cutting_tool_rear_angle = item.cutting_tool_model_id.blade_rear_angle
-                item.cutting_tool_main_included_angle = item.cutting_tool_model_id.blade_main_included_angle
-                item.cutting_tool_r_angle = item.cutting_tool_model_id.blade_r_angle
-                item.cutting_tool_working_hardness = item.cutting_tool_model_id.blade_hardness
-                item.cutting_tool_material_model_id = item.cutting_tool_model_id.mrs_materials_model_id.id
-                item.tool_length = item.cutting_tool_model_id.blade_length
-                item.tool_width = item.cutting_tool_model_id.blade_width
-                item.tool_height = item.cutting_tool_model_id.blade_height
-                item.cutting_tool_radius = item.cutting_tool_model_id.blade_radius
-                item.cutting_tool_nut = item.cutting_tool_model_id.blade_nut
-                item.cutting_tool_cutter_bar_ids = self._get_ids(
-                    item.cutting_tool_model_id.mrs_cutting_tool_model_blade_cutter_bar_ids)
-                item.cutting_tool_cutter_pad_ids = self._get_ids(
-                    item.cutting_tool_model_id.mrs_cutting_tool_model_blade_cutter_pad_ids)
-                item.image_1920 = '' if not item.cutting_tool_model_id.image else item.cutting_tool_model_id.image
-            elif self.cutting_tool_type == '刀杆':
-                item.brand_id = item.cutting_tool_model_id.mrs_machine_brand_id.id
-                item.cutting_tool_c_diameter = item.cutting_tool_model_id.bar_c_diameter
-                item.cutting_tool_d_diameter = item.cutting_tool_model_id.bar_d_diameter
-                item.cutting_tool_l_total_length = item.cutting_tool_model_id.bar_total_length
-                item.cutting_tool_wrench = item.cutting_tool_model_id.bar_wrench
-                item.cutting_tool_screw = item.cutting_tool_model_id.bar_screw
-                item.cutting_tool_blade_ids = self._get_ids(
-                    item.cutting_tool_model_id.mrs_cutting_tool_model_pad_blade_ids)
-                item.cutting_tool_scope = item.cutting_tool_model_id.bar_scope
-                item.cutting_tool_material_model_id = item.cutting_tool_model_id.mrs_materials_model_id.id
-                item.cutting_tool_rounded_corner = item.cutting_tool_model_id.bar_radius
-                item.cutting_tool_accuracy_level = item.cutting_tool_model_id.bar_accuracy
-                item.cutting_tool_blade_number = item.cutting_tool_model_id.bar_blade_number
-                item.cutting_tool_hardness = item.cutting_tool_model_id.bar_hardness
-                item.image_1920 = '' if not item.cutting_tool_model_id.image else item.cutting_tool_model_id.image
-            elif self.cutting_tool_type == '刀盘':
-                item.brand_id = item.cutting_tool_model_id.mrs_machine_brand_id.id
-                item.cutting_tool_c_diameter = item.cutting_tool_model_id.pad_c_diameter
-                item.cutting_tool_d_diameter = item.cutting_tool_model_id.pad_d_diameter
-                item.cutting_tool_l_total_length = item.cutting_tool_model_id.pad_total_length
-                item.cutting_tool_wrench = item.cutting_tool_model_id.pad_wrench
-                item.cutting_tool_screw = item.cutting_tool_model_id.pad_screw
-                item.cutting_tool_blade_ids = self._get_ids(
-                    item.cutting_tool_model_id.mrs_cutting_tool_model_pad_blade_ids)
-                item.cutting_tool_scope = item.cutting_tool_model_id.pad_scope
-                item.cutting_tool_material_model_id = item.cutting_tool_model_id.mrs_materials_model_id.id
-                item.cutting_tool_rounded_corner = item.cutting_tool_model_id.pad_radius
-                item.cutting_tool_accuracy_level = item.cutting_tool_model_id.pad_accuracy
-                item.cutting_tool_blade_number = item.cutting_tool_model_id.pad_blade_number
-                item.cutting_tool_hardness = item.cutting_tool_model_id.pad_hardness
-                item.image_1920 = '' if not item.cutting_tool_model_id.image else item.cutting_tool_model_id.image
-            elif self.cutting_tool_type == '刀柄':
-                item.brand_id = item.cutting_tool_model_id.mrs_machine_brand_id.id
-                item.cutting_tool_handle_length = item.cutting_tool_model_id.handle_length
-                item.cutting_tool_length1 = item.cutting_tool_model_id.handle_length
-                item.cutting_tool_diameter1 = item.cutting_tool_model_id.handle_diameter
-                item.cutting_tool_body_accuracy = item.cutting_tool_model_id.handle_body_accuracy
-                item.cutting_tool_nut = item.cutting_tool_model_id.handle_nut
-                item.cutting_tool_clamping_range = item.cutting_tool_model_id.handle_clamping_range
-                item.tool_weight = item.cutting_tool_model_id.handle_weight
-                item.cutting_tool_material_model_id = item.cutting_tool_model_id.mrs_materials_model_id.id
-                item.cutting_tool_chuck_model_ids = self._get_ids(
-                    item.cutting_tool_model_id.mrs_cutting_tool_model_handle_chuck_model_ids)
-                item.cutting_tool_detection_accuracy = item.cutting_tool_model_id.handle_detection_accuracy
-                item.cutting_tool_detection_hardness = item.cutting_tool_model_id.handle_detection_hardness
-                item.cutting_tool_standard_speed = item.cutting_tool_model_id.handle_standard_speed
-                item.image_1920 = '' if not item.cutting_tool_model_id.image else item.cutting_tool_model_id.image
-            elif self.cutting_tool_type == '夹头':
-                item.brand_id = item.cutting_tool_model_id.mrs_machine_brand_id.id
-                item.cutting_tool_outer_diameter = item.cutting_tool_model_id.chuck_diameter
-                item.cutting_tool_inner_diameter = item.cutting_tool_model_id.chuck_inner_diameter
-                item.cutting_tool_accuracy = item.cutting_tool_model_id.chuck_accuracy
-                item.cutting_tool_nut = item.cutting_tool_model_id.chuck_nut
-                item.cutting_tool_clamping_range = item.cutting_tool_model_id.chuck_clamping_range
-                item.cutting_tool_handle_model_ids = self._get_ids(
-                    item.cutting_tool_model_id.mrs_cutting_tool_model_chuck_handle_model_ids)
-                item.cutting_tool_material_model_id = item.cutting_tool_model_id.mrs_materials_model_id.id
-                item.tool_height = item.cutting_tool_model_id.chuck_height
-                item.cutting_tool_feature = item.cutting_tool_model_id.chuck_feature
-                item.image_1920 = '' if not item.cutting_tool_model_id.image else item.cutting_tool_model_id.image
+            if self.cutting_tool_type is not False:
+                item.brand_id = item.cutting_tool_model_id.brand_id.id
+                item.cutting_tool_type_id = item.cutting_tool_model_id.cutting_tool_type_id.id
+                item.tool_length = item.cutting_tool_model_id.tool_length
+                item.tool_width = item.cutting_tool_model_id.tool_width
+                item.tool_height = item.cutting_tool_model_id.tool_height
+                item.tool_thickness = item.cutting_tool_model_id.tool_thickness
+                item.tool_weight = item.cutting_tool_model_id.tool_weight
+                item.coating_material = item.cutting_tool_model_id.coating_material
+                item.cutting_tool_total_length = item.cutting_tool_model_id.total_length
+                item.cutting_tool_shank_length = item.cutting_tool_model_id.shank_length
+                item.cutting_tool_blade_length = item.cutting_tool_model_id.blade_length
+                item.cutting_tool_diameter = item.cutting_tool_model_id.diameter
+                item.cutting_tool_blade_number = item.cutting_tool_model_id.blade_number
+                item.cutting_tool_front_angle = item.cutting_tool_model_id.front_angle
+                item.cutting_tool_rear_angle = item.cutting_tool_model_id.rear_angle
+                item.cutting_tool_main_included_angle = item.cutting_tool_model_id.main_included_angle
+                item.materials_type_id = item.cutting_tool_model_id.material_model_id.id
+                item.cutting_tool_nut = item.cutting_tool_model_id.nut
+                item.cutting_tool_top_angle = item.cutting_tool_model_id.top_angle
+                item.cutting_tool_jump_accuracy = item.cutting_tool_model_id.jump_accuracy
+                item.cutting_tool_working_hardness = item.cutting_tool_model_id.working_hardness
+                item.cutting_tool_blade_diameter = item.cutting_tool_model_id.blade_diameter
+                item.cutting_tool_wrench = item.cutting_tool_model_id.wrench
+                item.cutting_tool_screw = item.cutting_tool_model_id.screw
+                item.cutting_tool_accuracy_level = item.cutting_tool_model_id.accuracy_level
+                item.cutting_tool_diameter_max = item.cutting_tool_model_id.diameter_max
+                item.cutting_tool_clamping_diameter = item.cutting_tool_model_id.clamping_diameter
+                item.cutting_tool_flange_length = item.cutting_tool_model_id.flange_length
+                item.cutting_tool_flange_diameter = item.cutting_tool_model_id.flange_diameter
+                item.cutting_tool_outer_diameter = item.cutting_tool_model_id.outer_diameter
+                item.cutting_tool_inner_diameter = item.cutting_tool_model_id.inner_diameter
+                item.cutting_tool_chuck_ids = self._get_ids(item.cutting_tool_model_id.chuck_ids)
+                item.cutting_tool_cutter_bar_ids = self._get_ids(item.cutting_tool_model_id.cutter_bar_ids)
+                item.cutting_tool_cutter_pad_ids = self._get_ids(item.cutting_tool_model_id.cutter_pad_ids)
+                item.cutting_tool_blade_ids = self._get_ids(item.cutting_tool_model_id.blade_ids)
+                item.cutting_tool_handle_ids = self._get_ids(item.cutting_tool_model_id.handle_ids)
             else:
                 item.brand_id = False
+                item.cutting_tool_type_id = False
+                item.brand_id = False
+                item.tool_length = False
+                item.tool_width = False
+                item.tool_height = False
+                item.tool_thickness = False
+                item.tool_weight = False
+                item.coating_material = False
                 item.cutting_tool_total_length = False
                 item.cutting_tool_shank_length = False
                 item.cutting_tool_blade_length = False
                 item.cutting_tool_diameter = False
-                item.cutting_tool_nut = False
                 item.cutting_tool_blade_number = False
-                item.cutting_tool_material_model_id = False
                 item.cutting_tool_front_angle = False
                 item.cutting_tool_rear_angle = False
                 item.cutting_tool_main_included_angle = False
-                item.cutting_tool_chuck_model_ids = False
-                item.cutting_tool_scope = False
+                item.materials_type_id = False
+                item.cutting_tool_nut = False
                 item.cutting_tool_top_angle = False
-                item.cutting_tool_r_angle = False
+                item.cutting_tool_jump_accuracy = False
                 item.cutting_tool_working_hardness = False
-                item.tool_length = False
-                item.tool_width = False
-                item.tool_height = False
-                item.cutting_tool_radius = False
-                item.cutting_tool_cutter_bar_ids = False
-                item.cutting_tool_cutter_pad_ids = False
-                item.cutting_tool_c_diameter = False
-                item.cutting_tool_d_diameter = False
-                item.cutting_tool_l_total_length = False
+                item.cutting_tool_blade_diameter = False
                 item.cutting_tool_wrench = False
                 item.cutting_tool_screw = False
-                item.cutting_tool_blade_ids = False
-                item.cutting_tool_rounded_corner = False
                 item.cutting_tool_accuracy_level = False
-                item.cutting_tool_hardness = False
-                item.cutting_tool_handle_length = False
-                item.cutting_tool_length1 = False
-                item.cutting_tool_diameter1 = False
-                item.cutting_tool_body_accuracy = False
-                item.cutting_tool_clamping_range = False
-                item.tool_weight = False
-                item.cutting_tool_detection_accuracy = False
-                item.cutting_tool_detection_hardness = False
-                item.cutting_tool_standard_speed = False
-                item.image_1920 = False
+                item.cutting_tool_diameter_max = False
+                item.cutting_tool_clamping_diameter = False
+                item.cutting_tool_flange_length = False
+                item.cutting_tool_flange_diameter = False
+                item.cutting_tool_outer_diameter = False
+                item.cutting_tool_inner_diameter = False
+                item.cutting_tool_chuck_ids = False
+                item.cutting_tool_cutter_bar_ids = False
+                item.cutting_tool_cutter_pad_ids = False
+                item.cutting_tool_blade_ids = False
+                item.cutting_tool_handle_ids = False
 
 
 class ResMrpBomMo(models.Model):

sf_manufacturing/models/stock.py

@@ -1,6 +1,11 @@
 # -*- coding: utf-8 -*-
+import base64
 from collections import defaultdict, namedtuple
 from odoo.addons.stock.models.stock_rule import ProcurementException
+from odoo.addons.sf_base.commons.common import Common
+from odoo.exceptions import ValidationError, UserError
+import requests
+import json
 from re import findall as regex_findall
 from datetime import datetime
 from re import split as regex_split
@@ -278,6 +283,13 @@ class StockPicking(models.Model):
                         _('该入库单对应的单号为%s的出库单还未完成，不能进行验证操作！' % picking_out.name))
 
         res = super().button_validate()
+        # 采购单验证(夹具)
+        for item in self.move_ids_without_package:
+            if item.quantity_done > 0:
+                if item.product_id.categ_type == '夹具':
+                    item._register_fixture()
+                elif item.product_id.categ_type == '刀具':
+                    item._register_cutting_tool()
         return res
 
     # 创建 外协出库入单
@@ -336,3 +348,127 @@ class ReStockMove(models.Model):
             'location_dest_id': self.mapped('location_dest_id').id,
             'state': 'confirmed',
         }
+
+    # 将采购到的夹具注册到Cloud
+    def _register_fixture(self):
+        create_url = '/api/factory_fixture_material/create'
+        config = self.env['res.config.settings'].get_values()
+        headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+        strurl = config['sf_url'] + create_url
+        for item in self:
+            val = {
+                'token': config['token'],
+                'name': item.product_id.name,
+                'brand_code': self.env['sf.machine.brand'].search([('id', '=', item.product_id.brand_id.id)]).code,
+                'fixture_material_code': self.env['sf.fixture.material'].search(
+                    [('id', '=', item.product_id.fixture_material_id.id)]).code,
+                'fixture_multi_mounting_type_code': self.env['sf.multi_mounting.type'].search(
+                    [('id', '=', item.product_id.fixture_multi_mounting_type_id.id)]).code,
+                'fixture_materials_type_code': self.env['sf.materials.model'].search(
+                    [('id', '=', item.product_id.materials_type_id.id)]).materials_no,
+                'fixture_clamping_way': item.product_id.fixture_clamping_way,
+                'fixture_port_type': item.product_id.fixture_port_type,
+                'fixture_length': item.product_id.tool_length,
+                'fixture_width': item.product_id.tool_width,
+                'fixture_height': item.product_id.tool_height,
+                'fixture_weight': item.product_id.tool_weight,
+                'fixture_amount': int(item.quantity_done),
+                'fixture_model_file': '' if not item.product_id.fixture_model_file else base64.b64encode(
+                    item.product_id.fixture_model_file).decode(
+                    'utf-8'),
+                'fixture_clamp_workpiece_length_max': item.product_id.fixture_clamp_workpiece_length_max,
+                'fixture_clamp_workpiece_width_max': item.product_id.fixture_clamp_workpiece_width_max,
+                'fixture_clamp_workpiece_height_max': item.product_id.fixture_clamp_workpiece_height_max,
+                'fixture_clamp_workpiece_diameter_max': item.product_id.fixture_clamp_workpiece_diameter_max,
+                'fixture_maximum_carrying_weight': item.product_id.fixture_maximum_carrying_weight,
+                'fixture_maximum_clamping_force': item.product_id.fixture_maximum_clamping_force,
+                'fixture_driving_way': '' if not item.product_id.fixture_driving_way else item.product_id.fixture_driving_way,
+                'fixture_apply_machine_tool_type_codes': self.env[
+                    'product.template']._json_apply_machine_tool_type_item_code(item),
+                'fixture_through_hole_size': item.product_id.fixture_through_hole_size,
+                'fixture_screw_size': item.product_id.fixture_screw_size,
+            }
+        try:
+            if item.product_id.industry_code:
+                val['industry_code'] = item.product_id.industry_code
+            ret = requests.post(strurl, json={}, data=val, headers=headers)
+            ret = ret.json()
+            if ret['status'] == 200:
+                if not item.product_id.industry_code:
+                    item.product_id.write({'register_state': '已注册', 'industry_code': ret['industry_code']})
+                else:
+                    item.product_id.write({'register_state': '已注册'})
+            else:
+                item.product_id.write({'register_state': '注册失败'})
+        except Exception as e:
+            raise UserError("注册夹具到云端失败，请联系管理员！")
+
+    # 将采购到的刀具注册到Cloud
+    def _register_cutting_tool(self):
+        create_url = '/api/factory_cutting_tool_material/create'
+        config = self.env['res.config.settings'].get_values()
+        headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+        strurl = config['sf_url'] + create_url
+        for item in self:
+            val = {
+                'token': config['token'],
+                'name': item.product_id.name,
+                'brand_code': self.env['sf.machine.brand'].search([('id', '=', item.product_id.brand_id.id)]).code,
+                'cutting_tool_material_code': self.env['sf.cutting.tool.material'].search(
+                    [('id', '=', item.product_id.cutting_tool_material_id.id)]).code,
+                'cutting_tool_type_code': self.env['sf.cutting.tool.type'].search(
+                    [('id', '=', item.product_id.cutting_tool_type_id.id)]).code,
+                'material_model_code': self.env['sf.materials.model'].search(
+                    [('id', '=', item.product_id.materials_type_id.id)]).materials_no,
+                'tool_length': item.product_id.tool_length,
+                'tool_width': item.product_id.tool_width,
+                'tool_height': item.product_id.tool_height,
+                'tool_thickness': item.product_id.tool_thickness,
+                'tool_weight': item.product_id.tool_weight,
+                'coating_material': item.product_id.coating_material,
+                'amount': int(item.quantity_done),
+                # 'model_file': '' if not item.product_id.fixture_model_file else base64.b64encode(
+                #     item.product_id.fixture_model_file).decode(
+                #     'utf-8'),
+                'total_length': item.product_id.cutting_tool_total_length,
+                'shank_length': item.product_id.cutting_tool_shank_length,
+                'blade_length': item.product_id.cutting_tool_blade_length,
+                'diameter': item.product_id.cutting_tool_diameter,
+                'blade_number': item.product_id.cutting_tool_blade_number,
+                'front_angle': item.product_id.cutting_tool_front_angle,
+                'rear_angle': item.product_id.cutting_tool_rear_angle,
+                'main_included_angle': item.product_id.cutting_tool_main_included_angle,
+                'chuck_codes': self.env['product.template']._json_chuck_item_code(item),
+                'cutter_bar_codes': self.env['product.template']._json_cutter_bar_item_code(item),
+                'cutter_pad_codes': self.env['product.template']._json_cutter_pad_item_code(item),
+                'blade_codes': self.env['product.template']._json_blade_item_code(item),
+                'handle_codes': self.env['product.template']._json_handle_item_code(item),
+                'nut': item.product_id.cutting_tool_nut,
+                'top_angle': item.product_id.cutting_tool_top_angle,
+                'jump_accuracy': item.product_id.cutting_tool_jump_accuracy,
+                'working_hardness': item.product_id.cutting_tool_working_hardness,
+                'blade_diameter': item.product_id.cutting_tool_blade_diameter,
+                'wrench': item.product_id.cutting_tool_wrench,
+                'screw': item.product_id.cutting_tool_screw,
+                'accuracy_level': item.product_id.cutting_tool_accuracy_level,
+                'diameter_max': item.product_id.cutting_tool_diameter_max,
+                'clamping_diameter': item.product_id.cutting_tool_clamping_diameter,
+                'flange_length': item.product_id.cutting_tool_flange_length,
+                'flange_diameter': item.product_id.cutting_tool_flange_diameter,
+                'outer_diameter': item.product_id.cutting_tool_outer_diameter,
+                'inner_diameter': item.product_id.cutting_tool_inner_diameter,
+            }
+        try:
+            if item.product_id.industry_code:
+                val['industry_code'] = item.product_id.industry_code
+            ret = requests.post(strurl, json={}, data=val, headers=headers)
+            ret = ret.json()
+            if ret['status'] == 200:
+                if not item.product_id.industry_code:
+                    item.product_id.write({'register_state': '已注册', 'industry_code': ret['industry_code']})
+                else:
+                    item.product_id.write({'register_state': '已注册'})
+            else:
+                item.product_id.write({'register_state': '注册失败'})
+        except Exception as e:
+            raise UserError("注册刀具到云端失败，请联系管理员！")

sf_mrs_connect/data/ir_cron_data.xml

@@ -132,6 +132,40 @@
         <field name="doall" eval="False"/>
     </record>
 
+
+    <record model="ir.cron" id="sf_cutting_tool_material">
+        <field name="name">同步刀具物料</field>
+        <field name="model_id" ref="model_sf_cutting_tool_material"/>
+        <field name="state">code</field>
+        <field name="code">model.sync_cutting_tool_material()</field>
+        <field name="interval_number">1</field>
+        <field name="interval_type">days</field>
+        <field name="numbercall">-1</field>
+        <field name="doall" eval="False"/>
+    </record>
+
+    <record model="ir.cron" id="sf_cutting_tool_type">
+        <field name="name">同步刀具类型</field>
+        <field name="model_id" ref="model_sf_cutting_tool_type"/>
+        <field name="state">code</field>
+        <field name="code">model.sync_tool_type()</field>
+        <field name="interval_number">1</field>
+        <field name="interval_type">days</field>
+        <field name="numbercall">-1</field>
+        <field name="doall" eval="False"/>
+    </record>
+
+    <record model="ir.cron" id="sf_cutting_tool_model">
+        <field name="name">同步刀具型号</field>
+        <field name="model_id" ref="model_sf_cutting_tool_model"/>
+        <field name="state">code</field>
+        <field name="code">model.sync_tool_model()</field>
+        <field name="interval_number">1</field>
+        <field name="interval_type">days</field>
+        <field name="numbercall">-1</field>
+        <field name="doall" eval="False"/>
+    </record>
+
     <record model="ir.cron" id="sf_cron15">
         <field name="name">同步功能刀具型号</field>
         <field name="model_id" ref="model_sf_functional_cutting_tool"/>
@@ -166,7 +200,7 @@
     </record>
 
     <record model="ir.cron" id="sf_multi_mounting_type">
-        <field name="name">同步联装类型列表</field>
+        <field name="name">同步联装类型</field>
         <field name="model_id" ref="model_sf_multi_mounting_type"/>
         <field name="state">code</field>
         <field name="code">model.sync_multi_mounting_type()</field>

sf_mrs_connect/models/res_config_setting.py

@@ -56,9 +56,15 @@ class ResConfigSettings(models.TransientModel):
             _logger.info("同步所有功能刀具列表...")
             self.env['sf.functional.cutting.tool'].sync_all_functional_cutting_tool()
             _logger.info("同步所有功能刀具列表完成")
-
             self.env['sf.fixture.material'].sync_all_fixture_material()
             _logger.info("同步夹具物料")
+            self.env['sf.multi_mounting.type'].sync_all_multi_mounting_type()
+            _logger.info("同步联装类型")
+            # self.env['sf.fixture.model'].sync_all_fixture_model()
+            # _logger.info("同步夹具型号")
+            self.env['sf.functional.fixture.type'].sync_all_functional_fixture_type()
+            _logger.info("同步功能夹具类型")
+            # self.env['sf.functional.fixture'].sync_all_functional_fixture()
             # self.env['sf.multi_mounting.type'].sync_all_multi_mounting_type()
             # _logger.info("同步联装类型")
             # self.env['sf.fixture.model'].sync_all_fixture_model()

sf_mrs_connect/models/sync_common.py

@@ -1628,6 +1628,7 @@ class SyncFixtureModel(models.Model):
                                     [('code', '=', item['apply_machine_tool_type_code'])]).id,
                                 "through_hole_size": item['through_hole_size'],
                                 "screw_size": item['screw_size'],
+                                "active": item['active'],
                             })
         else:
             raise ValidationError("认证未通过")
@@ -1834,35 +1835,24 @@ class SfToolType(models.Model):
             _logger.info('result:%s' % result)
             for item in result['mrs_cutting_tool_type_yesterday_list']:
                 if item:
-                    brand = self.env['sf.cutting.tool.type'].search(
+                    cutting_tool_type = self.env['sf.cutting.tool.type'].search(
                         [("code", '=', item['code'])])
-                    if not brand:
+                    if not cutting_tool_type:
                         self.env['sf.cutting.tool.type'].create({
                             "name": item['name'],
                             "code": item['code'],
-                            "mrs_cutting_tool_material_id": self.env['sf.cutting.tool.material'].search(
-                                [("code", '=', item['mrs_cutting_tool_material_id'])]).id,
-                            "integral_tool_type_code": item['integral_tool_type_code'],
-                            "blade_type_code": item['blade_type_code'],
-                            "bar_type_code": item['bar_type_code'],
-                            "pad_type_code": item['pad_type_code'],
-                            "handle_type_code": item['handle_type_code'],
-                            "chuck_type_code": item['chuck_type_code'],
+                            "cutting_tool_material_id": self.env['sf.cutting.tool.material'].search(
+                                [("code", '=', item['cutting_tool_material_code'])]).id,
                             "remark": item['remark'],
+                            "active": item['active'],
                         })
                     else:
-                        brand.write({
+                        cutting_tool_type.write({
                             "name": item['name'],
-                            "code": item['code'],
-                            "mrs_cutting_tool_material_id": self.env['sf.cutting.tool.material'].search(
-                                [("code", '=', item['mrs_cutting_tool_material_id'])]).id,
-                            "integral_tool_type_code": item['integral_tool_type_code'],
-                            "blade_type_code": item['blade_type_code'],
-                            "bar_type_code": item['bar_type_code'],
-                            "pad_type_code": item['pad_type_code'],
-                            "handle_type_code": item['handle_type_code'],
-                            "chuck_type_code": item['chuck_type_code'],
+                            "cutting_tool_material_id": self.env['sf.cutting.tool.material'].search(
+                                [("code", '=', item['cutting_tool_material_code'])]).id,
                             "remark": item['remark'],
+                            "active": item['active'],
                         })
 
         else:
@@ -1883,35 +1873,24 @@ class SfToolType(models.Model):
             _logger.info('result:%s' % result)
             for item in result['mrs_cutting_tool_type_all_list']:
                 if item:
-                    brand = self.env['sf.cutting.tool.type'].search(
+                    cutting_tool_type = self.env['sf.cutting.tool.type'].search(
                         [("code", '=', item['code'])])
-                    if not brand:
+                    if not cutting_tool_type:
                         self.env['sf.cutting.tool.type'].create({
                             "name": item['name'],
                             "code": item['code'],
-                            "mrs_cutting_tool_material_id": self.env['sf.cutting.tool.material'].search(
-                                [("code", '=', item['mrs_cutting_tool_material_id'])]).id,
-                            "integral_tool_type_code": item['integral_tool_type_code'],
-                            "blade_type_code": item['blade_type_code'],
-                            "bar_type_code": item['bar_type_code'],
-                            "pad_type_code": item['pad_type_code'],
-                            "handle_type_code": item['handle_type_code'],
-                            "chuck_type_code": item['chuck_type_code'],
+                            "cutting_tool_material_id": self.env['sf.cutting.tool.material'].search(
+                                [("code", '=', item['cutting_tool_material_code'])]).id,
                             "remark": item['remark'],
+                            "active": item['active'],
                         })
                     else:
-                        brand.write({
+                        cutting_tool_type.write({
                             "name": item['name'],
-                            "code": item['code'],
-                            "mrs_cutting_tool_material_id": self.env['sf.cutting.tool.material'].search(
-                                [("code", '=', item['mrs_cutting_tool_material_id'])]).id,
-                            "integral_tool_type_code": item['integral_tool_type_code'],
-                            "blade_type_code": item['blade_type_code'],
-                            "bar_type_code": item['bar_type_code'],
-                            "pad_type_code": item['pad_type_code'],
-                            "handle_type_code": item['handle_type_code'],
-                            "chuck_type_code": item['chuck_type_code'],
+                            "cutting_tool_material_id": self.env['sf.cutting.tool.material'].search(
+                                [("code", '=', item['cutting_tool_material_code'])]).id,
                             "remark": item['remark'],
+                            "active": item['active'],
                         })
 
         else:
@@ -1939,275 +1918,123 @@ class SfToolModel(models.Model):
         if result['status'] == 1:
             _logger.info('result:%s' % result)
             for item in result['mrs_cutting_tool_model_yesterday_list']:
-                mrs_cutting_tool_model_blade_cutter_bar_ids_list = []
-                if item.get('mrs_cutting_tool_model_blade_cutter_bar_ids'):
-                    for mrs_cutting_tool_model_blade_cutter_bar_id in item[
-                                'mrs_cutting_tool_model_blade_cutter_bar_ids']:
-                        mrs_cutting_tool_model_blade_cutter_bar_ids_list.append(
-                            self.env['sf.cutting.tool.model'].search(
-                                [("code", '=', mrs_cutting_tool_model_blade_cutter_bar_id)]).id)
-                mrs_cutting_tool_model_blade_cutter_pad_ids_list = []
-                if item.get('mrs_cutting_tool_model_blade_cutter_pad_ids'):
-                    for mrs_cutting_tool_model_blade_cutter_pad_id in item[
-                                'mrs_cutting_tool_model_blade_cutter_pad_ids']:
-                        mrs_cutting_tool_model_blade_cutter_pad_ids_list.append(
-                            self.env['sf.cutting.tool.model'].search(
-                                [("code", '=', mrs_cutting_tool_model_blade_cutter_pad_id)]).id)
-                mrs_cutting_tool_model_bar_blade_ids_list = []
-                if item.get('mrs_cutting_tool_model_bar_blade_ids'):
-                    for mrs_cutting_tool_model_bar_blade_id in item['mrs_cutting_tool_model_bar_blade_ids']:
-                        mrs_cutting_tool_model_bar_blade_ids_list.append(self.env['sf.cutting.tool.model'].search(
-                            [("code", '=', mrs_cutting_tool_model_bar_blade_id)]).id)
-                mrs_cutting_tool_model_pad_blade_ids_list = []
-                if item.get('mrs_cutting_tool_model_pad_blade_ids'):
-                    for mrs_cutting_tool_model_pad_blade_id in item['mrs_cutting_tool_model_pad_blade_ids']:
-                        mrs_cutting_tool_model_pad_blade_ids_list.append(self.env['sf.cutting.tool.model'].search(
-                            [("code", '=', mrs_cutting_tool_model_pad_blade_id)]).id)
-                mrs_cutting_tool_model_handle_chuck_model_ids_list = []
-                if item.get('mrs_cutting_tool_model_handle_chuck_model_ids'):
-                    for mrs_cutting_tool_model_handle_chuck_model_id in item[
-                                'mrs_cutting_tool_model_handle_chuck_model_ids']:
-                        mrs_cutting_tool_model_handle_chuck_model_ids_list.append(
-                            self.env['sf.cutting.tool.model'].search(
-                                [("code", '=', mrs_cutting_tool_model_handle_chuck_model_id)]).id)
-                mrs_cutting_tool_model_chuck_handle_model_ids_list = []
-                if item.get('mrs_cutting_tool_model_chuck_handle_model_ids'):
-                    for mrs_cutting_tool_model_chuck_handle_model_id in item[
-                                'mrs_cutting_tool_model_chuck_handle_model_ids']:
-                        mrs_cutting_tool_model_chuck_handle_model_ids_list.append(
-                            self.env['sf.cutting.tool.model'].search(
-                                [("code", '=', mrs_cutting_tool_model_chuck_handle_model_id)]).id)
-                if item:
-                    brand = self.env['sf.cutting.tool.model'].search(
+                cutting_tool_model = self.search(
                     [("code", '=', item['code'])])
-                    if item.get('image'):
-                        image = base64.b64decode(item['image'])
-                    else:
-                        image = ''
-                    if not brand:
-                        new_record = self.env['sf.cutting.tool.model'].create({
+                if not cutting_tool_model:
+                    self.env['sf.cutting.tool.model'].create({
                         "name": item['name'],
                         "code": item['code'],
-                            "mrs_machine_brand_id": self.env['sf.machine.brand'].search(
-                                [("code", '=', item['mrs_machine_brand_id'])]).id,
-                            "mrs_materials_model_id": self.env['sf.materials.model'].search(
-                                [("materials_no", '=', item['mrs_materials_model_id'])]).id,
-                            "mrs_cutting_tool_material_id": self.env['sf.cutting.tool.material'].search(
-                                [("code", '=', item['mrs_cutting_tool_material_id'])]).id,
-                            "mrs_cutting_tool_material_name": item['mrs_cutting_tool_material_name'],
-                            "mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search(
-                                [("code", '=', item['mrs_cutting_tool_type_id'])]).id,
-                            "integral_code": item['integral_code'],
-                            "integral_total_length": item['integral_total_length'],
-                            "integral_shank_length": item['integral_shank_length'],
-                            "integral_blade_length": item['integral_blade_length'],
-                            "integral_diameter": item['integral_diameter'],
-                            "integral_blade_number": item['integral_blade_number'],
-                            "integral_front_angle": item['integral_front_angle'],
-                            "integral_rear_angle": item['integral_rear_angle'],
-                            "integral_main_included_angle": item['integral_main_included_angle'],
-                            "integral_nut": item['integral_nut'],
-                            "integral_scope": item['integral_scope'],
-                            "blade_code": item['blade_code'],
+                        "brand_id": self.env['sf.machine.brand'].search(
+                            [("code", '=', item['brand_code'])]).id,
+                        "material_model_id": self.env['sf.materials.model'].search(
+                            [("materials_no", '=', item['material_model_code'])]).id,
+                        "cutting_tool_material_id": self.env['sf.cutting.tool.material'].search(
+                            [("code", '=', item['cutting_tool_material_code'])]).id,
+                        "cutting_tool_type_id": self.env['sf.cutting.tool.type'].search(
+                            [("code", '=', item['cutting_tool_type_code'])]).id,
+                        "tool_length": item['tool_length'],
+                        "tool_width": item['tool_width'],
+                        "tool_height": item['tool_height'],
+                        "tool_thickness": item['tool_thickness'],
+                        "tool_weight": item['tool_weight'],
+                        "coating_material": item['coating_material'],
+                        "total_length": item['total_length'],
+                        "shank_length": item['shank_length'],
                         "blade_length": item['blade_length'],
-                            "blade_width": item['blade_width'],
-                            "blade_height": item['blade_height'],
-                            "blade_top_angle": item['blade_top_angle'],
-                            "blade_front_angle": item['blade_front_angle'],
-                            "blade_rear_angle": item['blade_rear_angle'],
-                            "blade_main_included_angle": item['blade_main_included_angle'],
-                            "blade_r_angle": item['blade_r_angle'],
-                            "blade_hardness": item['blade_hardness'],
-                            "blade_radius": item['blade_radius'],
-                            "blade_nut": item['blade_nut'],
-                            "mrs_cutting_tool_model_blade_cutter_bar_ids":
-                                mrs_cutting_tool_model_blade_cutter_bar_ids_list,
-                            "mrs_cutting_tool_model_blade_cutter_pad_ids":
-                                mrs_cutting_tool_model_blade_cutter_pad_ids_list,
-                            "bar_code": item['bar_code'],
-                            "bar_c_diameter": item['bar_c_diameter'],
-                            "bar_total_length": item['bar_total_length'],
-                            "bar_blade_number": item['bar_blade_number'],
-                            "bar_d_diameter": item['bar_d_diameter'],
-                            "mrs_cutting_tool_model_bar_blade_ids": mrs_cutting_tool_model_bar_blade_ids_list,
-                            "bar_wrench": item['bar_wrench'],
-                            "bar_screw": item['bar_screw'],
-                            "bar_radius": item['bar_radius'],
-                            "bar_accuracy": item['bar_accuracy'],
-                            "bar_hardness": item['bar_hardness'],
-                            "bar_scope": item['bar_scope'],
-                            "pad_code": item['pad_code'],
-                            "pad_c_diameter": item['pad_c_diameter'],
-                            "pad_total_length": item['pad_total_length'],
-                            "pad_blade_number": item['pad_blade_number'],
-                            "pad_d_diameter": item['pad_d_diameter'],
-                            "mrs_cutting_tool_model_pad_blade_ids": mrs_cutting_tool_model_pad_blade_ids_list,
-                            "pad_wrench": item['pad_wrench'],
-                            "pad_screw": item['pad_screw'],
-                            "pad_radius": item['pad_radius'],
-                            "pad_accuracy": item['pad_accuracy'],
-                            "pad_hardness": item['pad_hardness'],
-                            "pad_scope": item['pad_scope'],
-                            "handle_code": item['handle_code'],
-                            "handle_length": item['handle_length'],
-                            "handle_diameter": item['handle_diameter'],
-                            "handle_flange_length": item['handle_flange_length'],
-                            "handle_flange_diameter": item['handle_flange_diameter'],
-                            "handle_clamping_diameter_min": item['handle_clamping_diameter_min'],
-                            "handle_clamping_diameter_max": item['handle_clamping_diameter_max'],
-                            "handle_jump_accuracy": item['handle_jump_accuracy'],
-                            "handle_max_speed": item['handle_max_speed'],
-                            "handle_weight": item['handle_weight'],
-                            "handle_body_accuracy": item['handle_body_accuracy'],
-                            "handle_nut": item['handle_nut'],
-                            "mrs_cutting_tool_model_handle_chuck_model_ids": [
-                                (6, 0, mrs_cutting_tool_model_handle_chuck_model_ids_list)],
-                            "handle_clamping_range": item['handle_clamping_range'],
-                            "handle_detection_accuracy": item['handle_detection_accuracy'],
-                            "handle_detection_hardness": item['handle_detection_hardness'],
-                            "handle_standard_speed": item['handle_standard_speed'],
-                            "chuck_code": item['chuck_code'],
-                            "chuck_accuracy": item['chuck_accuracy'],
-                            "chuck_diameter": item['chuck_diameter'],
-                            "chuck_inner_diameter": item['chuck_inner_diameter'],
-                            "chuck_height": item['chuck_height'],
-                            "chuck_nut": item['chuck_nut'],
-                            "mrs_cutting_tool_model_chuck_handle_model_ids":
-                                mrs_cutting_tool_model_chuck_handle_model_ids_list,
-                            "chuck_clamping_range": item['chuck_clamping_range'],
-                            "chuck_feature": item['chuck_feature'],
-                            "image": image,
-                            "hide_integral": item['hide_integral'],
-                            "hide_blade": item['hide_blade'],
-                            "hide_cutter_bar": item['hide_cutter_bar'],
-                            "hide_cutter_pad": item['hide_cutter_pad'],
-                            "hide_handler": item['hide_handler'],
-                            "hide_chuck": item['hide_chuck'],
-                            "hide_model": item['hide_model'],
+                        "front_angle": item['front_angle'],
+                        "rear_angle": item['rear_angle'],
+                        "main_included_angle": item['main_included_angle'],
+                        "nut": item['nut'],
+                        "top_angle": item['top_angle'],
+                        "jump_accuracy": item['jump_accuracy'],
+                        "working_hardness": item['working_hardness'],
+                        "blade_diameter": item['blade_diameter'],
+                        "wrench": item['wrench'],
+                        "screw": item['screw'],
+                        "accuracy_level": item['accuracy_level'],
+                        "diameter_max": item['diameter_max'],
+                        "clamping_diameter": item['clamping_diameter'],
+                        "flange_length": item['flange_length'],
+                        'chuck_ids': [(6, 0, [])] if not item.get('chuck_codes') else
+                        self.env['mrs.cutting.tool.dynamic.model'].sudo()._get_cutting_tool_model_ids(
+                            item['chuck_codes']),
+                        'cutter_bar_ids': [(6, 0, [])] if not item.get('cutter_bar_codes') else
+                        self.env['mrs.cutting.tool.dynamic.model'].sudo()._get_cutting_tool_model_ids(
+                            item['cutter_bar_codes']),
+                        'cutter_pad_ids': [(6, 0, [])] if not item.get('cutter_pad_codes') else
+                        self.env['mrs.cutting.tool.dynamic.model'].sudo()._get_cutting_tool_model_ids(
+                            item['cutter_pad_codes']),
+                        'blade_ids': [(6, 0, [])] if not item.get('blade_codes') else
+                        self.env['mrs.cutting.tool.dynamic.model'].sudo()._get_cutting_tool_model_ids(
+                            item['blade_codes']),
+                        'handle_ids': [(6, 0, [])] if not item.get('handle_codes') else
+                        self.env['mrs.cutting.tool.dynamic.model'].sudo()._get_cutting_tool_model_ids(
+                            item['handle_codes']),
+                        "flange_diameter": item['flange_diameter'],
+                        "outer_diameter": item['outer_diameter'],
+                        "inner_diameter": item['inner_diameter'],
+                        "active": item['active'],
                     })
-                        new_record.write({
-                            'mrs_cutting_tool_model_handle_chuck_model_ids': [
-                                (6, 0, [new_record.id] * len(mrs_cutting_tool_model_handle_chuck_model_ids_list))],
-                        })
-                        # many2many_commands = [(0, 0, {'model_id_1': new_record.id, 'model_id_2': related_record_id}) for
-                        #                       related_record_id in mrs_cutting_tool_model_handle_chuck_model_ids_list]
-                        # new_record.write({
-                        #     'mrs_cutting_tool_model_handle_chuck_model_ids': many2many_commands,
-                        # })
                 else:
-                        brand.write({
+                    cutting_tool_model.write({
                         "name": item['name'],
                         "code": item['code'],
-                            "mrs_machine_brand_id": self.env['sf.machine.brand'].search(
-                                [("code", '=', item['mrs_machine_brand_id'])]).id,
-                            "mrs_materials_model_id": self.env['sf.materials.model'].search(
-                                [("materials_no", '=', item['mrs_materials_model_id'])]).id,
-                            "mrs_cutting_tool_material_id": self.env['sf.cutting.tool.material'].search(
-                                [("code", '=', item['mrs_cutting_tool_material_id'])]).id,
-                            "mrs_cutting_tool_material_name": item['mrs_cutting_tool_material_name'],
-                            "mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search(
-                                [("code", '=', item['mrs_cutting_tool_type_id'])]).id,
-                            "integral_code": item['integral_code'],
-                            "integral_total_length": item['integral_total_length'],
-                            "integral_shank_length": item['integral_shank_length'],
-                            "integral_blade_length": item['integral_blade_length'],
-                            "integral_diameter": item['integral_diameter'],
-                            "integral_blade_number": item['integral_blade_number'],
-                            "integral_front_angle": item['integral_front_angle'],
-                            "integral_rear_angle": item['integral_rear_angle'],
-                            "integral_main_included_angle": item['integral_main_included_angle'],
-                            "integral_nut": item['integral_nut'],
-                            "integral_scope": item['integral_scope'],
-                            "blade_code": item['blade_code'],
+                        "brand_id": self.env['sf.machine.brand'].search(
+                            [("code", '=', item['brand_code'])]).id,
+                        "material_model_id": self.env['sf.materials.model'].search(
+                            [("materials_no", '=', item['material_model_code'])]).id,
+                        "cutting_tool_material_id": self.env['sf.cutting.tool.material'].search(
+                            [("code", '=', item['cutting_tool_material_code'])]).id,
+                        "cutting_tool_type_id": self.env['sf.cutting.tool.type'].search(
+                            [("code", '=', item['cutting_tool_type_code'])]).id,
+                        "tool_length": item['tool_length'],
+                        "tool_width": item['tool_width'],
+                        "tool_height": item['tool_height'],
+                        "tool_thickness": item['tool_thickness'],
+                        "tool_weight": item['tool_weight'],
+                        "coating_material": item['coating_material'],
+                        "total_length": item['total_length'],
+                        "shank_length": item['shank_length'],
                         "blade_length": item['blade_length'],
-                            "blade_width": item['blade_width'],
-                            "blade_height": item['blade_height'],
-                            "blade_top_angle": item['blade_top_angle'],
-                            "blade_front_angle": item['blade_front_angle'],
-                            "blade_rear_angle": item['blade_rear_angle'],
-                            "blade_main_included_angle": item['blade_main_included_angle'],
-                            "blade_r_angle": item['blade_r_angle'],
-                            "blade_hardness": item['blade_hardness'],
-                            "blade_radius": item['blade_radius'],
-                            "blade_nut": item['blade_nut'],
-                            "mrs_cutting_tool_model_blade_cutter_bar_ids":
-                                mrs_cutting_tool_model_blade_cutter_bar_ids_list,
-                            "mrs_cutting_tool_model_blade_cutter_pad_ids":
-                                mrs_cutting_tool_model_blade_cutter_pad_ids_list,
-                            "bar_code": item['bar_code'],
-                            "bar_c_diameter": item['bar_c_diameter'],
-                            "bar_total_length": item['bar_total_length'],
-                            "bar_blade_number": item['bar_blade_number'],
-                            "bar_d_diameter": item['bar_d_diameter'],
-                            "mrs_cutting_tool_model_bar_blade_ids": mrs_cutting_tool_model_bar_blade_ids_list,
-                            "bar_wrench": item['bar_wrench'],
-                            "bar_screw": item['bar_screw'],
-                            "bar_radius": item['bar_radius'],
-                            "bar_accuracy": item['bar_accuracy'],
-                            "bar_hardness": item['bar_hardness'],
-                            "bar_scope": item['bar_scope'],
-                            "pad_code": item['pad_code'],
-                            "pad_c_diameter": item['pad_c_diameter'],
-                            "pad_total_length": item['pad_total_length'],
-                            "pad_blade_number": item['pad_blade_number'],
-                            "pad_d_diameter": item['pad_d_diameter'],
-                            "mrs_cutting_tool_model_pad_blade_ids": mrs_cutting_tool_model_pad_blade_ids_list,
-                            "pad_wrench": item['pad_wrench'],
-                            "pad_screw": item['pad_screw'],
-                            "pad_radius": item['pad_radius'],
-                            "pad_accuracy": item['pad_accuracy'],
-                            "pad_hardness": item['pad_hardness'],
-                            "pad_scope": item['pad_scope'],
-                            "handle_code": item['handle_code'],
-                            "handle_length": item['handle_length'],
-                            "handle_diameter": item['handle_diameter'],
-                            "handle_flange_length": item['handle_flange_length'],
-                            "handle_flange_diameter": item['handle_flange_diameter'],
-                            "handle_clamping_diameter_min": item['handle_clamping_diameter_min'],
-                            "handle_clamping_diameter_max": item['handle_clamping_diameter_max'],
-                            "handle_jump_accuracy": item['handle_jump_accuracy'],
-                            "handle_max_speed": item['handle_max_speed'],
-                            "handle_weight": item['handle_weight'],
-                            "handle_body_accuracy": item['handle_body_accuracy'],
-                            "handle_nut": item['handle_nut'],
-                            "mrs_cutting_tool_model_handle_chuck_model_ids": [
-                                (6, 0, mrs_cutting_tool_model_handle_chuck_model_ids_list)],
-                            "handle_clamping_range": item['handle_clamping_range'],
-                            "handle_detection_accuracy": item['handle_detection_accuracy'],
-                            "handle_detection_hardness": item['handle_detection_hardness'],
-                            "handle_standard_speed": item['handle_standard_speed'],
-                            "chuck_code": item['chuck_code'],
-                            "chuck_accuracy": item['chuck_accuracy'],
-                            "chuck_diameter": item['chuck_diameter'],
-                            "chuck_inner_diameter": item['chuck_inner_diameter'],
-                            "chuck_height": item['chuck_height'],
-                            "chuck_nut": item['chuck_nut'],
-                            "mrs_cutting_tool_model_chuck_handle_model_ids":
-                                mrs_cutting_tool_model_chuck_handle_model_ids_list,
-                            "chuck_clamping_range": item['chuck_clamping_range'],
-                            "chuck_feature": item['chuck_feature'],
-                            "image": image,
-                            "hide_integral": item['hide_integral'],
-                            "hide_blade": item['hide_blade'],
-                            "hide_cutter_bar": item['hide_cutter_bar'],
-                            "hide_cutter_pad": item['hide_cutter_pad'],
-                            "hide_handler": item['hide_handler'],
-                            "hide_chuck": item['hide_chuck'],
-                            "hide_model": item['hide_model'],
+                        "front_angle": item['front_angle'],
+                        "rear_angle": item['rear_angle'],
+                        "main_included_angle": item['main_included_angle'],
+                        "nut": item['nut'],
+                        "top_angle": item['top_angle'],
+                        "jump_accuracy": item['jump_accuracy'],
+                        "working_hardness": item['working_hardness'],
+                        "blade_diameter": item['blade_diameter'],
+                        "wrench": item['wrench'],
+                        "screw": item['screw'],
+                        "accuracy_level": item['accuracy_level'],
+                        "diameter_max": item['diameter_max'],
+                        "clamping_diameter": item['clamping_diameter'],
+                        "flange_length": item['flange_length'],
+                        'chuck_ids': [(6, 0, [])] if not item.get('chuck_codes') else
+                        self.env['mrs.cutting.tool.dynamic.model'].sudo()._get_cutting_tool_model_ids(
+                            item['chuck_codes']),
+                        'cutter_bar_ids': [(6, 0, [])] if not item.get('cutter_bar_codes') else
+                        self.env['mrs.cutting.tool.dynamic.model'].sudo()._get_cutting_tool_model_ids(
+                            item['cutter_bar_codes']),
+                        'cutter_pad_ids': [(6, 0, [])] if not item.get('cutter_pad_codes') else
+                        self.env['mrs.cutting.tool.dynamic.model'].sudo()._get_cutting_tool_model_ids(
+                            item['cutter_pad_codes']),
+                        'blade_ids': [(6, 0, [])] if not item.get('blade_codes') else
+                        self.env['mrs.cutting.tool.dynamic.model'].sudo()._get_cutting_tool_model_ids(
+                            item['blade_codes']),
+                        'handle_ids': [(6, 0, [])] if not item.get('handle_codes') else
+                        self.env['mrs.cutting.tool.dynamic.model'].sudo()._get_cutting_tool_model_ids(
+                            item['handle_codes']),
+                        "flange_diameter": item['flange_diameter'],
+                        "outer_diameter": item['outer_diameter'],
+                        "inner_diameter": item['inner_diameter'],
+                        "active": item['active'],
                     })
-                        brand.write({
-                            'mrs_cutting_tool_model_handle_chuck_model_ids': [
-                                (6, 0, [brand.id] * len(mrs_cutting_tool_model_handle_chuck_model_ids_list))],
-                        })
-                        # many2many_commands = [(0, 0, {'model_id_1': brand.id, 'model_id_2': related_record_id}) for
-                        #                       related_record_id in mrs_cutting_tool_model_handle_chuck_model_ids_list]
-                        # brand.write({
-                        #     'mrs_cutting_tool_model_handle_chuck_model_ids': many2many_commands,
-                        # })
                     print('同步所有刀柄类型列表成功')
         else:
             raise ValidationError("认证未通过")
 
+
    # 同步所有刀具型号列表
     def sync_all_tool_model(self):
         sf_sync_config = self.env['res.config.settings'].get_values()
@@ -2223,266 +2050,118 @@ class SfToolModel(models.Model):
         if result['status'] == 1:
             _logger.info('result:%s' % result)
             for item in result['mrs_cutting_tool_model_all_list']:
-                mrs_cutting_tool_model_blade_cutter_bar_ids_list = []
-                if item.get('mrs_cutting_tool_model_blade_cutter_bar_ids'):
-                    for mrs_cutting_tool_model_blade_cutter_bar_id in item[
-                                'mrs_cutting_tool_model_blade_cutter_bar_ids']:
-                        mrs_cutting_tool_model_blade_cutter_bar_ids_list.append(
-                            self.env['sf.cutting.tool.model'].search(
-                                [("code", '=', mrs_cutting_tool_model_blade_cutter_bar_id)]).id)
-                mrs_cutting_tool_model_blade_cutter_pad_ids_list = []
-                if item.get('mrs_cutting_tool_model_blade_cutter_pad_ids'):
-                    for mrs_cutting_tool_model_blade_cutter_pad_id in item[
-                                'mrs_cutting_tool_model_blade_cutter_pad_ids']:
-                        mrs_cutting_tool_model_blade_cutter_pad_ids_list.append(
-                            self.env['sf.cutting.tool.model'].search(
-                                [("code", '=', mrs_cutting_tool_model_blade_cutter_pad_id)]).id)
-                mrs_cutting_tool_model_bar_blade_ids_list = []
-                if item.get('mrs_cutting_tool_model_bar_blade_ids'):
-                    for mrs_cutting_tool_model_bar_blade_id in item['mrs_cutting_tool_model_bar_blade_ids']:
-                        mrs_cutting_tool_model_bar_blade_ids_list.append(self.env['sf.cutting.tool.model'].search(
-                            [("code", '=', mrs_cutting_tool_model_bar_blade_id)]).id)
-                mrs_cutting_tool_model_pad_blade_ids_list = []
-                if item.get('mrs_cutting_tool_model_pad_blade_ids'):
-                    for mrs_cutting_tool_model_pad_blade_id in item['mrs_cutting_tool_model_pad_blade_ids']:
-                        mrs_cutting_tool_model_pad_blade_ids_list.append(self.env['sf.cutting.tool.model'].search(
-                            [("code", '=', mrs_cutting_tool_model_pad_blade_id)]).id)
-                mrs_cutting_tool_model_handle_chuck_model_ids_list = []
-                if item.get('mrs_cutting_tool_model_handle_chuck_model_ids'):
-                    for mrs_cutting_tool_model_handle_chuck_model_id in item[
-                                'mrs_cutting_tool_model_handle_chuck_model_ids']:
-                        mrs_cutting_tool_model_handle_chuck_model_ids_list.append(
-                            self.env['sf.cutting.tool.model'].search(
-                                [("code", '=', mrs_cutting_tool_model_handle_chuck_model_id)]).id)
-                mrs_cutting_tool_model_chuck_handle_model_ids_list = []
-                if item.get('mrs_cutting_tool_model_chuck_handle_model_ids'):
-                    for mrs_cutting_tool_model_chuck_handle_model_id in item[
-                                'mrs_cutting_tool_model_chuck_handle_model_ids']:
-                        mrs_cutting_tool_model_chuck_handle_model_ids_list.append(
-                            self.env['sf.cutting.tool.model'].search(
-                                [("code", '=', mrs_cutting_tool_model_chuck_handle_model_id)]).id)
-                if item:
-                    brand = self.env['sf.cutting.tool.model'].search(
+                cutting_tool_model = self.search(
                     [("code", '=', item['code'])])
-                    if item.get('image'):
-                        image = base64.b64decode(item['image'])
-                    else:
-                        image = ''
-                    if not brand:
-                        new_record = self.env['sf.cutting.tool.model'].create({
+                if not cutting_tool_model:
+                    self.env['sf.cutting.tool.model'].create({
                         "name": item['name'],
                         "code": item['code'],
-                            "mrs_machine_brand_id": self.env['sf.machine.brand'].search(
-                                [("code", '=', item['mrs_machine_brand_id'])]).id,
-                            "mrs_materials_model_id": self.env['sf.materials.model'].search(
-                                [("materials_no", '=', item['mrs_materials_model_id'])]).id,
-                            "mrs_cutting_tool_material_id": self.env['sf.cutting.tool.material'].search(
-                                [("code", '=', item['mrs_cutting_tool_material_id'])]).id,
-                            "mrs_cutting_tool_material_name": item['mrs_cutting_tool_material_name'],
-                            "mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search(
-                                [("code", '=', item['mrs_cutting_tool_type_id'])]).id,
-                            "integral_code": item['integral_code'],
-                            "integral_total_length": item['integral_total_length'],
-                            "integral_shank_length": item['integral_shank_length'],
-                            "integral_blade_length": item['integral_blade_length'],
-                            "integral_diameter": item['integral_diameter'],
-                            "integral_blade_number": item['integral_blade_number'],
-                            "integral_front_angle": item['integral_front_angle'],
-                            "integral_rear_angle": item['integral_rear_angle'],
-                            "integral_main_included_angle": item['integral_main_included_angle'],
-                            "integral_nut": item['integral_nut'],
-                            "integral_scope": item['integral_scope'],
-                            "blade_code": item['blade_code'],
+                        "brand_id": self.env['sf.machine.brand'].search(
+                            [("code", '=', item['brand_code'])]).id,
+                        "material_model_id": self.env['sf.materials.model'].search(
+                            [("materials_no", '=', item['material_model_code'])]).id,
+                        "cutting_tool_material_id": self.env['sf.cutting.tool.material'].search(
+                            [("code", '=', item['cutting_tool_material_code'])]).id,
+                        "cutting_tool_type_id": self.env['sf.cutting.tool.type'].search(
+                            [("code", '=', item['cutting_tool_type_code'])]).id,
+                        "tool_length": item['tool_length'],
+                        "tool_width": item['tool_width'],
+                        "tool_height": item['tool_height'],
+                        "tool_thickness": item['tool_thickness'],
+                        "tool_weight": item['tool_weight'],
+                        "coating_material": item['coating_material'],
+                        "total_length": item['total_length'],
+                        "shank_length": item['shank_length'],
                         "blade_length": item['blade_length'],
-                            "blade_width": item['blade_width'],
-                            "blade_height": item['blade_height'],
-                            "blade_top_angle": item['blade_top_angle'],
-                            "blade_front_angle": item['blade_front_angle'],
-                            "blade_rear_angle": item['blade_rear_angle'],
-                            "blade_main_included_angle": item['blade_main_included_angle'],
-                            "blade_r_angle": item['blade_r_angle'],
-                            "blade_hardness": item['blade_hardness'],
-                            "blade_radius": item['blade_radius'],
-                            "blade_nut": item['blade_nut'],
-                            "mrs_cutting_tool_model_blade_cutter_bar_ids":
-                                mrs_cutting_tool_model_blade_cutter_bar_ids_list,
-                            "mrs_cutting_tool_model_blade_cutter_pad_ids":
-                                mrs_cutting_tool_model_blade_cutter_pad_ids_list,
-                            "bar_code": item['bar_code'],
-                            "bar_c_diameter": item['bar_c_diameter'],
-                            "bar_total_length": item['bar_total_length'],
-                            "bar_blade_number": item['bar_blade_number'],
-                            "bar_d_diameter": item['bar_d_diameter'],
-                            "mrs_cutting_tool_model_bar_blade_ids": mrs_cutting_tool_model_bar_blade_ids_list,
-                            "bar_wrench": item['bar_wrench'],
-                            "bar_screw": item['bar_screw'],
-                            "bar_radius": item['bar_radius'],
-                            "bar_accuracy": item['bar_accuracy'],
-                            "bar_hardness": item['bar_hardness'],
-                            "bar_scope": item['bar_scope'],
-                            "pad_code": item['pad_code'],
-                            "pad_c_diameter": item['pad_c_diameter'],
-                            "pad_total_length": item['pad_total_length'],
-                            "pad_blade_number": item['pad_blade_number'],
-                            "pad_d_diameter": item['pad_d_diameter'],
-                            "mrs_cutting_tool_model_pad_blade_ids": mrs_cutting_tool_model_pad_blade_ids_list,
-                            "pad_wrench": item['pad_wrench'],
-                            "pad_screw": item['pad_screw'],
-                            "pad_radius": item['pad_radius'],
-                            "pad_accuracy": item['pad_accuracy'],
-                            "pad_hardness": item['pad_hardness'],
-                            "pad_scope": item['pad_scope'],
-                            "handle_code": item['handle_code'],
-                            "handle_length": item['handle_length'],
-                            "handle_diameter": item['handle_diameter'],
-                            "handle_flange_length": item['handle_flange_length'],
-                            "handle_flange_diameter": item['handle_flange_diameter'],
-                            "handle_clamping_diameter_min": item['handle_clamping_diameter_min'],
-                            "handle_clamping_diameter_max": item['handle_clamping_diameter_max'],
-                            "handle_jump_accuracy": item['handle_jump_accuracy'],
-                            "handle_max_speed": item['handle_max_speed'],
-                            "handle_weight": item['handle_weight'],
-                            "handle_body_accuracy": item['handle_body_accuracy'],
-                            "handle_nut": item['handle_nut'],
-                            # "mrs_cutting_tool_model_handle_chuck_model_ids": [(6, 0, mrs_cutting_tool_model_handle_chuck_model_ids_list)],
-                            "handle_clamping_range": item['handle_clamping_range'],
-                            "handle_detection_accuracy": item['handle_detection_accuracy'],
-                            "handle_detection_hardness": item['handle_detection_hardness'],
-                            "handle_standard_speed": item['handle_standard_speed'],
-                            "chuck_code": item['chuck_code'],
-                            "chuck_accuracy": item['chuck_accuracy'],
-                            "chuck_diameter": item['chuck_diameter'],
-                            "chuck_inner_diameter": item['chuck_inner_diameter'],
-                            "chuck_height": item['chuck_height'],
-                            "chuck_nut": item['chuck_nut'],
-                            "mrs_cutting_tool_model_chuck_handle_model_ids":
-                                mrs_cutting_tool_model_chuck_handle_model_ids_list,
-                            "chuck_clamping_range": item['chuck_clamping_range'],
-                            "chuck_feature": item['chuck_feature'],
-                            "image": image,
-                            "hide_integral": item['hide_integral'],
-                            "hide_blade": item['hide_blade'],
-                            "hide_cutter_bar": item['hide_cutter_bar'],
-                            "hide_cutter_pad": item['hide_cutter_pad'],
-                            "hide_handler": item['hide_handler'],
-                            "hide_chuck": item['hide_chuck'],
-                            "hide_model": item['hide_model'],
+                        "front_angle": item['front_angle'],
+                        "rear_angle": item['rear_angle'],
+                        "main_included_angle": item['main_included_angle'],
+                        "nut": item['nut'],
+                        "top_angle": item['top_angle'],
+                        "jump_accuracy": item['jump_accuracy'],
+                        "working_hardness": item['working_hardness'],
+                        "blade_diameter": item['blade_diameter'],
+                        "wrench": item['wrench'],
+                        "screw": item['screw'],
+                        "accuracy_level": item['accuracy_level'],
+                        "diameter_max": item['diameter_max'],
+                        "clamping_diameter": item['clamping_diameter'],
+                        "flange_length": item['flange_length'],
+                        'chuck_ids': [(6, 0, [])] if not item.get('chuck_codes') else
+                        self.env['mrs.cutting.tool.dynamic.model'].sudo()._get_cutting_tool_model_ids(
+                            item['chuck_codes']),
+                        'cutter_bar_ids': [(6, 0, [])] if not item.get('cutter_bar_codes') else
+                        self.env['mrs.cutting.tool.dynamic.model'].sudo()._get_cutting_tool_model_ids(
+                            item['cutter_bar_codes']),
+                        'cutter_pad_ids': [(6, 0, [])] if not item.get('cutter_pad_codes') else
+                        self.env['mrs.cutting.tool.dynamic.model'].sudo()._get_cutting_tool_model_ids(
+                            item['cutter_pad_codes']),
+                        'blade_ids': [(6, 0, [])] if not item.get('blade_codes') else
+                        self.env['mrs.cutting.tool.dynamic.model'].sudo()._get_cutting_tool_model_ids(
+                            item['blade_codes']),
+                        'handle_ids': [(6, 0, [])] if not item.get('handle_codes') else
+                        self.env['mrs.cutting.tool.dynamic.model'].sudo()._get_cutting_tool_model_ids(
+                            item['handle_codes']),
+                        "flange_diameter": item['flange_diameter'],
+                        "outer_diameter": item['outer_diameter'],
+                        "inner_diameter": item['inner_diameter'],
+                        "active": item['active'],
                     })
-                        new_record.write({
-                            'mrs_cutting_tool_model_handle_chuck_model_ids': [
-                                (6, 0, [new_record.id] * len(mrs_cutting_tool_model_handle_chuck_model_ids_list))],
-                        })
-
                 else:
-                        brand.write({
+                    cutting_tool_model.write({
                         "name": item['name'],
                         "code": item['code'],
-                            "mrs_machine_brand_id": self.env['sf.machine.brand'].search(
-                                [("code", '=', item['mrs_machine_brand_id'])]).id,
-                            "mrs_materials_model_id": self.env['sf.materials.model'].search(
-                                [("materials_no", '=', item['mrs_materials_model_id'])]).id,
-                            "mrs_cutting_tool_material_id": self.env['sf.cutting.tool.material'].search(
-                                [("code", '=', item['mrs_cutting_tool_material_id'])]).id,
-                            "mrs_cutting_tool_material_name": item['mrs_cutting_tool_material_name'],
-                            "mrs_cutting_tool_type_id": self.env['sf.cutting.tool.type'].search(
-                                [("code", '=', item['mrs_cutting_tool_type_id'])]).id,
-                            "integral_code": item['integral_code'],
-                            "integral_total_length": item['integral_total_length'],
-                            "integral_shank_length": item['integral_shank_length'],
-                            "integral_blade_length": item['integral_blade_length'],
-                            "integral_diameter": item['integral_diameter'],
-                            "integral_blade_number": item['integral_blade_number'],
-                            "integral_front_angle": item['integral_front_angle'],
-                            "integral_rear_angle": item['integral_rear_angle'],
-                            "integral_main_included_angle": item['integral_main_included_angle'],
-                            "integral_nut": item['integral_nut'],
-                            "integral_scope": item['integral_scope'],
-                            "blade_code": item['blade_code'],
+                        "brand_id": self.env['sf.machine.brand'].search(
+                            [("code", '=', item['brand_code'])]).id,
+                        "material_model_id": self.env['sf.materials.model'].search(
+                            [("materials_no", '=', item['material_model_code'])]).id,
+                        "cutting_tool_material_id": self.env['sf.cutting.tool.material'].search(
+                            [("code", '=', item['cutting_tool_material_code'])]).id,
+                        "cutting_tool_type_id": self.env['sf.cutting.tool.type'].search(
+                            [("code", '=', item['cutting_tool_type_code'])]).id,
+                        "tool_length": item['tool_length'],
+                        "tool_width": item['tool_width'],
+                        "tool_height": item['tool_height'],
+                        "tool_thickness": item['tool_thickness'],
+                        "tool_weight": item['tool_weight'],
+                        "coating_material": item['coating_material'],
+                        "total_length": item['total_length'],
+                        "shank_length": item['shank_length'],
                         "blade_length": item['blade_length'],
-                            "blade_width": item['blade_width'],
-                            "blade_height": item['blade_height'],
-                            "blade_top_angle": item['blade_top_angle'],
-                            "blade_front_angle": item['blade_front_angle'],
-                            "blade_rear_angle": item['blade_rear_angle'],
-                            "blade_main_included_angle": item['blade_main_included_angle'],
-                            "blade_r_angle": item['blade_r_angle'],
-                            "blade_hardness": item['blade_hardness'],
-                            "blade_radius": item['blade_radius'],
-                            "blade_nut": item['blade_nut'],
-                            "mrs_cutting_tool_model_blade_cutter_bar_ids":
-                                mrs_cutting_tool_model_blade_cutter_bar_ids_list,
-                            "mrs_cutting_tool_model_blade_cutter_pad_ids":
-                                mrs_cutting_tool_model_blade_cutter_pad_ids_list,
-                            "bar_code": item['bar_code'],
-                            "bar_c_diameter": item['bar_c_diameter'],
-                            "bar_total_length": item['bar_total_length'],
-                            "bar_blade_number": item['bar_blade_number'],
-                            "bar_d_diameter": item['bar_d_diameter'],
-                            "mrs_cutting_tool_model_bar_blade_ids": mrs_cutting_tool_model_bar_blade_ids_list,
-                            "bar_wrench": item['bar_wrench'],
-                            "bar_screw": item['bar_screw'],
-                            "bar_radius": item['bar_radius'],
-                            "bar_accuracy": item['bar_accuracy'],
-                            "bar_hardness": item['bar_hardness'],
-                            "bar_scope": item['bar_scope'],
-                            "pad_code": item['pad_code'],
-                            "pad_c_diameter": item['pad_c_diameter'],
-                            "pad_total_length": item['pad_total_length'],
-                            "pad_blade_number": item['pad_blade_number'],
-                            "pad_d_diameter": item['pad_d_diameter'],
-                            "mrs_cutting_tool_model_pad_blade_ids": mrs_cutting_tool_model_pad_blade_ids_list,
-                            "pad_wrench": item['pad_wrench'],
-                            "pad_screw": item['pad_screw'],
-                            "pad_radius": item['pad_radius'],
-                            "pad_accuracy": item['pad_accuracy'],
-                            "pad_hardness": item['pad_hardness'],
-                            "pad_scope": item['pad_scope'],
-                            "handle_code": item['handle_code'],
-                            "handle_length": item['handle_length'],
-                            "handle_diameter": item['handle_diameter'],
-                            "handle_flange_length": item['handle_flange_length'],
-                            "handle_flange_diameter": item['handle_flange_diameter'],
-                            "handle_clamping_diameter_min": item['handle_clamping_diameter_min'],
-                            "handle_clamping_diameter_max": item['handle_clamping_diameter_max'],
-                            "handle_jump_accuracy": item['handle_jump_accuracy'],
-                            "handle_max_speed": item['handle_max_speed'],
-                            "handle_weight": item['handle_weight'],
-                            "handle_body_accuracy": item['handle_body_accuracy'],
-                            "handle_nut": item['handle_nut'],
-                            "mrs_cutting_tool_model_handle_chuck_model_ids": [
-                                (6, 0, mrs_cutting_tool_model_handle_chuck_model_ids_list)],
-                            "handle_clamping_range": item['handle_clamping_range'],
-                            "handle_detection_accuracy": item['handle_detection_accuracy'],
-                            "handle_detection_hardness": item['handle_detection_hardness'],
-                            "handle_standard_speed": item['handle_standard_speed'],
-                            "chuck_code": item['chuck_code'],
-                            "chuck_accuracy": item['chuck_accuracy'],
-                            "chuck_diameter": item['chuck_diameter'],
-                            "chuck_inner_diameter": item['chuck_inner_diameter'],
-                            "chuck_height": item['chuck_height'],
-                            "chuck_nut": item['chuck_nut'],
-                            "mrs_cutting_tool_model_chuck_handle_model_ids":
-                                mrs_cutting_tool_model_chuck_handle_model_ids_list,
-                            "chuck_clamping_range": item['chuck_clamping_range'],
-                            "chuck_feature": item['chuck_feature'],
-                            "image": image,
-                            "hide_integral": item['hide_integral'],
-                            "hide_blade": item['hide_blade'],
-                            "hide_cutter_bar": item['hide_cutter_bar'],
-                            "hide_cutter_pad": item['hide_cutter_pad'],
-                            "hide_handler": item['hide_handler'],
-                            "hide_chuck": item['hide_chuck'],
-                            "hide_model": item['hide_model'],
+                        "front_angle": item['front_angle'],
+                        "rear_angle": item['rear_angle'],
+                        "main_included_angle": item['main_included_angle'],
+                        "nut": item['nut'],
+                        "top_angle": item['top_angle'],
+                        "jump_accuracy": item['jump_accuracy'],
+                        "working_hardness": item['working_hardness'],
+                        "blade_diameter": item['blade_diameter'],
+                        "wrench": item['wrench'],
+                        "screw": item['screw'],
+                        "accuracy_level": item['accuracy_level'],
+                        "diameter_max": item['diameter_max'],
+                        "clamping_diameter": item['clamping_diameter'],
+                        "flange_length": item['flange_length'],
+                        'chuck_ids': [(6, 0, [])] if not item.get('chuck_codes') else
+                        self.env['mrs.cutting.tool.dynamic.model'].sudo()._get_cutting_tool_model_ids(
+                            item['chuck_codes']),
+                        'cutter_bar_ids': [(6, 0, [])] if not item.get('cutter_bar_codes') else
+                        self.env['mrs.cutting.tool.dynamic.model'].sudo()._get_cutting_tool_model_ids(
+                            item['cutter_bar_codes']),
+                        'cutter_pad_ids': [(6, 0, [])] if not item.get('cutter_pad_codes') else
+                        self.env['mrs.cutting.tool.dynamic.model'].sudo()._get_cutting_tool_model_ids(
+                            item['cutter_pad_codes']),
+                        'blade_ids': [(6, 0, [])] if not item.get('blade_codes') else
+                        self.env['mrs.cutting.tool.dynamic.model'].sudo()._get_cutting_tool_model_ids(
+                            item['blade_codes']),
+                        'handle_ids': [(6, 0, [])] if not item.get('handle_codes') else
+                        self.env['mrs.cutting.tool.dynamic.model'].sudo()._get_cutting_tool_model_ids(
+                            item['handle_codes']),
+                        "flange_diameter": item['flange_diameter'],
+                        "outer_diameter": item['outer_diameter'],
+                        "inner_diameter": item['inner_diameter'],
+                        "active": item['active'],
                     })
-                        brand.write({
-                            'mrs_cutting_tool_model_handle_chuck_model_ids': [
-                                (6, 0, [brand.id] * len(mrs_cutting_tool_model_handle_chuck_model_ids_list))],
-                        })
-                        # many2many_commands = [(0, 0, {'model_id_1': brand.id, 'model_id_2': related_record_id}) for
-                        #                       related_record_id in mrs_cutting_tool_model_handle_chuck_model_ids_list]
-                        # brand.write({
-                        #     'mrs_cutting_tool_model_handle_chuck_model_ids': many2many_commands,
-                        # })
             print('同步所有刀具型号列表成功')
         else:
             raise ValidationError("认证未通过")

sf_tool_management/models/base.py

@@ -27,31 +27,31 @@ class FunctionalCuttingToolEntity(models.Model):
     mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                            'sf_functional_cutting_tool_entity_id',
                                                            string='整体式刀具型号', domain=
-                                                           [('mrs_cutting_tool_material_name', '=', '整体式刀具')])
+                                                           [('cutting_tool_type', '=', '整体式刀具')])
     # 刀片型号
     mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_cutting_tool_entity_id',
                                                         string='刀片型号', domain=
-                                                        [('mrs_cutting_tool_material_name', '=', '刀片')])
+                                                        [('cutting_tool_type', '=', '刀片')])
     # 刀杆型号
     mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                             'sf_functional_cutting_tool_entity_id',
                                                             string='刀杆型号', domain=
-                                                            [('mrs_cutting_tool_material_name', '=', '刀杆')])
+                                                            [('cutting_tool_type', '=', '刀杆')])
     # 刀盘型号
     mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                             'sf_functional_cutting_tool_entity_id',
                                                             string='刀盘型号', domain=
-                                                            [('mrs_cutting_tool_material_name', '=', '刀盘')])
+                                                            [('cutting_tool_type', '=', '刀盘')])
     # 刀柄型号
     mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                                'sf_functional_cutting_tool_entity_id',
                                                                string='刀柄型号', domain=
-                                                               [('mrs_cutting_tool_material_name', '=', '刀柄')])
+                                                               [('cutting_tool_type', '=', '刀柄')])
     # 夹头型号
     mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                              'sf_functional_cutting_tool_entity_id',
                                                              string='夹头型号', domain=
-                                                             [('mrs_cutting_tool_material_name', '=', '夹头')])
+                                                             [('cutting_tool_type', '=', '夹头')])
     cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0')
 
     @api.onchange('cutting_tool_material')
@@ -65,6 +65,7 @@ class FunctionalCuttingToolEntity(models.Model):
                     record.mrs_cutting_tool_cutterbar_model_ids = None
                     record.mrs_cutting_tool_cutterpad_model_ids = None
 
+
     diameter = fields.Float('直径(mm)')
     tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
                                   string='刀具等级')
@@ -99,32 +100,32 @@ class FunctionalCuttingToolEntityCache(models.Model):
     mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                            'sf_functional_cutting_tool_entity_cache_id',
                                                            string='整体式刀具型号', domain=
-                                                           [('mrs_cutting_tool_material_name', '=', '整体式刀具')])
+                                                           [('cutting_tool_type', '=', '整体式刀具')])
     # 刀片型号
     mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                         'sf_functional_cutting_tool_entity_cache_id',
                                                         string='刀片型号', domain=
-                                                        [('mrs_cutting_tool_material_name', '=', '刀片')])
+                                                        [('cutting_tool_type', '=', '刀片')])
     # 刀杆型号
     mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                             'sf_functional_cutting_tool_entity_cache_id',
                                                             string='刀杆型号', domain=
-                                                            [('mrs_cutting_tool_material_name', '=', '刀杆')])
+                                                            [('cutting_tool_type', '=', '刀杆')])
     # 刀盘型号
     mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                             'sf_functional_cutting_tool_entity_cache_id',
                                                             string='刀盘型号', domain=
-                                                            [('mrs_cutting_tool_material_name', '=', '刀盘')])
+                                                            [('cutting_tool_type', '=', '刀盘')])
     # 刀柄型号
     mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                                'sf_functional_cutting_tool_entity_cache_id',
                                                                string='刀柄型号', domain=
-                                                               [('mrs_cutting_tool_material_name', '=', '刀柄')])
+                                                               [('cutting_tool_type', '=', '刀柄')])
     # 夹头型号
     mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                              'sf_functional_cutting_tool_entity_cache_id',
                                                              string='夹头型号', domain=
-                                                             [('mrs_cutting_tool_material_name', '=', '夹头')])
+                                                             [('cutting_tool_type', '=', '夹头')])
     cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0')
 
     @api.onchange('cutting_tool_material')
@@ -138,6 +139,7 @@ class FunctionalCuttingToolEntityCache(models.Model):
                     record.mrs_cutting_tool_cutterbar_model_ids = None
                     record.mrs_cutting_tool_cutterpad_model_ids = None
 
+
     diameter = fields.Float('直径(mm)')
     tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
                                   string='刀具等级')
@@ -169,37 +171,37 @@ class FunctionalToolWarning(models.Model):
                                                            'sf_functional_tool_warning_id',
                                                            string='整体式刀具型号', readonly=True,
                                                            domain=[
-                                                               ('mrs_cutting_tool_material_name', '=', '整体式刀具')],
+                                                               ('cutting_tool_type', '=', '整体式刀具')],
                                                            related='functional_cutting_tool_id.mrs_cutting_tool_integral_model_ids')
     # 刀片型号
     mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                         'sf_functional_tool_warning_id',
                                                         string='刀片型号', readonly=True,
-                                                        domain=[('mrs_cutting_tool_material_name', '=', '刀片')],
+                                                        domain=[('cutting_tool_type', '=', '刀片')],
                                                         related='functional_cutting_tool_id.mrs_cutting_tool_blade_model_ids')
     # 刀杆型号
     mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                             'sf_functional_tool_warning_id',
                                                             string='刀杆型号', readonly=True,
-                                                            domain=[('mrs_cutting_tool_material_name', '=', '刀杆')],
+                                                            domain=[('cutting_tool_type', '=', '刀杆')],
                                                             related='functional_cutting_tool_id.mrs_cutting_tool_cutterbar_model_ids')
     # 刀盘型号
     mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                             'sf_functional_tool_warning_id',
                                                             string='刀盘型号', readonly=True,
-                                                            domain=[('mrs_cutting_tool_material_name', '=', '刀盘')],
+                                                            domain=[('cutting_tool_type', '=', '刀盘')],
                                                             related='functional_cutting_tool_id.mrs_cutting_tool_cutterpad_model_ids')
     # 刀柄型号
     mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                                'sf_functional_tool_warning_id',
                                                                string='刀柄型号', readonly=True,
-                                                               domain=[('mrs_cutting_tool_material_name', '=', '刀柄')],
+                                                               domain=[('cutting_tool_type', '=', '刀柄')],
                                                                related='functional_cutting_tool_id.mrs_cutting_tool_cutterhandle_model_ids')
     # 夹头型号
     mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                              'sf_functional_tool_warning_id',
                                                              string='夹头型号', readonly=True,
-                                                             domain=[('mrs_cutting_tool_material_name', '=', '夹头')],
+                                                             domain=[('cutting_tool_type', '=', '夹头')],
                                                              related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids')
     cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0')
 
@@ -219,6 +221,9 @@ class FunctionalToolWarning(models.Model):
                                   string='刀具等级', readonly=True, related='functional_cutting_tool_id.tool_grade')
     machining_accuracy = fields.Float('加工精度(mm)', readonly=True,
                                       related='functional_cutting_tool_id.machining_accuracy')
+
+    tool_length = fields.Float('装刀长', readonly=True, related='functional_cutting_tool_id.tool_length')
+
     tool_length = fields.Float('装刀长(mm)', readonly=True, related='functional_cutting_tool_id.tool_length')
     blade_number = fields.Integer('刃数', readonly=True, related='functional_cutting_tool_id.blade_number')
     integral_blade_length = fields.Float('整体刃长(mm)', readonly=True,
@@ -245,6 +250,7 @@ class FunctionalToolWarning(models.Model):
 
     machine_tool_code = fields.Char('机台号', readonly=True, related='functional_tool_assembly_id.machine_tool_code')
     cutting_tool_code = fields.Char('刀位号', readonly=True, related='functional_tool_assembly_id.cutter_spacing_code')
+    idle_time = fields.Char('闲置时长', readonly=False)
     idle_time = fields.Char('闲置时长(h)', readonly=False)
     alarm_value = fields.Char('报警值', readonly=False)
     used_value = fields.Char('已使用值', readonly=False)
@@ -291,37 +297,37 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
                                                            'sf_functional_tool_warning_id',
                                                            string='整体式刀具型号', readonly=True,
                                                            domain=[
-                                                               ('mrs_cutting_tool_material_name', '=', '整体式刀具')],
+                                                               ('cutting_tool_type', '=', '整体式刀具')],
                                                            related='functional_cutting_tool_id.mrs_cutting_tool_integral_model_ids')
     # 刀片型号
     mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                         'sf_functional_tool_warning_id',
                                                         string='刀片型号', readonly=True,
-                                                        domain=[('mrs_cutting_tool_material_name', '=', '刀片')],
+                                                        domain=[('cutting_tool_type', '=', '刀片')],
                                                         related='functional_cutting_tool_id.mrs_cutting_tool_blade_model_ids')
     # 刀杆型号
     mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                             'sf_functional_tool_warning_id',
                                                             string='刀杆型号', readonly=True,
-                                                            domain=[('mrs_cutting_tool_material_name', '=', '刀杆')],
+                                                            domain=[('cutting_tool_type', '=', '刀杆')],
                                                             related='functional_cutting_tool_id.mrs_cutting_tool_cutterbar_model_ids')
     # 刀盘型号
     mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                             'sf_functional_tool_warning_id',
                                                             string='刀盘型号', readonly=True,
-                                                            domain=[('mrs_cutting_tool_material_name', '=', '刀盘')],
+                                                            domain=[('cutting_tool_type', '=', '刀盘')],
                                                             related='functional_cutting_tool_id.mrs_cutting_tool_cutterpad_model_ids')
     # 刀柄型号
     mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                                'sf_functional_tool_warning_id',
                                                                string='刀柄型号', readonly=True,
-                                                               domain=[('mrs_cutting_tool_material_name', '=', '刀柄')],
+                                                               domain=[('cutting_tool_type', '=', '刀柄')],
                                                                related='functional_cutting_tool_id.mrs_cutting_tool_cutterhandle_model_ids')
     # 夹头型号
     mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                              'sf_functional_tool_warning_id',
                                                              string='夹头型号', readonly=True,
-                                                             domain=[('mrs_cutting_tool_material_name', '=', '夹头')],
+                                                             domain=[('cutting_tool_type', '=', '夹头')],
                                                              related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids')
     cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0')
 
@@ -412,37 +418,37 @@ class InboundAndOutboundRecordsOfFunctionalTools(models.Model):
                                                            'sf_functional_tool_warning_id',
                                                            string='整体式刀具型号', readonly=True,
                                                            domain=[
-                                                               ('mrs_cutting_tool_material_name', '=', '整体式刀具')],
+                                                               ('cutting_tool_type', '=', '整体式刀具')],
                                                            related='functional_cutting_tool_id.mrs_cutting_tool_integral_model_ids')
     # 刀片型号
     mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                         'sf_functional_tool_warning_id',
                                                         string='刀片型号', readonly=True,
-                                                        domain=[('mrs_cutting_tool_material_name', '=', '刀片')],
+                                                        domain=[('cutting_tool_type', '=', '刀片')],
                                                         related='functional_cutting_tool_id.mrs_cutting_tool_blade_model_ids')
     # 刀杆型号
     mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                             'sf_functional_tool_warning_id',
                                                             string='刀杆型号', readonly=True,
-                                                            domain=[('mrs_cutting_tool_material_name', '=', '刀杆')],
+                                                            domain=[('cutting_tool_type', '=', '刀杆')],
                                                             related='functional_cutting_tool_id.mrs_cutting_tool_cutterbar_model_ids')
     # 刀盘型号
     mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                             'sf_functional_tool_warning_id',
                                                             string='刀盘型号', readonly=True,
-                                                            domain=[('mrs_cutting_tool_material_name', '=', '刀盘')],
+                                                            domain=[('cutting_tool_type', '=', '刀盘')],
                                                             related='functional_cutting_tool_id.mrs_cutting_tool_cutterpad_model_ids')
     # 刀柄型号
     mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                                'sf_functional_tool_warning_id',
                                                                string='刀柄型号', readonly=True,
-                                                               domain=[('mrs_cutting_tool_material_name', '=', '刀柄')],
+                                                               domain=[('cutting_tool_type', '=', '刀柄')],
                                                                related='functional_cutting_tool_id.mrs_cutting_tool_cutterhandle_model_ids')
     # 夹头型号
     mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                              'sf_functional_tool_warning_id',
                                                              string='夹头型号', readonly=True,
-                                                             domain=[('mrs_cutting_tool_material_name', '=', '夹头')],
+                                                             domain=[('cutting_tool_type', '=', '夹头')],
                                                              related='functional_cutting_tool_id.mrs_cutting_tool_cutterhead_model_ids')
     cutting_tool_material = fields.Selection([('0', '整体式刀具'), ('1', '组合式刀具')], string='刀具物料', default='0')
 
@@ -522,6 +528,7 @@ class MachineTableToolChangingApply(models.Model):
     #     string='换刀需求信息',
     #     attrs="{'invisible': 1}")
 
+
     name = fields.Many2one('maintenance.equipment', string='CNC机床',required=True, readonly=False, tracking=True,
                            group_expand='_read_group_names')
     machine_table_type_id = fields.Many2one('sf.machine_tool.category', string='机床类型', readonly=True,
@@ -532,6 +539,7 @@ class MachineTableToolChangingApply(models.Model):
     functional_tool_name_id = fields.Many2one('sf.functional.cutting.tool', string='功能刀具名称', readonly=False)
     functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True,
                                               compute='_compute_functional_tool_name_id')
+
     diameter = fields.Char(string='直径(mm)', readonly=False)
     coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=False)
     hilt_name = fields.Char(string='刀柄名称', readonly=False)
@@ -793,28 +801,28 @@ class FunctionalToolAssembly(models.Model):
     # 整体式刀具型号
     mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_id',
                                                            string='整体式刀具型号', readonly=True, domain=
-                                                           [('mrs_cutting_tool_material_name', '=', '整体式刀具')])
+                                                           [('cutting_tool_type', '=', '整体式刀具')])
     integral_code = fields.Char('整体式刀具序列号', readonly=True)
     integral_name = fields.Char('整体式刀具名称', readonly=True)
     sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', '整体式刀具品牌', readonly=True)
     # 刀片型号
     mrs_cutting_tool_blade_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_id',
                                                         string='刀片型号', readonly=True, domain=
-                                                        [('mrs_cutting_tool_material_name', '=', '刀片')])
+                                                        [('cutting_tool_type', '=', '刀片')])
     blade_code = fields.Char('刀片序列号', readonly=True)
     blade_name = fields.Char('刀片名称', readonly=True)
     sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌', readonly=True)
     # 刀杆型号
     mrs_cutting_tool_cutterbar_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_id',
                                                             string='刀杆型号', readonly=True, domain=
-                                                            [('mrs_cutting_tool_material_name', '=', '刀杆')])
+                                                            [('cutting_tool_type', '=', '刀杆')])
     bar_code = fields.Char('刀杆序列号', readonly=True)
     bar_name = fields.Char('刀杆名称', readonly=True)
     sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌', readonly=True)
     # 刀盘型号
     mrs_cutting_tool_cutterpad_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_id',
                                                             string='刀盘型号', readonly=True, domain=
-                                                            [('mrs_cutting_tool_material_name', '=', '刀盘')])
+                                                            [('cutting_tool_type', '=', '刀盘')])
     pad_code = fields.Char('刀盘序列号', readonly=True)
     pad_name = fields.Char('刀盘名称', readonly=True)
     sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', readonly=True)
@@ -823,14 +831,14 @@ class FunctionalToolAssembly(models.Model):
     mrs_cutting_tool_cutterhandle_model_ids = fields.Many2many('sf.cutting.tool.model',
                                                                'sf_functional_tool_assembly_id',
                                                                string='刀柄型号', readonly=True, domain=
-                                                               [('mrs_cutting_tool_material_name', '=', '刀柄')])
+                                                               [('cutting_tool_type', '=', '刀柄')])
     handle_code = fields.Char('刀柄序列号', readonly=True)
     handle_name = fields.Char('刀柄名称', readonly=True)
     sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌', readonly=True)
     # 夹头型号
     mrs_cutting_tool_cutterhead_model_ids = fields.Many2many('sf.cutting.tool.model', 'sf_functional_tool_assembly_id',
                                                              string='夹头型号', readonly=True, domain=
-                                                             [('mrs_cutting_tool_material_name', '=', '夹头')])
+                                                             [('cutting_tool_type', '=', '夹头')])
     chuck_code = fields.Char('夹头序列号', readonly=True)
     chuck_name = fields.Char('夹头名称', readonly=True)
     sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', readonly=True)

sf_tool_management/models/tool_material_search.py

@@ -13,10 +13,11 @@ class SfToolMaterialSearch(models.Model):
     # 关联刀具类型
     mrs_cutting_tool_type_id = fields.Many2one(
         'sf.cutting.tool.type', '刀具类型',
-        domain="[('mrs_cutting_tool_material_id.name', '=', mrs_cutting_tool_material_name)]")
+        domain="[('cutting_tool_material_id.name', '=', cutting_tool_material_name)]")
     # 关联刀具物料名称
     mrs_cutting_tool_material_name = fields.Char(related='mrs_cutting_tool_material_id.name', string='刀具物料名称',
                                                  store=True)
+    cutting_tool_type = fields.Char(related='mrs_cutting_tool_material_id.name', string='刀具物料类型', store=True)
     mrs_machine_brand_id = fields.Many2one('sf.machine.brand', '品牌')
     # 关联刀具型号
     # mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', '刀具型号')
@@ -57,7 +58,7 @@ class SfToolMaterialSearch(models.Model):
         relation='sf_tool_material_search_blade_cutter_bar_rel',
         column1='model_id_1',
         column2='model_id_2',
-        domain="[('mrs_cutting_tool_material_id.name', '=', '刀杆')]",
+        domain="[('cutting_tool_type', '=', '刀杆')]",
         string='适用刀杆型号',
         default=lambda self: [],  # 使用空列表作为默认值
     )
@@ -66,7 +67,7 @@ class SfToolMaterialSearch(models.Model):
         relation='sf_tool_material_search_blade_cutter_pad_rel',
         column1='model_id_1',
         column2='model_id_2',
-        domain="[('mrs_cutting_tool_material_id.name', '=', '刀盘')]",
+        domain="[('cutting_tool_type', '=', '刀盘')]",
         string='适用刀盘型号',
         default=lambda self: [],  # 使用空列表作为默认值
     )
@@ -99,7 +100,7 @@ class SfToolMaterialSearch(models.Model):
         relation='sf_tool_material_search_bar_blade_rel',
         column1='model_id_1',
         column2='model_id_2',
-        domain="[('mrs_cutting_tool_material_id.name', '=', '刀片')]",
+        domain="[('cutting_tool_type', '=', '刀片')]",
         string='适用刀片型号'
     )
     bar_wrench = fields.Float('配对扳手(mm)')
@@ -121,7 +122,7 @@ class SfToolMaterialSearch(models.Model):
         relation='sf_tool_material_search_pad_blade_rel',
         column1='model_id_1',
         column2='model_id_2',
-        domain="[('mrs_cutting_tool_material_id.name', '=', '刀片')]",
+        domain="[('cutting_tool_type', '=', '刀片')]",
         string='适用刀片型号'
     )
     pad_wrench = fields.Float('配对扳手(mm)')
@@ -151,7 +152,7 @@ class SfToolMaterialSearch(models.Model):
         relation='sf_tool_material_search_handle_chuck_rel',
         column1='model_id_1',
         column2='model_id_2',
-        domain="[('mrs_cutting_tool_material_id.name', '=', '夹头')]",
+        domain="[('cutting_tool_type', '=', '夹头')]",
         string='适用夹头型号'
     )
     handle_clamping_range = fields.Float('夹持范围(mm)')
@@ -175,7 +176,7 @@ class SfToolMaterialSearch(models.Model):
         relation='sf_tool_material_search_chuck_handle_rel',
         column1='model_id_1',
         column2='model_id_2',
-        domain="[('mrs_cutting_tool_material_id.name', '=', '刀柄')]",
+        domain="[('cutting_tool_type', '=', '刀柄')]",
         string='适用刀柄型号'
     )
     chuck_clamping_range = fields.Float('夹持范围(mm)')

sf_tool_management/views/tool_base_views.xml

@@ -84,7 +84,7 @@
                                         <field name="integral_blade_length"/>
                                         <field name="effective_blade_length"/>
                                         <field name="max_life"/>
-                                        <field name="is_standard"/>
+                                        <field name="is_standard" default="false"/>
                                         <field name="applicable_range"/>
                                     </group>
                                 </group>
@@ -236,7 +236,7 @@
                                         <field name="integral_blade_length"/>
                                         <field name="effective_blade_length"/>
                                         <field name="max_life"/>
-                                        <field name="is_standard"/>
+                                        <field name="is_standard" default="false"/>
                                         <field name="applicable_range"/>
                                     </group>
                                 </group>
@@ -409,7 +409,7 @@
                                         <field name="integral_blade_length"/>
                                         <field name="effective_blade_length"/>
                                         <field name="max_life"/>
-                                        <field name="is_standard"/>
+                                        <field name="is_standard" default="false"/>
                                         <field name="applicable_range"/>
                                     </group>
                                 </group>
@@ -544,7 +544,7 @@
                                         <field name="integral_blade_length"/>
                                         <field name="effective_blade_length"/>
                                         <field name="max_life"/>
-                                        <field name="is_standard"/>
+                                        <field name="is_standard" default="false"/>
                                         <field name="applicable_range"/>
                                     </group>
                                 </group>

sf_tool_management/views/tool_material_search.xml

@@ -85,7 +85,8 @@
                     <field name="handle_weight" optional="hide"/>
                     <field name="handle_body_accuracy" optional="hide"/>
                     <field name="handle_nut" optional="hide"/>
-                    <field name="mrs_cutting_tool_model_handle_chuck_model_ids" widget="many2many_tags" optional="hide"/>
+                    <field name="mrs_cutting_tool_model_handle_chuck_model_ids" widget="many2many_tags"
+                           optional="hide"/>
                     <field name="handle_clamping_range" optional="hide"/>
                     <field name="handle_detection_accuracy" optional="hide"/>
                     <field name="handle_detection_hardness" optional="hide"/>
@@ -99,7 +100,8 @@
                     <field name="chuck_inner_diameter" optional="hide"/>
                     <field name="chuck_height" optional="hide"/>
                     <field name="chuck_nut" optional="hide"/>
-                    <field name="mrs_cutting_tool_model_chuck_handle_model_ids" widget="many2many_tags" optional="hide"/>
+                    <field name="mrs_cutting_tool_model_chuck_handle_model_ids" widget="many2many_tags"
+                           optional="hide"/>
                     <field name="chuck_clamping_range" optional="hide"/>
                     <field name="chuck_feature" optional="hide"/>
                     <field name="image" widget="image" optional="hide"/>
@@ -157,8 +159,9 @@
                         </group>
                         <group>
                             <field name="cutting_tool_material_name" invisible="True"/>
+                            <field name="cutting_tool_type" invisible="True"/>
                         </group>
-                        <group string="刀片信息" attrs="{'invisible': [('cutting_tool_material_name','!=','刀片')]}">
+                        <group string="刀片信息" attrs="{'invisible': [('cutting_tool_type','!=','刀片')]}">
                             <group>
                                 <field name="blade_code" invisible="True"/>
                                 <field name="blade_length"/>
@@ -181,7 +184,7 @@
                             </group>
                         </group>
 
-                        <group string="整体式刀具信息" attrs="{'invisible': [('cutting_tool_material_name','!=','整体式刀具')]}">
+                        <group string="整体式刀具信息" attrs="{'invisible': [('cutting_tool_type','!=','整体式刀具')]}">
                             <group>
                                 <field name="integral_code" invisible="True"/>
                                 <field name="integral_total_length"/>
@@ -202,7 +205,7 @@
                             </group>
                         </group>
 
-                        <group string="刀杆信息" attrs="{'invisible': [('cutting_tool_material_name','!=','刀杆')]}">
+                        <group string="刀杆信息" attrs="{'invisible': [('cutting_tool_type','!=','刀杆')]}">
                             <group>
                                 <field name="bar_code" invisible="True"/>
                                 <field name="bar_c_diameter"/>
@@ -221,7 +224,7 @@
                             </group>
                         </group>
 
-                        <group string="刀盘信息" attrs="{'invisible': [('cutting_tool_material_name','!=','刀盘')]}">
+                        <group string="刀盘信息" attrs="{'invisible': [('cutting_tool_type','!=','刀盘')]}">
                             <group>
                                 <field name="pad_code" invisible="True"/>
                                 <field name="pad_c_diameter"/>
@@ -240,7 +243,7 @@
                             </group>
                         </group>
 
-                        <group string="刀柄信息" attrs="{'invisible': [('cutting_tool_material_name','!=','刀柄')]}">
+                        <group string="刀柄信息" attrs="{'invisible': [('cutting_tool_type','!=','刀柄')]}">
                             <group>
                                 <field name="handle_code" invisible="True"/>
                                 <field name="handle_diameter"/>
@@ -263,7 +266,7 @@
                             </group>
                         </group>
 
-                        <group string="夹头信息" attrs="{'invisible': [('cutting_tool_material_name','!=','夹头')]}">
+                        <group string="夹头信息" attrs="{'invisible': [('cutting_tool_type','!=','夹头')]}">
                             <group>
                                 <field name="chuck_code" invisible="True"/>
                                 <field name="chuck_clamping_diameter_min"/>
@@ -287,8 +290,6 @@
         </record>
 
 
-
-
         <!--     刀具物料搜索 -->
         <record id="search_sf_tool_material_search" model="ir.ui.view">
             <field name="name">sf.tool.material.search.search</field>