diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py
index 4dc6b619..1c7219bc 100644
--- a/sf_base/models/tool_base_new.py
+++ b/sf_base/models/tool_base_new.py
@@ -106,18 +106,21 @@ class CuttingToolModel(models.Model):
     chuck_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
                                                  'standard_library_id', string='夹头基本参数')
     cutting_speed_ids = fields.One2many('sf.cutting.speed', 'standard_library_id', string='切削速度Vc')
-    feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz',
-                                         domain=[('cutting_speed', '!=', False)])
-    feed_per_tooth_ids_3 = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz',
-                                           domain=[('cutting_speed', '!=', False)])
+    feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz')
+    feed_per_tooth_ids_3 = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz')
 
     material_model_id = fields.Many2one('sf.materials.model', '材料型号')
     # 适用夹头型号可以多选
-    chuck_ids = fields.Many2many(
+    # chuck_ids = fields.Many2many(
+    #     'sf.cutting_tool.standard.library',
+    #     relation='cutting_tool_type_library_handle_chuck_rel',
+    #     column1='model_id_1',
+    #     column2='model_id_2',
+    #     domain="[('cutting_tool_material_id.name', '=', '夹头')]",
+    #     string='适用夹头型号')
+
+    chuck_id = fields.Many2one(
         'sf.cutting_tool.standard.library',
-        relation='cutting_tool_type_library_handle_chuck_rel',
-        column1='model_id_1',
-        column2='model_id_2',
         domain="[('cutting_tool_material_id.name', '=', '夹头')]",
         string='适用夹头型号')
     cutter_bar_ids = fields.Many2many(
@@ -137,31 +140,31 @@ class CuttingToolModel(models.Model):
         string='适用刀盘型号'  # 使用空列表作为默认值
     )
     # 刀杆/参数
-    blade_ids = fields.Many2many(
+    # blade_ids = fields.Many2many(
+    #     'sf.cutting_tool.standard.library',
+    #     relation='cutting_tool_type_library_pad_blade_rel',
+    #     column1='model_id_1',
+    #     column2='model_id_2',
+    #     domain="[('cutting_tool_material_id.name', '=', '刀片')]",
+    #     string='适用刀片型号'  # 使用空列表作为默认值
+    # )
+
+    handle_id = fields.Many2one(
         'sf.cutting_tool.standard.library',
-        relation='cutting_tool_type_library_pad_blade_rel',
-        column1='model_id_1',
-        column2='model_id_2',
-        domain="[('cutting_tool_material_id.name', '=', '刀片')]",
-        string='适用刀片型号'  # 使用空列表作为默认值
-    )
-    handle_ids = fields.Many2many(
-        'sf.cutting_tool.standard.library',
-        relation='cutting_tool_type_library_chuck_handle_rel',
-        column1='model_id_1',
-        column2='model_id_2',
         domain="[('cutting_tool_material_id.name', '=', '刀柄')]",
         string='适用刀柄型号'
     )
+    # handle_ids = fields.Many2many(
+    #     'sf.cutting_tool.standard.library',
+    #     relation='cutting_tool_type_library_chuck_handle_rel',
+    #     column1='model_id_1',
+    #     column2='model_id_2',
+    #     domain="[('cutting_tool_material_id.name', '=', '刀柄')]",
+    #     string='适用刀柄型号'
+    # )
     active = fields.Boolean('有效', default=True)
     is_cloud = fields.Boolean('云端数据', default=False)
 
-    # 无用字段
-    feed_per_tooth_ids_2 = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz',
-                                           domain=[('machining_method', '!=', False)])
-    feed_per_tooth_ids_4 = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz',
-                                           domain=[('machining_method', '!=', False)])
-
     def _get_ids(self, cutting_tool_type_code, factory_short_name):
         cutting_tool_type_ids = []
         for item in cutting_tool_type_code:
@@ -180,7 +183,7 @@ class MaintenanceStandardImage(models.Model):
     image = fields.Binary(string='图文')
     type = fields.Selection(
         [('加工能力', '加工能力'), ('刀尖特征', '刀尖特征'), ('柄部类型', '柄部类型'), ('走刀方向', '走刀方向'),
-         ('冷却液', '冷却液'), ('压紧方式', '压紧方式'), ('刀片形状', '刀片形状'), ('冷却方式', '冷却方式')],
+         ('压紧方式', '压紧方式'), ('刀片形状', '刀片形状'), ('冷却方式', '冷却方式')],
         string='特征')
     equipment_id = fields.Many2many('maintenance.equipment', 'image_id', string='设备')
     equipment_lq_id = fields.Many2many('maintenance.equipment', 'image_lq_id', string='设备')
diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py
index 63ea66e7..154bf275 100644
--- a/sf_base/models/tool_other_features.py
+++ b/sf_base/models/tool_other_features.py
@@ -6,6 +6,7 @@ class ToolMaterialsBasicParameters(models.Model):
     _description = '刀具物料基本参数'
 
     name = fields.Char('物料号', size=50)
+    code = fields.Char('编码', size=50)
     standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀具标准库')
     cutting_tool_type = fields.Char(related='standard_library_id.cutting_tool_type', string='刀具物料类型',
                                     store=True)
@@ -13,8 +14,8 @@ class ToolMaterialsBasicParameters(models.Model):
     # 整体式刀具参数
     total_length = fields.Float('总长度(mm)')
     blade_number = fields.Selection(
-        [('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8')],
-        string='刃数(个)')
+        [('0', '0'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8')],
+        string='刃数(个)', default='0')
     neck_diameter = fields.Float('颈部直径(mm)')
     neck_length = fields.Float('颈部长度(mm)')
     handle_diameter = fields.Float('柄部直径(mm)')
@@ -40,19 +41,19 @@ class ToolMaterialsBasicParameters(models.Model):
     install_aperture_diameter = fields.Float('安装孔直径(mm)')
     chip_breaker_groove = fields.Selection([('无', '无'), ('单面', '单面'), ('双面', '双面')],
                                            string='有无断屑槽')
+    chip_breaker_type_code = fields.Char('断屑槽型代号')
     blade_teeth_model = fields.Selection(
         [('无', '无'), ('V牙型', 'V牙型'), ('米制全牙型', '米制全牙型'), ('美制全牙型', '美制全牙型'),
          ('惠氏全牙型', '惠氏全牙型'), ('BSPT全牙型', 'BSPT全牙型'), ('NPT全牙型', 'NPT全牙型'),
          ('UNJ全牙型', 'UNJ全牙型'), ('DIN405圆牙型', 'DIN405圆牙型'), ('ACME梯形', 'ACME梯形'),
          ('石油管螺纹刀片', '石油管螺纹刀片'), ('矮牙ACME梯形', '矮牙ACME梯形'),
          ('Trapeze30° 103', 'Trapeze30° 103')], string='刀片牙型', default='无')
-    blade_blade_number = fields.Selection([('1', '1'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'),
-                                           ('7', '7'), ('8', '8'), ('9', '9'), ('10', '10')],
-                                          string='刀片的刃数(个)')
+    blade_blade_number = fields.Selection(
+        [('0', '0'), ('1', '1'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8'),
+         ('9', '9'), ('10', '10')],
+        string='刀片的刃数(个)', default='0')
     main_included_angle = fields.Integer('主偏角(°)')
     top_angle = fields.Integer('顶角(°)')
-    blade_tip_dip_angle = fields.Integer('刀尖倾角(°)')
-    side_cutting_edge_angle = fields.Integer('侧切削角(°)')
     thread_model = fields.Selection([('无', '无'), ('外螺纹', '外螺纹'), ('内螺纹', '内螺纹')], string='螺纹类型',
                                     default='无')
     thread_num = fields.Float('每英寸螺纹数(tpi)')
@@ -73,11 +74,8 @@ class ToolMaterialsBasicParameters(models.Model):
     is_cooling_hole = fields.Boolean('有无冷却孔')
     locating_slot_code = fields.Char('定位槽代号', size=20)
     installing_structure = fields.Char('安装结构', size=20)
-    blade_ids = fields.Many2many(
-        'sf.cutting.tool.type',
-        relation='basic_param_pad_blade_rel',
-        column1='model_id_1',
-        column2='model_id_2',
+    blade_id = fields.Many2one(
+        'sf.cutting_tool.standard.library',
         domain="[('cutting_tool_material_id.name', '=', '刀片')]",
         string='适配刀片型号'  # 使用空列表作为默认值
     )
@@ -90,24 +88,34 @@ class ToolMaterialsBasicParameters(models.Model):
     cutter_head_diameter = fields.Float('刀盘直径(mm)')
     interface_diameter = fields.Float('接口直径(mm)')
     # 刀柄参数
-    flange_shank_length = fields.Float('法兰柄长(mm)')
+    flange_shank_length = fields.Float('法兰长(mm)')
+    flange_diameter = fields.Float('法兰直径(mm)')
+    fit_chuck_size = fields.Char('适配夹头尺寸')
     handle_external_diameter = fields.Float('柄部外径(mm)')
     handle_inside_diameter = fields.Float('柄部内径(mm)')
+    dynamic_balance_class = fields.Char('动平衡等级')
     min_clamping_diameter = fields.Float('最小夹持直径(mm)')
     max_clamping_diameter = fields.Float('最大夹持直径(mm)')
     clamping_mode = fields.Char('夹持方式', size=20)
     max_load_capacity = fields.Float('最大负载能力(kg)')
     taper = fields.Integer('锥度(°)')
+    shank_length = fields.Float('刀柄长度(mm)', digits=(3, 2))
+    shank_diameter = fields.Float('刀柄直径(mm)')
     tool_changing_time = fields.Integer('换刀时间(s)')
     standard_rotate_speed = fields.Integer('标准转速(n/min)')
     max_rotate_speed = fields.Integer('最大转速(n/min)')
     diameter_slip_accuracy = fields.Char('径跳精度(mm)', size=20)
     cooling_model = fields.Char('冷却类型', size=20)
-    is_rough_machining = fields.Boolean('可粗加工', default=False)
-    is_finish_machining = fields.Boolean('可精加工', default=False)
+    taper_shank_model = fields.Char('锥柄型号')
     is_quick_cutting = fields.Boolean('可高速切削', default=False)
-    is_drill_hole = fields.Boolean('可钻孔', default=False)
     is_safe_lock = fields.Boolean('有无安全锁', default=False)
+    chuck_id = fields.Many2one(
+        'sf.cutting_tool.standard.library',
+        domain="[('cutting_tool_material_id.name', '=', '夹头')]",
+        string='适配夹头型号'  # 使用空列表作为默认值
+    )
+    nut = fields.Char('适配锁紧螺母型号')
+
     # 夹头参数
     er_size_model = fields.Char('ER尺寸型号', size=20)
     outer_diameter = fields.Float('外径(mm)')
@@ -118,179 +126,14 @@ class ToolMaterialsBasicParameters(models.Model):
     clamping_length = fields.Float('夹持长度(mm)')
     clamping_tolerance = fields.Char('夹持公差(mm)', size=20)
     cooling_jacket = fields.Char('适用冷却套型号', size=50)
-    handle_ids = fields.Many2many(
-        'sf.cutting.tool.type',
-        relation='basic_param_chuck_handle_rel',
-        column1='model_id_1',
-        column2='model_id_2',
-        domain="[('cutting_tool_material_id.name', '=', '刀柄')]",
-        string='适用刀柄型号'
-    )
-
-    def _json_integral_tool_basic_param(self, obj):
-        integral_tool_basic_param_str = (0, '', {
-            'name': obj['name'],
-            'cutting_tool_type': obj['cutting_tool_type'],
-            'total_length': obj['total_length'],
-            'blade_diameter': obj['blade_diameter'],
-            'blade_length': obj['blade_length'],
-            'blade_number': obj['blade_number'],
-            'neck_length': obj['neck_length'],
-            'neck_diameter': obj['neck_diameter'],
-            'handle_diameter': obj['handle_diameter'],
-            'handle_length': obj['handle_length'],
-            'blade_tip_diameter': obj['blade_tip_diameter'],
-            'blade_tip_working_size': obj['blade_tip_working_size'],
-            'blade_tip_taper': obj['blade_tip_taper'],
-            'blade_helix_angle': obj['blade_helix_angle'],
-            'blade_width': obj['blade_width'],
-            'blade_depth': obj['blade_depth'],
-            'pitch': obj['pitch'],
-            'cutting_depth': obj['cutting_depth'],
-        })
-        return integral_tool_basic_param_str
-
-    def _json_blade_basic_param(self, obj):
-        blade_basic_param_str = (0, '', {
-            'name': obj['name'],
-            'cutting_tool_type': obj['cutting_tool_type'],
-            'length': obj['length'],
-            'thickness': obj['thickness'],
-            'width': obj['width'],
-            'cutting_blade_length': obj['cutting_blade_length'],
-            'relief_angle': obj['relief_angle'],
-            'blade_tip_circular_arc_radius': obj['blade_tip_circular_arc_radius'],
-            'inscribed_circle_diameter': obj['inscribed_circle_diameter'],
-            'install_aperture_diameter': obj['install_aperture_diameter'],
-            'pitch': obj['pitch'],
-            'chip_breaker_groove': obj['chip_breaker_groove'],
-            'blade_teeth_model': '无' if not obj['bladed_teeth_model'] else obj['bladed_teeth_model'],
-            'blade_blade_number': obj['blade_blade_number'],
-            'cutting_depth': obj['cutting_depth'],
-            'blade_width': obj['blade_width'],
-            'main_included_angle': obj['main_included_angle'],
-            'top_angle': obj['top_angle'],
-            'blade_tip_dip_angle': obj['blade_tip_dip_angle'],
-            'side_cutting_edge_angle': obj['side_cutting_edge_angle'],
-            'thread_model': '无' if not obj['thread_model'] else obj['thread_model'],
-            'thread_num': obj['thread_num'],
-            'blade_tip_height_tolerance': obj['blade_tip_height_tolerance'],
-            'inscribed_circle_tolerance': obj['inscribed_circle_tolerance'],
-            'thickness_tolerance': obj['thickness_tolerance'],
-        })
-        return blade_basic_param_str
-
-    def _json_cutter_arbor_basic_param(self, obj):
-        cutter_arbor_basic_param_str = (0, '', {
-            'name': obj['name'],
-            'cutting_tool_type': obj['cutting_tool_type'],
-            'height': obj['height'],
-            'width': obj['width'],
-            'total_length': obj['total_length'],
-            'knife_head_height': obj['knife_head_height'],
-            'knife_head_width': obj['knife_head_width'],
-            'knife_head_length': obj['knife_head_length'],
-            'cutter_arbor_diameter': obj['cutter_arbor_diameter'],
-            'main_included_angle': obj['main_included_angle'],
-            'relief_angle': obj['relief_angle'],
-            'cutting_depth': obj['cutting_depth'],
-            'min_machining_aperture': obj['min_machining_aperture'],
-            'install_blade_tip_num': obj['install_blade_tip_num'],
-            'cutting_blade_model': obj['cutting_blade_model'],
-            'is_cooling_hole': obj['is_cooling_hole'],
-            'locating_slot_code': obj['locating_slot_code'],
-            'installing_structure': obj['installing_structure'],
-            'blade_ids': [(6, 0, [])] if not obj.get('blade_codes') else
-            self.evn['sf.cutting_tool.standard.library']._get_ids(obj['blade_codes']),
-            'tool_shim': obj['tool_shim'],
-            'cotter_pin': obj['cotter_pin'],
-            'pressing_plate': obj['pressing_plate'],
-            'screw': obj['screw'],
-            'spanner': obj['spanner'],
-        })
-        return cutter_arbor_basic_param_str
-
-    def _json_cutter_head_basic_param(self, obj):
-        cutter_head_basic_param_str = (0, '', {
-            'name': obj['name'],
-            'cutting_tool_type': obj['cutting_tool_type'],
-            'install_blade_tip_num': obj['install_blade_tip_num'],
-            'blade_diameter': obj['blade_diameter'],
-            'cutter_head_diameter': obj['cutter_head_diameter'],
-            'interface_diameter': obj['interface_diameter'],
-            'total_length': obj['total_length'],
-            'blade_length': obj['blade_length'],
-            'cutting_depth': obj['cutting_depth'],
-            'main_included_angle': obj['main_included_angle'],
-            'installing_structure': obj['installing_structure'],
-            'blade_ids': [(6, 0, [])] if not obj.get('blade_codes') else
-            self.evn['sf.cutting_tool.standard.library']._get_ids(obj['blade_codes']),
-            'screw': obj['screw'],
-            'spanner': obj['spanner'],
-            'cutting_blade_model': obj['cutting_blade_model'],
-            'is_cooling_hole': obj['is_cooling_hole'],
-            'locating_slot_code': obj['locating_slot_code'],
-        })
-        return cutter_head_basic_param_str
-
-    def _json_knife_handle_basic_param(self, obj):
-        knife_handle_basic_param_str = (0, '', {
-            'name': obj['name'],
-            'cutting_tool_type': obj['cutting_tool_type'],
-            'total_length': obj['total_length'],
-            'flange_shank_length': obj['flange_shank_length'],
-            'handle_external_diameter': obj['handle_external_diameter'],
-            'handle_inside_diameter': obj['handle_inside_diameter'],
-            'min_clamping_diameter': obj['min_clamping_diameter'],
-            'max_clamping_diameter': obj['max_clamping_diameter'],
-            'clamping_mode': obj['clamping_mode'],
-            'max_load_capacity': obj['max_load_capacity'],
-            'taper': obj['taper'],
-            'tool_changing_time': obj['tool_changing_time'],
-            'standard_rotate_speed': obj['standard_rotate_speed'],
-            'max_rotate_speed': obj['max_rotate_speed'],
-            'diameter_slip_accuracy': obj['diameter_slip_accuracy'],
-            'cooling_model': obj['cooling_model'],
-            'is_rough_machining': obj['is_rough_machining'],
-            'is_finish_machining': obj['is_finish_machining'],
-            'is_quick_cutting': obj['is_quick_cutting'],
-            'is_drill_hole': obj['is_drill_hole'],
-            'is_safe_lock': obj['is_safe_lock'],
-            'screw': obj['screw'],
-            'spanner': obj['spanner'],
-        })
-        return knife_handle_basic_param_str
-
-    def _json_chuck_basic_param(self, obj):
-        chuck_basic_param_str = (0, '', {
-            'name': obj['name'],
-            'cutting_tool_type': obj['cutting_tool_type'],
-            'er_size_model': obj['er_size_model'],
-            'min_clamping_diameter': obj['min_clamping_diameter'],
-            'max_clamping_diameter': obj['max_clamping_diameter'],
-            'outer_diameter': obj['outer_diameter'],
-            'inner_diameter': obj['inner_diameter'],
-            'run_out_accuracy': obj['run_out_accuracy'],
-            'total_length': obj['total_length'],
-            'taper': obj['taper'],
-            'run_out_accuracy': obj['run_out_accuracy'],
-            'top_diameter': obj['top_diameter'],
-            'weight': obj['weight'],
-            'clamping_mode': obj['clamping_mode'],
-            'clamping_length': obj['clamping_length'],
-            'clamping_tolerance': obj['clamping_tolerance'],
-            'max_load_capacity': obj['max_load_capacity'],
-            'handle_ids': [(6, 0, [])] if not obj.get(
-                'handle_codes') else self.evn['sf.cutting_tool.standard.library']._get_ids(obj['handle_codes']),
-            'cooling_jacket': obj['cooling_jacket'],
-        })
-        return chuck_basic_param_str
+    active = fields.Boolean(string='有效', default=True)
 
 
 class CuttingSpeed(models.Model):
     _name = 'sf.cutting.speed'
     _description = '切削速度Vc'
 
+    name = fields.Char('名称')
     product_template_id = fields.Many2one('product.template')
     standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='标准库')
 
@@ -310,40 +153,7 @@ class CuttingSpeed(models.Model):
     cutting_speed_min = fields.Float('最小值')
 
     application = fields.Selection([('主应用', '主应用'), ('次应用', '次应用')], '主/次应用')
-
-    # ===============待删除字段==============
-    material_id = fields.Many2one('sf.materials.model', '材料名称',
-                                  domain="[('standards_id', '=', execution_standard_id)]")
-    slope_milling_angle = fields.Integer('坡铣角度(°)')
-    cutting_speed_n1 = fields.Char('径向切宽 ae=100%D1 ap=1*D1 切削速度Vc')
-    cutting_speed_n2 = fields.Char('径向切宽 ae=50%D1 ap=1.5*D1 切削速度Vc')
-    cutting_speed_n3 = fields.Char('径向切宽 ae=25%D1 ap=L1max 切削速度Vc')
-    cutting_speed_n4 = fields.Char('径向切宽 ae=15%D1 ap=L1max 切削速度Vc')
-    cutting_speed_n5 = fields.Char('径向切宽 ae=5%D1 ap=L1max 切削速度Vc')
-    rough_machining = fields.Char('粗加工 Vc(m/min)')
-    precision_machining = fields.Char('精加工 Vc(m/min)')
-
-    # ======================================
-
-    def _json_cutting_speed(self, obj):
-        cutting_speed_str = (0, '', {
-            'execution_standard_id': self.env['sf.international.standards'].search(
-                [('code', '=', obj['execution_standard_code'])]).id,
-            'material_code': obj['material_code'],
-            'material_id': self.env['sf.materials.model'].search([('materials_no', '=', obj['material_name_code'])]).id,
-            'material_grade': obj['material_grade'],
-            'tensile_strength': obj['tensile_strength'],
-            'hardness': obj['hardness'],
-            'cutting_speed_n1': obj['cutting_speed_n1'],
-            'cutting_speed_n2': obj['cutting_speed_n2'],
-            'cutting_speed_n3': obj['cutting_speed_n3'],
-            'cutting_speed_n4': obj['cutting_speed_n4'],
-            'cutting_speed_n5': obj['cutting_speed_n5'],
-            'rough_machining': obj['rough_machining'],
-            'precision_machining': obj['precision_machining'],
-            'application': obj['application'],
-        })
-        return cutting_speed_str
+    active = fields.Boolean(string='有效', default=True)
 
 
 class FeedPerTooth(models.Model):
@@ -351,52 +161,16 @@ class FeedPerTooth(models.Model):
     _description = '每齿走刀量fz'
     _order = 'blade_diameter,cutting_width_depth_id,materials_type_id'
 
+    name = fields.Char('名称')
     product_template_id = fields.Many2one('product.template')
     standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='标准库')
     blade_diameter = fields.Integer('刃部直径(mm)', readonly=True)
     materials_type_id = fields.Many2one('sf.materials.model', string='材料名称', readonly=True)
     cutting_width_depth_id = fields.Many2one('sf.cutting.width.depth', '切削宽度和深度', readonly=True)
     feed_per_tooth = fields.Char('每齿走刀量 (mm/z)', size=20)
+    active = fields.Boolean(string='有效', default=True)
 
-    # =============待删除字段===========
-    cutting_speed = fields.Char('径向切宽 ae(mm)')
-    machining_method = fields.Selection([('直铣', '直铣'), ('坡铣', '坡铣')], string='加工方式')
 
-    # ================================
-
-    def _json_feed_per_tooth(self, obj):
-        feed_per_tooth_str = (0, '', {
-            'cutting_speed': obj['cutting_speed'],
-            'blade_diameter': obj['blade_diameter'],
-            'feed_per_tooth': obj['feed_per_tooth'],
-        })
-        return feed_per_tooth_str
-
-    def _json_feed_per_tooth_2(self, obj):
-        feed_per_tooth_2_str = (0, '', {
-            'machining_method': obj['machining_method'],
-            'materials_type_id': self.env['sf.materials.model'].search(
-                [('materials_no', '=', obj['materials_type_code'])]).id,
-            'blade_diameter': obj['blade_diameter'],
-            'feed_per_tooth': obj['feed_per_tooth'],
-        })
-        return feed_per_tooth_2_str
-
-    def _json_feed_per_tooth_3(self, obj):
-        feed_per_tooth_3_str = (0, '', {
-            'cutting_speed': obj['cutting_speed'],
-            'feed_per_tooth': obj['feed_per_tooth'],
-        })
-        return feed_per_tooth_3_str
-
-    def _json_feed_per_tooth_4(self, obj):
-        feed_per_tooth_4_str = (0, '', {
-            'machining_method': obj['machining_method'],
-            'materials_type_id': self.env['sf.materials.model'].search(
-                [('materials_no', '=', obj['materials_type_code'])]).id,
-            'feed_per_tooth': obj['feed_per_tooth'],
-        })
-        return feed_per_tooth_4_str
 
     # @api.depends('product_template_id')
     # def _compute_product_template_id(self):
diff --git a/sf_base/views/tool_basic_param.xml b/sf_base/views/tool_basic_param.xml
index dfe3eaf7..616905ca 100644
--- a/sf_base/views/tool_basic_param.xml
+++ b/sf_base/views/tool_basic_param.xml
@@ -46,8 +46,6 @@
                 <field name="blade_blade_number"/>
                 <field name="main_included_angle" />
                 <field name="top_angle" />
-                <field name="blade_tip_dip_angle"/>
-                <field name="side_cutting_edge_angle"/>
                  <field name="thread_model"/>
                 <field name="thread_num" />
                 <field name="blade_tip_height_tolerance" />
@@ -73,7 +71,7 @@
                  <field name="is_cooling_hole" />
                 <field name="locating_slot_code" />
                 <field name="installing_structure"/>
-                <field name="blade_ids"/>
+                <field name="blade_id"/>
                 <field name="tool_shim" />
                 <field name="cotter_pin" />
                 <field name="pressing_plate"/>
diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index f189017d..f0e79d5f 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -157,6 +157,12 @@
                                 <field name="cutter_pad_ids" widget="many2many_tags"
                                        options="{'no_create': True}" search="[]"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="handle_id" placeholder="请选择"
+                                       options="{'no_create': True}" search="[]"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
+                                <field name="chuck_id" placeholder="请选择"
+                                       options="{'no_create': True}" search="[]"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
                             </group>
                             <group>
                                 <field name="material_model_id" placeholder="请选择" string="材质"
@@ -197,7 +203,7 @@
                             <group string="走刀方向">
                                 <field name="cutting_direction_ids" string="" widget="custom_many2many_checkboxes"/>
                             </group>
-                            <group string="适合冷却液">
+                            <group string="适合冷却方式">
                                 <field name="suitable_coolant_ids" string="" widget="custom_many2many_checkboxes"/>
                             </group>
                         </group>
@@ -223,7 +229,7 @@
                                         <field name="pitch"/>
                                         <field name="blade_width"/>
                                         <field name="blade_depth"/>
-                                        <field name="cutting_depth"/>
+                                        <field name="cut_depth_max"/>
                                     </tree>
                                 </field>
 
@@ -234,24 +240,22 @@
                                         <field name="name"/>
                                         <field name="length"/>
                                         <field name="thickness"/>
-                                        <field name="width"/>
-                                        <field name="cutting_blade_length"/>
-                                        <field name="relief_angle" class="du"/>
-                                        <field name="blade_tip_circular_arc_radius"/>
                                         <field name="inscribed_circle_diameter" class="diameter"/>
                                         <field name="install_aperture_diameter" class="diameter"/>
-                                        <field name="pitch"/>
+                                        <field name="blade_tip_circular_arc_radius" string="刀尖圆弧半径RE(mm)"/>
+                                        <field name="cutting_blade_length"/>
+                                        <field name="relief_angle" class="du"/>
                                         <field name="chip_breaker_groove" placeholder="请选择"/>
+                                        <field name="chip_breaker_type_code"/>
                                         <field name="blade_teeth_model" placeholder="请选择"/>
-                                        <field name="cutting_depth" string="最大切削深度(mm)"/>
+                                        <field name="thread_model" placeholder="请选择"/>
+                                        <field name="pitch"/>
+                                        <field name="thread_num"/>
+                                        <field name="cut_depth_max"/>
                                         <field name="blade_blade_number" string="刃数(个)"/>
                                         <field name="blade_width" string="刃宽(mm)"/>
                                         <field name="main_included_angle"/>
                                         <field name="top_angle"/>
-                                        <field name="blade_tip_dip_angle"/>
-                                        <field name="side_cutting_edge_angle"/>
-                                        <field name="thread_model" placeholder="请选择"/>
-                                        <field name="thread_num"/>
                                         <field name="blade_tip_height_tolerance"/>
                                         <field name="inscribed_circle_tolerance"/>
                                         <field name="thickness_tolerance"/>
@@ -262,29 +266,29 @@
                                     <tree editable="bottom" class="center" delete="1">
                                         <field name="cutting_tool_type" invisible="1"/>
                                         <field name="name"/>
-                                        <field name="height"/>
-                                        <field name="width"/>
                                         <field name="total_length"/>
-                                        <field name="blade_height"/>
-                                        <field name="blade_width"/>
-                                        <field name="blade_length"/>
+                                        <field name="width"/>
+                                        <field name="height"/>
+                                        <field name="knife_head_length"/>
+                                        <field name="knife_head_width"/>
+                                        <field name="knife_head_height"/>
                                         <field name="blade_diameter" class="diameter"/>
                                         <field name="cutter_arbor_diameter" class="diameter"/>
                                         <field name="main_included_angle" class="du"/>
                                         <field name="relief_angle" class="du"/>
-                                        <field name="cutting_depth" string="最大切削深度(mm)"/>
+                                        <field name="cutting_blade_length"/>
+                                        <field name="cut_depth_max"/>
                                         <field name="min_machining_aperture" class="diameter"/>
                                         <field name="install_blade_tip_num"/>
-                                        <field name="cutting_blade_model"/>
-                                        <field name="is_cooling_hole"/>
-                                        <field name="locating_slot_code"/>
                                         <field name="installing_structure"/>
-                                        <field name="blade_ids" widget="many2many_tags" placeholder="请选择"/>
+                                        <field name="blade_id" placeholder="请选择"/>
                                         <field name="tool_shim"/>
                                         <field name="cotter_pin"/>
                                         <field name="pressing_plate"/>
                                         <field name="screw"/>
                                         <field name="spanner"/>
+                                        <field name="is_cooling_hole"/>
+                                        <field name="locating_slot_code"/>
                                     </tree>
                                 </field>
 
@@ -299,13 +303,13 @@
                                         <field name="interface_diameter" class="diameter"/>
                                         <field name="total_length"/>
                                         <field name="blade_length"/>
-                                        <field name="cutting_depth" string="最大切削深度(mm)"/>
+                                        <field name="cutting_blade_length" string="切削刃长度(mm)"/>
+                                        <field name="cut_depth_max"/>
                                         <field name="main_included_angle" class="du"/>
                                         <field name="installing_structure"/>
-                                        <field name="blade_ids" widget="many2many_tags" placeholder="请选择"/>
+                                        <field name="blade_id" placeholder="请选择"/>
                                         <field name="screw"/>
                                         <field name="spanner"/>
-                                        <field name="cutting_blade_model"/>
                                         <field name="is_cooling_hole"/>
                                         <field name="locating_slot_code"/>
                                     </tree>
@@ -316,27 +320,25 @@
                                     <tree editable="bottom" class="center" delete="1">
                                         <field name="cutting_tool_type" invisible="1"/>
                                         <field name="name"/>
+                                        <field name="taper_shank_model"/>
                                         <field name="total_length"/>
+                                        <field name="shank_length"/>
+                                        <field name="shank_diameter" class="diameter"/>
                                         <field name="flange_shank_length"/>
-                                        <field name="handle_external_diameter" class="diameter"/>
-                                        <field name="handle_inside_diameter" class="diameter"/>
+                                        <field name="flange_diameter"/>
+                                        <field name="diameter_slip_accuracy"/>
+                                        <field name="dynamic_balance_class"/>
                                         <field name="min_clamping_diameter" class="diameter"/>
                                         <field name="max_clamping_diameter" class="diameter"/>
-                                        <field name="clamping_mode"/>
-                                        <field name="max_load_capacity"/>
-                                        <field name="taper" class="du"/>
-                                        <field name="tool_changing_time"/>
-                                        <field name="standard_rotate_speed"/>
                                         <field name="max_rotate_speed"/>
-                                        <field name="diameter_slip_accuracy"/>
+                                        <field name="fit_chuck_size"/>
+                                        <field name="nut"/>
+                                        <field name="spanner" string="适配锁紧扳手型号"/>
+                                        <field name="clamping_mode"/>
+                                        <field name="tool_changing_time"/>
                                         <field name="cooling_model"/>
-                                        <field name="is_rough_machining"/>
-                                        <field name="is_finish_machining"/>
                                         <field name="is_quick_cutting"/>
-                                        <field name="is_drill_hole"/>
                                         <field name="is_safe_lock"/>
-                                        <field name="screw"/>
-                                        <field name="spanner"/>
                                     </tree>
                                 </field>
                                 <field name="chuck_basic_parameters_ids"
@@ -344,21 +346,17 @@
                                     <tree editable="bottom" class="center" delete="1">
                                         <field name="cutting_tool_type" invisible="1"/>
                                         <field name="name"/>
-                                        <field name="er_size_model"/>
+                                        <field name="er_size_model" string="尺寸型号"/>
                                         <field name="min_clamping_diameter" class="diameter" required="1"/>
                                         <field name="max_clamping_diameter" class="diameter"/>
+                                        <field name="total_length"/>
                                         <field name="outer_diameter" class="diameter"/>
                                         <field name="inner_diameter" class="diameter"/>
-                                        <field name="total_length"/>
                                         <field name="taper" class="du"/>
                                         <field name="run_out_accuracy"/>
                                         <field name="top_diameter" class="diameter"/>
                                         <field name="weight"/>
-                                        <field name="clamping_mode"/>
-                                        <field name="clamping_length"/>
-                                        <field name="clamping_tolerance"/>
                                         <field name="max_load_capacity"/>
-                                        <field name="handle_ids" widget="many2many_tags" placeholder="请选择"/>
                                         <field name="cooling_jacket"/>
                                     </tree>
                                 </field>
@@ -380,7 +378,6 @@
                                         <field name="cutting_width_depth_id"/>
                                         <field name="process_capability"/>
                                         <field name="cutting_speed"/>
-
                                     </tree>
                                 </field>
                             </page>
diff --git a/sf_dlm_management/views/product_template_management_view.xml b/sf_dlm_management/views/product_template_management_view.xml
index 9628e1c2..94cb4b7f 100644
--- a/sf_dlm_management/views/product_template_management_view.xml
+++ b/sf_dlm_management/views/product_template_management_view.xml
@@ -7,7 +7,7 @@
             <field name="inherit_id" ref="sf_sale.view_product_template_form_inherit_sf"/>
             <field name="arch" type="xml">
                 <field name="invoice_policy" position="after">
-                    <field name='categ_id' attrs="{'readonly': [('categ_id', '!=', False)]}"/>
+                    <field name='categ_id' attrs="{'readonly': [('id', '!=', False)]}"/>
                     <field name='is_bfm' invisible="1"/>
                     <field name='categ_type' invisible="1"/>
                     <field name="upload_model_file"
@@ -18,23 +18,23 @@
                     <field name='cutting_tool_type' invisible="1"/>
                     <field name="fixture_material_type" invisible="1"/>
                     <field name="embryo_model_type_id" string="模型类型"
-                           attrs="{'invisible': ['|',('categ_type', '!=', '坯料'),('categ_type', '=', False)],'readonly': [('categ_id', '!=', False)]}"/>
+                           attrs="{'invisible': ['|',('categ_type', '!=', '坯料'),('categ_type', '=', False)],'readonly': [('id', '!=', False)]}"/>
                     <field name="materials_id" string="材料" placeholder="请选择"
-                           attrs="{'invisible': [('categ_type', 'not in', ['成品','坯料', '原材料'])],'readonly': [('categ_id', '!=', False)]}"/>
+                           attrs="{'invisible': [('categ_type', 'not in', ['成品','坯料', '原材料'])],'readonly': [('id', '!=', False)]}"/>
                     <field name="materials_type_id" string="型号" placeholder="请选择"
                            domain="[('materials_id', '=', materials_id)]"
-                           attrs="{'invisible': [('categ_type', 'not in', ['成品','坯料', '原材料'])],'readonly': [('categ_id', '!=', False)]}"/>
+                           attrs="{'invisible': [('categ_type', 'not in', ['成品','坯料', '原材料'])],'readonly': [('id', '!=', False)]}"/>
                     <field name="server_product_process_parameters_id" string="表面工艺参数"
                            options="{'no_create': True}"
                            attrs="{'invisible': ['|',('categ_type', '!=', '表面工艺'),('categ_type', '=', False)]}"/>
                     <field name="cutting_tool_material_id"
-                           attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('categ_id', '!=', False)]}"
+                           attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('id', '!=', False)]}"
                            placeholder="请选择"/>
                     <field name="cutting_tool_model_id" placeholder="请选择"
-                           attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('categ_id', '!=', False)]}"
+                           attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('id', '!=', False)]}"
                            domain="[('cutting_tool_material_id','=',cutting_tool_material_id)]"/>
                     <field name="specification_id" placeholder="请选择"
-                           attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('categ_id', '!=', False)]}"
+                           attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('id', '!=', False)]}"
                            domain="[('standard_library_id','=',cutting_tool_model_id)]"/>
                     <field name="fixture_material_id" attrs="{'invisible': [('categ_type', '!=', '夹具')]}"
                            placeholder="请选择"/>
@@ -44,12 +44,7 @@
                     <field name="specification_fixture_id" string="规格" placeholder="请选择"
                            attrs="{'invisible': [('categ_type', '!=', '夹具')]}"
                            domain="[('fixture_model_id','=',fixture_model_id)]"/>
-
-                    <field name="name" position="attributes">
-                        <attribute name="attrs">{'readonly': [('categ_id', '!=', False)]}</attribute>
-                    </field>
                 </field>
-
                 <xpath expr="//label[@for='volume']" position="before">
                     <label for="length" string="尺寸"
                            attrs="{'invisible':[('product_variant_count', '>', 1), ('is_product_variant', '=', False)]}"/>
@@ -114,116 +109,95 @@
             <field name="arch" type="xml">
                 <xpath expr="//page[1]" position="after">
                     <page string="刀具物料参数"
-                          attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('categ_type', '=', '刀具')]}">
+                          attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('id', '!=', False)]}">
                         <group>
                             <group attrs="{'invisible': [('categ_type', '!=', '刀具')]}" col="1">
                                 <field name="cutting_tool_type_id" options="{'no_create': True}"
-                                       placeholder="请选择" attrs="{'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       placeholder="请选择" attrs="{'readonly': [('id', '!=', False)]}"/>
                                 <field name="brand_id" options="{'no_create': True}" placeholder="请选择"
-                                       attrs="{'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_total_length"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','夹头','刀柄'))],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','夹头','刀柄'))],'readonly': [('id', '!=', False)]}"/>
                                 <field name="tool_hardness" string="硬度(hrc)"
-                                       attrs="{'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'readonly': [('id', '!=', False)]}"/>
                                 <label for="cutting_tool_run_out_accuracy_min" string="端跳精度"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <div class="o_address_format"
-                                     attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('categ_type', '=', '刀具')]}">
+                                     attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}">
                                     <label for="cutting_tool_run_out_accuracy_min" string="最小"/>
                                     <field name="cutting_tool_run_out_accuracy_min" class="o_address_zip"
                                            options="{'format': false}"
-                                           attrs="{'invisible': [('cutting_tool_type','!=','整体式刀具')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                           attrs="{'invisible': [('cutting_tool_type','!=','整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                     <span>(mm)&amp;nbsp;</span>
                                     <label for="cutting_tool_run_out_accuracy_max" string="最大"/>
                                     <field name="cutting_tool_run_out_accuracy_max" class="o_address_zip"
                                            options="{'format': false}"
-                                           attrs="{'invisible': [('cutting_tool_type','!=','整体式刀具')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                           attrs="{'invisible': [('cutting_tool_type','!=','整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                     <span>(mm)&amp;nbsp;</span>
                                 </div>
 
                                 <field name="tool_width"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="tool_height"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('id', '!=', False)]}"/>
+                                <field name="cutting_tool_flange_diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_flange_length"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('categ_type', '=', '刀具')]}"/>
-                                <field name="cutting_tool_shank_outer_diameter"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('categ_type', '=', '刀具')]}"/>
-                                <field name="cutting_tool_shank_inner_diameter"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('categ_type', '=', '刀具')]}"/>
-
-                                <!--                                <field name="materials_type_id" options="{'no_create': True}" string="刀具材质"-->
-                                <!--                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"-->
-                                <!--                                       placeholder="请选择"/>-->
-                                <!--                                <field name="tool_hardness" string="刀具硬度(hrc)"-->
-                                <!--                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>-->
-                                <!--                                <field name="materials_type_id" options="{'no_create': True}" string="夹头材质"-->
-                                <!--                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"-->
-                                <!--                                       placeholder="请选择"/>-->
-                                <!--                                <field name="tool_hardness" string="夹头硬度(hrc)"-->
-                                <!--                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>-->
-                                <!--                                <field name="materials_type_id" options="{'no_create': True}" string="刀柄材质"-->
-                                <!--                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"-->
-                                <!--                                       placeholder="请选择"/>-->
-                                <!--                                <field name="tool_hardness" string="刀柄硬度(hrc)"-->
-                                <!--                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>-->
-
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_blade_diameter" string="刃部直径(mm)" class="diameter"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_blade_length"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_blade_width"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_blade_depth"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_blade_helix_angle"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_blade_number" placeholder="请选择"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_blade_tip_working_size"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_blade_tip_diameter" string="刀尖直径(mm)" class="diameter"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_blade_tip_taper" string="刀尖锥度(°)"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <!--刀片-->
                                 <label for="tool_length" string="尺寸(mm)"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/>
                                 <div class="test_model"
-                                     attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('categ_type', '=', '刀具')]}">
+                                     attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}">
                                     <label for="tool_length" string="长"/>
                                     <field name="tool_length" class="o_address_zip"
                                            options="{'format': false}"
-                                           attrs="{'readonly': [('categ_type', '=', '刀具')]}"/>
+                                           attrs="{'readonly': [('id', '!=', False)]}"/>
                                     <label for="tool_thickness" string="厚"/>
                                     <field name="tool_thickness" class="o_address_zip"
                                            options="{'format': false}"
-                                           attrs="{'readonly': [('categ_type', '=', '刀具')]}"/>
-                                    <label for="tool_width" string="宽"/>
-                                    <field name="tool_width" class="o_address_zip"
-                                           options="{'format': false}"
-                                           attrs="{'readonly': [('categ_type', '=', '刀具')]}"/>
+                                           attrs="{'readonly': [('id', '!=', False)]}"/>
                                 </div>
-                                <field name="cutting_tool_cut_blade_length"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('categ_type', '=', '刀具')]}"/>
-                                <field name="cutting_tool_blade_tip_circular_arc_radius"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('categ_type', '=', '刀具')]}"/>
-                                <field name="cutting_tool_blade_tip_height_tolerance"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('categ_type', '=', '刀具')]}"/>
-                                <field name="cutting_tool_inscribed_circle_diameter"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('categ_type', '=', '刀具')]}"/>
-                                <field name="cutting_tool_inscribed_circle_tolerance"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('categ_type', '=', '刀具')]}"/>
-                                <field name="cutting_tool_install_aperture_diameter"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('categ_type', '=', '刀具')]}"/>
-                                <field name="cutting_tool_chip_breaker_groove"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('categ_type', '=', '刀具')]}"/>
-                                <field name="cutting_tool_cut_depth_max"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('categ_type', '=', '刀具')]}"/>
                                 <field name="cutting_tool_blade_blade_number" string="刃数"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_blade_width" string="刃宽"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/>
+                                <field name="cutting_tool_cut_blade_length"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/>
+                                <field name="cutting_tool_blade_tip_circular_arc_radius"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/>
+                                <field name="cutting_tool_blade_tip_height_tolerance"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/>
+                                <field name="cutting_tool_inscribed_circle_diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/>
+                                <field name="cutting_tool_inscribed_circle_tolerance"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/>
+                                <field name="cutting_tool_install_aperture_diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/>
+                                <field name="cutting_tool_chip_breaker_groove"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/>
+                                <field name="cutting_tool_chip_breaker_type_code"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/>
+                                <field name="cutting_tool_cut_depth_max"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/>
                                 <!--刀杆-->
 
                                 <label for="cutting_tool_knife_head_length" string="刀头尺寸(mm)"
@@ -233,43 +207,39 @@
                                     <label for="cutting_tool_knife_head_length" string="长"/>
                                     <field name="cutting_tool_knife_head_length" class="o_address_zip"
                                            options="{'format': false}"
-                                           attrs="{'readonly': [('categ_type', '=', '刀具')]}"/>
+                                           attrs="{'readonly': [('id', '!=', False)]}"/>
                                     <label for="cutting_tool_knife_head_width" string="宽"/>
                                     <field name="cutting_tool_knife_head_width" class="o_address_zip"
                                            options="{'format': false}"
-                                           attrs="{'readonly': [('categ_type', '=', '刀具')]}"/>
+                                           attrs="{'readonly': [('id', '!=', False)]}"/>
                                     <label for="cutting_tool_knife_head_height" string="高"/>
                                     <field name="cutting_tool_knife_head_height" class="o_address_zip"
                                            options="{'format': false}"
-                                           attrs="{'readonly': [('categ_type', '=', '刀具')]}"/>
+                                           attrs="{'readonly': [('id', '!=', False)]}"/>
                                 </div>
                                 <field name="cutting_tool_blade_diameter" string="刃部直径(mm)" class="diameter"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))],'readonly': [('id', '!=', False)]}"/>
 
                                 <field name="cutting_tool_blade_length"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')],'readonly': [('id', '!=', False)]}"/>
 
                                 <field name="cutting_tool_cutter_arbor_diameter"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_cut_blade_length" string="切削刃长度(mm)"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_cut_depth_max"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_min_machining_aperture"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_install_blade_tip_num"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('id', '!=', False)]}"/>
                                 <!--刀盘-->
                                 <field name="cutting_tool_cutter_head_diameter"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_interface_diameter"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')],'readonly': [('id', '!=', False)]}"/>
 
                                 <!--夹头-->
-                                <field name="cutting_tool_clamping_length"
-                                       attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
-                                <field name="cutting_tool_clamping_tolerance"
-                                       attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
                                 <label for="cutting_tool_clamping_diameter_min" string="夹持直径"
                                        attrs='{"invisible": [("cutting_tool_type","not in",("夹头","刀柄"))]}'/>
                                 <div class="o_address_format"
@@ -277,217 +247,201 @@
                                     <label for="cutting_tool_clamping_diameter_min" string="最小"/>
                                     <field name="cutting_tool_clamping_diameter_min" class="o_address_zip diameter"
                                            options="{'format': false}"
-                                           attrs="{'required': [('cutting_tool_type','not in',('夹头','刀柄'))],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                           attrs="{'required': [('cutting_tool_type','not in',('夹头','刀柄'))],'readonly': [('id', '!=', False)]}"/>
                                     <span>(mm)&amp;nbsp;</span>
                                     <label for="cutting_tool_clamping_diameter_max" string="最大"/>
                                     <field name="cutting_tool_clamping_diameter_max" class="o_address_zip diameter"
                                            options="{'format': false}"
-                                           attrs="{'required': [('cutting_tool_type','not in',('夹头','刀柄'))],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                           attrs="{'required': [('cutting_tool_type','not in',('夹头','刀柄'))],'readonly': [('id', '!=', False)]}"/>
                                     <span>(mm)&amp;nbsp;</span>
                                 </div>
                                 <field name="cutting_tool_clamping_way"
-                                       attrs="{'invisible': [('cutting_tool_type','not in',('刀柄','夹头'))],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type','not in',('刀柄','夹头'))],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_top_diameter" class="diameter"
-                                       attrs="{'invisible': [('cutting_tool_type','not in',('夹头'))],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type','not in',('夹头'))],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_outer_diameter" class="diameter"
-                                       attrs="{'invisible': [('cutting_tool_type','not in',('夹头'))],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type','not in',('夹头'))],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_inner_diameter" class="diameter"
-                                       attrs="{'invisible': [('cutting_tool_type','not in',('夹头'))],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type','not in',('夹头'))],'readonly': [('id', '!=', False)]}"/>
                                 <!--夹头-->
-
-                                <field name="cutting_tool_standard_speed"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('categ_type', '=', '刀具')]}"/>
                                 <field name="cutting_tool_speed_max"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_change_time"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_cooling_type"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('id', '!=', False)]}"/>
                             </group>
-                            <group attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('categ_type', '=', '刀具')]}">
+                            <group attrs="{'invisible': [('categ_type', '!=', '刀具')],'readonly': [('id', '!=', False)]}">
                                 <field name="materials_type_id" options="{'no_create': True}" placeholder="请选择"
-                                       string="材质" attrs="{'readonly': [('categ_type', '=', '刀具')]}"/>
-                                <field name="coating_material" attrs="{'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       string="材质" attrs="{'readonly': [('id', '!=', False)]}"/>
+                                <field name="coating_material" attrs="{'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_blade_type"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_coarse_medium_fine" string="粗/中/精" placeholder="请选择"
-                                       attrs="{'required': [('cutting_tool_type','=','整体式刀具')],'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'required': [('cutting_tool_type','=','整体式刀具')],'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))],'readonly': [('id', '!=', False)]}"/>
                                 <!--整体式刀具-->
                                 <field name="cutting_tool_shank_diameter" string="柄部直径(mm)" class="diameter"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_shank_length"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_neck_diameter" string="颈部直径(mm)" class="diameter"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_neck_length" string="颈部长度(mm)"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('categ_type', '=', '刀具')]}"/>
-                                <field name="cutting_tool_cut_depth"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
+                                <field name="cutting_tool_cut_depth_max"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_pitch"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="tool_weight"
-                                       attrs='{"invisible": [("cutting_tool_type","not in",("夹头","刀柄"))],"readonly": [("categ_type", "=", "刀具")]}'/>
+                                       attrs='{"invisible": [("cutting_tool_type","not in",("夹头","刀柄"))],"readonly": [("id", "!=", False)]}'/>
                                 <field name="cutting_tool_taper"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头','刀柄'))],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头','刀柄'))],'readonly': [('id', '!=', False)]}"/>
+                                <field name="cutting_tool_taper_shank_model"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('id', '!=', False)]}"/>
+                                <field name="cutting_tool_dynamic_balance_class"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_jump_accuracy"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_rear_angle"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_main_included_angle"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片','刀杆'))],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片','刀杆','刀盘'))],'readonly': [('id', '!=', False)]}"/>
                                 <!--                                <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', ('刀片'))],'readonly': [('categ_type', '=', '刀具')]}"/>
-                                <field name="cutting_tool_blade_tip_dip_angle"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('categ_type', '=', '刀具')]}"/>
-                                <field name="cutting_tool_side_cutting_edge_angle"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_pitch"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_bladed_teeth_model"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('categ_type', '=', '刀具')]}"/>
-                                <field name="cutting_tool_thickness_tolerance"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_thread_model"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_thread_num"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/>
+                                   <field name="cutting_tool_thickness_tolerance"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_cutter_bar_ids" widget="many2many_tags"
                                        options="{'no_create': True}"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_cutter_pad_ids" widget="many2many_tags"
                                        options="{'no_create': True}"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')],'readonly': [('id', '!=', False)]}"/>
                                 <!--刀柄-->
-                                <field name="cutting_tool_is_rough_finish"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('categ_type', '=', '刀具')]}"/>
-                                <field name="cutting_tool_is_finish"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('categ_type', '=', '刀具')]}"/>
-                                <field name="cutting_tool_is_drill_hole"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('categ_type', '=', '刀具')]}"/>
                                 <field name="cutting_tool_is_high_speed_cutting"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_is_safety_lock" string="有无安全锁"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('categ_type', '=', '刀具')]}"/>
-
-
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('id', '!=', False)]}"/>
+                                <!--夹头-->
                                 <field name="cutting_tool_jump_accuracy" string="跳动精度(mm)"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_max_load_capacity"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_er_size_model"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_handle_ids" widget="many2many_tags"
                                        options="{'no_create': True}"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cooling_suit_type_ids"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')],'readonly': [('id', '!=', False)]}"/>
                                 <!-- 刀杆 -->
                                 <field name="cutting_tool_rear_angle"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_installing_structure"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_is_cooling_hole"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_locating_slot_code"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))],'readonly': [('categ_type', '=', '刀具')]}"/>
-                                <field name="cutting_tool_blade_ids" widget="many2many_tags"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))],'readonly': [('id', '!=', False)]}"/>
+                                <field name="cutting_tool_blade_id"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_tool_shim"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_cotter_pin"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_pressing_plate"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_screw"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀柄'))],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆'))],'readonly': [('id', '!=', False)]}"/>
+                                <field name="cutting_tool_fit_nut_model"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_wrench"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀柄'))],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀柄'))],'readonly': [('id', '!=', False)]}"/>
+                                <field name="cutting_tool_chuck_id"
+                                       options="{'no_create': True}"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('id', '!=', False)]}"/>
+                                <field name="cutting_tool_fit_chuck_size"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')],'readonly': [('id', '!=', False)]}"/>
                                 <!-- 刀盘 -->
-                                <field name="cutting_tool_blade_ids" widget="many2many_tags"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')],'readonly': [('categ_type', '=', '刀具')]}"/>
-                                <field name="cutting_tool_blade_ids" widget="many2many_tags"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')],'readonly': [('categ_type', '=', '刀具')]}"/>
+                                <field name="cutting_tool_screw"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')],'readonly': [('id', '!=', False)]}"/>
+                                <field name="cutting_tool_wrench"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')],'readonly': [('id', '!=', False)]}"/>
 
                             </group>
                         </group>
                         <group string="适配刀片形状"
                                attrs="{'invisible': [('cutting_tool_type', 'in', ('刀柄','夹头','整体式刀具',False))]}">
                             <field name="fit_blade_shape_id" string="" widget="many2one_radio"
-                                   attrs="{'readonly': [('categ_type', '=', '刀具')]}"/>
+                                   attrs="{'readonly': [('id', '!=', False)]}"/>
                         </group>
                         <group string="适合加工方式"
                                attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
                             <field name="suitable_machining_method_ids" string=""
-                                   attrs="{'readonly': [('categ_type', '=', '刀具')]}"
+                                   attrs="{'readonly': [('id', '!=', False)]}"
                                    widget="custom_many2many_checkboxes"/>
                         </group>
                         <group string="刀尖特征"
                                attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
                             <field name="blade_tip_characteristics_id" string=""
-                                   attrs="{'readonly': [('categ_type', '=', '刀具')]}"
+                                   attrs="{'readonly': [('id', '!=', False)]}"
                                    widget="many2one_radio"/>
                         </group>
                         <group attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
                             <group string="柄部类型"
                                    attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
                                 <field name="handle_type_id" string="" widget="many2one_radio"
-                                       attrs="{'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'readonly': [('id', '!=', False)]}"/>
                             </group>
                             <group string="压紧方式"
                                    attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}">
                                 <field name="compaction_way_id" string="" widget="many2one_radio"
-                                       attrs="{'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'readonly': [('id', '!=', False)]}"/>
                             </group>
                         </group>
                         <group attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
                             <group string="走刀方向">
                                 <field name="cutting_direction_ids" string="" widget="custom_many2many_checkboxes"
-                                       attrs="{'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'readonly': [('id', '!=', False)]}"/>
                             </group>
-                            <group string="适合冷却液">
+                            <group string="适合冷却方式">
                                 <field name="suitable_coolant_ids" string="" widget="custom_many2many_checkboxes"
-                                       attrs="{'readonly': [('categ_type', '=', '刀具')]}"/>
+                                       attrs="{'readonly': [('id', '!=', False)]}"/>
                             </group>
                         </group>
                         <notebook>
                             <page string="切削速度Vc"
                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}">
                                 <field name="cutting_speed_ids" string="" widget="one2many"
-                                       attrs="{'readonly': [('categ_type', '=', '刀具')]}" class="fixTableCss">
+                                       attrs="{'readonly': [('id', '!=', False)]}" class="fixTableCss">
                                     <tree editable="bottom">
-                                        <!--                <field name="order"/>-->
                                         <field name="execution_standard_id"/>
                                         <field name="material_code"/>
-                                        <field name="material_id"/>
                                         <field name="material_grade"/>
                                         <field name="tensile_strength"/>
                                         <field name="hardness"/>
-                                        <field name="cutting_speed_n1"/>
-                                        <field name="cutting_speed_n2"/>
-                                        <field name="cutting_speed_n3"/>
-                                        <field name="cutting_speed_n4"/>
-                                        <field name="cutting_speed_n5"/>
-                                        <field name="rough_machining"/>
-                                        <field name="precision_machining"/>
                                         <field name="application"/>
                                     </tree>
                                 </field>
                                 <script src="/sf_dlm_management/static/js/changeCss.js"></script>
-
                             </page>
                             <page string="每齿走刀量fz"
                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))],'readonly': [('categ_type', '=', '刀具')]}">
                                 <field name="feed_per_tooth_ids" string="" widget="one2many"
-                                       attrs="{'readonly': [('categ_type', '=', '刀具')]}">
+                                       attrs="{'readonly': [('id', '!=', False)]}">
                                     <tree editable="bottom">
-                                        <field name="cutting_speed"
-                                               attrs="{'readonly': [('materials_type_id','!=',False)]}"/>
-                                        <field name="machining_method" placeholder="请选择"
-                                               attrs="{'readonly': [('cutting_speed','!=',False)]}"/>
-                                        <field name="materials_type_id" placeholder="请选择"
-                                               attrs="{'readonly': [('cutting_speed','!=',False)]}"/>
+                                        <!--                                        <field name="cutting_speed"-->
+                                        <!--                                               attrs="{'readonly': [('materials_type_id','!=',False)]}"/>-->
+                                        <field name="materials_type_id" placeholder="请选择"/>
                                         <field name="blade_diameter"/>
                                         <field name="feed_per_tooth"/>
                                     </tree>
diff --git a/sf_maintenance/security/ir.model.access.csv b/sf_maintenance/security/ir.model.access.csv
index 6c7c1495..92277bf8 100644
--- a/sf_maintenance/security/ir.model.access.csv
+++ b/sf_maintenance/security/ir.model.access.csv
@@ -19,5 +19,4 @@ access_maintenance_standard_image_group_plan_dispatch,maintenance_standard_image
 access_equipment_maintenance_standards_group_plan_dispatch,equipment_maintenance_standards,model_equipment_maintenance_standards,sf_base.group_plan_dispatch,1,0,0,0
 access_maintenance_standards_group_plan_dispatch,maintenance_standards,model_maintenance_standards,sf_base.group_plan_dispatch,1,0,0,0
 
-access_maintenance_equipment_tool_group_plan_dispatch,maintenance.equipment.tool,sf_manufacturing.model_maintenance_equipment_tool,sf_base.group_plan_dispatch,1,0,0,0
 access_sf_robot_axis_num_group_plan_dispatch,sf.robot.axis.num,model_sf_robot_axis_num,sf_base.group_plan_dispatch,1,0,0,0
\ No newline at end of file
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 333da9aa..23c659f5 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -202,7 +202,6 @@ class ResProductMo(models.Model):
                 self.feed_per_tooth_ids = self.cutting_tool_model_id.feed_per_tooth_ids.filtered(
                     lambda r: int(r.blade_diameter) == int(self.specification_id.blade_diameter))
             elif self.cutting_tool_type == '夹头':
-                self.cutting_tool_clamping_length = self.specification_id.clamping_length
                 self.cutting_tool_clamping_tolerance = self.specification_id.clamping_tolerance
                 self.cutting_tool_clamping_diameter_min = self.specification_id.min_clamping_diameter
                 self.cutting_tool_clamping_diameter_min = self.specification_id.max_clamping_diameter
@@ -228,14 +227,12 @@ class ResProductMo(models.Model):
                 self.cutting_tool_inscribed_circle_tolerance = self.specification_id.inscribed_circle_tolerance
                 self.cutting_tool_install_aperture_diameter = self.specification_id.install_aperture_diameter
                 self.cutting_tool_chip_breaker_groove = self.specification_id.chip_breaker_groove
-                # self.cutting_tool_cut_depth_max = self.specification_id.blade_blade_number
+                self.cutting_tool_chip_breaker_type_code = self.specification_id.chip_breaker_type_code
                 self.cutting_tool_blade_blade_number = self.specification_id.blade_blade_number
                 self.cutting_tool_blade_width = self.specification_id.blade_width
                 self.cutting_tool_rear_angle = self.specification_id.relief_angle
                 self.cutting_tool_main_included_angle = self.specification_id.main_included_angle
                 self.cutting_tool_top_angle = self.specification_id.top_angle
-                self.cutting_tool_blade_tip_dip_angle = self.specification_id.blade_tip_dip_angle
-                self.cutting_tool_side_cutting_edge_angle = self.specification_id.side_cutting_edge_angle
                 self.cutting_tool_pitch = self.specification_id.pitch
                 self.cutting_tool_bladed_teeth_model = self.specification_id.blade_teeth_model
                 self.cutting_tool_thickness_tolerance = self.specification_id.thickness_tolerance
@@ -257,13 +254,20 @@ class ResProductMo(models.Model):
                 self.cutting_tool_inscribed_circle_tolerance = self.specification_id.inscribed_circle_tolerance
                 self.cutting_tool_install_aperture_diameter = self.specification_id.install_aperture_diameter
                 self.cutting_tool_chip_breaker_groove = self.specification_id.chip_breaker_groove
-                # self.cutting_tool_cut_depth_max = self.specification_id.blade_blade_number
+                self.cutting_tool_chip_breaker_type_code = self.specification_id.chip_breaker_type_code
                 self.cutting_tool_blade_blade_number = self.specification_id.blade_blade_number
                 self.cutting_tool_blade_width = self.specification_id.blade_width
                 self.cutting_tool_rear_angle = self.specification_id.relief_angle
                 self.cutting_tool_main_included_angle = self.specification_id.main_included_angle
                 self.cutting_tool_top_angle = self.specification_id.top_angle
-                self.cutting_tool_blade_tip_dip_angle = self.specification_id.blade_tip_dip_angle
+                self.cutting_tool_screw = self.specification_id.screw
+                self.cutting_tool_wrench = self.specification_id.wrench
+                self.cutting_tool_blade_id = self.specification_id.blade_id
+                self.cutting_tool_is_cooling_hole = self.specification_id.is_cooling_hole
+                self.cutting_tool_locating_slot_code = self.specification_id.locating_slot_code
+                self.cutting_tool_install_blade_tip_num = self.specification_id.install_blade_tip_num
+                self.cutting_tool_installing_structure = self.specification_id.installing_structure
+                self.cutting_tool_cut_depth_max = self.specification_id.cut_depth_max
                 if self.cutting_tool_type == '刀盘':
                     self.cutting_tool_blade_length = self.specification_id.blade_length
                     self.cutting_tool_cutter_head_diameter = self.specification_id.cutter_head_diameter
@@ -272,17 +276,27 @@ class ResProductMo(models.Model):
                     self.cutting_tool_knife_head_height = self.specification_id.knife_head_height
                     self.cutting_tool_knife_head_width = self.specification_id.knife_head_width
                     self.cutting_tool_knife_head_length = self.specification_id.knife_head_length
+                    self.cutting_tool_tool_shim = self.specification_id.tool_shim
+                    self.cutting_tool_cotter_pin = self.specification_id.cotter_pin
+                    self.cutting_tool_pressing_plate = self.specification_id.pressing_plate
             elif self.cutting_tool_type == '刀柄':
                 self.cutting_tool_total_length = self.specification_id.total_length
-                self.cutting_tool_standard_speed = self.specification_id.standard_rotate_speed
                 self.cutting_tool_speed_max = self.specification_id.max_rotate_speed
                 self.cutting_tool_change_time = self.specification_id.tool_changing_time
                 self.cutting_tool_total_length = self.specification_id.total_length
                 self.cutting_tool_clamping_diameter_max = self.specification_id.max_clamping_diameter
                 self.cutting_tool_clamping_diameter_min = self.specification_id.min_clamping_diameter
                 self.cutting_tool_flange_length = self.specification_id.flange_shank_length
-                self.cutting_tool_shank_outer_diameter = self.specification_id.handle_external_diameter
-                self.cutting_tool_shank_inner_diameter = self.specification_id.handle_inside_diameter
+                self.cutting_tool_flange_diameter = self.specification_id.flange_diameter
+                self.cutting_tool_fit_chuck_size = self.specification_id.fit_chuck_size
+                self.cutting_tool_dynamic_balance_class = self.specification_id.dynamic_balance_class
+                self.cutting_tool_is_high_speed_cutting = self.specification_id.is_quick_cutting
+                self.cutting_tool_is_safety_lock = self.specification_id.is_safe_lock
+                self.cutting_tool_fit_nut_model = self.specification_id.nut
+                self.cutting_tool_wrench = self.specification_id.spanner
+                self.cutting_tool_chuck_id = self.specification_id.chuck_id.id
+                self.cutting_tool_jump_accuracy = self.specification_id.diameter_slip_accuracy
+                self.cutting_tool_taper_shank_model = self.specification_id.taper_shank_model
             self.suitable_machining_method_ids = [(6, 0, [])] if not \
                 self.cutting_tool_model_id.suitable_machining_method_ids \
                 else [(6, 0, self.cutting_tool_model_id.suitable_machining_method_ids.ids)]
@@ -350,12 +364,12 @@ class ResProductMo(models.Model):
                         raise ValidationError("请选择压紧方式")
                 if self.cutting_tool_type == '刀片':
                     if not self.suitable_coolant_ids:
-                        raise ValidationError("请选择适合冷却液")
+                        raise ValidationError("请选择适合冷却方式")
             elif self.cutting_tool_type == '整体式刀具':
                 if not self.handle_type_id:
                     raise ValidationError("请选择柄部类型")
                 if not self.suitable_coolant_ids:
-                    raise ValidationError("请选择适合冷却液")
+                    raise ValidationError("请选择适合冷却方式")
             if not self.suitable_machining_method_ids:
                 raise ValidationError("请选择适合加工方式")
             if not self.blade_tip_characteristics_id:
@@ -369,11 +383,8 @@ class ResProductMo(models.Model):
     cutting_tool_rear_angle = fields.Integer('后角(°)')
     cutting_tool_main_included_angle = fields.Integer('主偏角(°)')
     # 适用夹头型号可以多选
-    cutting_tool_chuck_ids = fields.Many2many(
+    cutting_tool_chuck_id = fields.Many2one(
         'sf.cutting_tool.standard.library',
-        relation='product_cutting_tool_library_handle_chuck_rel',
-        column1='model_id_1',
-        column2='model_id_2',
         domain="[('cutting_tool_type', '=', '夹头')]",
         string='适用夹头型号')
     # 刀片参数
@@ -384,6 +395,7 @@ class ResProductMo(models.Model):
     cutting_tool_install_aperture_diameter = fields.Float('安装孔直径(mm)')
     cutting_tool_chip_breaker_groove = fields.Selection([('无', '无'), ('单面', '单面'), ('双面', '双面')],
                                                         string='有无断屑槽')
+    cutting_tool_chip_breaker_type_code = fields.Char('断屑槽型代号')
     cutting_tool_bladed_teeth_model = fields.Selection(
         [('无', '无'), ('V牙型', 'V牙型'), ('米制全牙型', '米制全牙型'), ('美制全牙型', '美制全牙型'),
          ('惠氏全牙型', '惠氏全牙型'), ('BSPT全牙型', 'BSPT全牙型'), ('NPT全牙型', 'NPT全牙型'),
@@ -395,8 +407,6 @@ class ResProductMo(models.Model):
          ('7', '7'), ('8', '8'), ('9', '9'), ('10', '10')],
         string='刀片的刃数(个)')
 
-    cutting_tool_blade_tip_dip_angle = fields.Integer('刀尖倾角(°)')
-    cutting_tool_side_cutting_edge_angle = fields.Integer('侧切削角(°)')
     cutting_tool_thread_model = fields.Selection([('无', '无'), ('外螺纹', '外螺纹'), ('内螺纹', '内螺纹')],
                                                  string='螺纹类型')
     cutting_tool_thread_num = fields.Float('每英寸螺纹数(tpi)')
@@ -431,11 +441,8 @@ class ResProductMo(models.Model):
     cutting_tool_min_machining_aperture = fields.Integer('最小加工孔径(mm)')
     cutting_tool_install_blade_tip_num = fields.Integer('可装刀片数/齿数(个)', size=20)
     cutting_tool_installing_structure = fields.Char('安装结构', size=20)
-    cutting_tool_blade_ids = fields.Many2many(
+    cutting_tool_blade_id = fields.Many2one(
         'sf.cutting_tool.standard.library',
-        relation='product_cutting_tool_library_pad_blade_rel',
-        column1='model_id_1',
-        column2='model_id_2',
         domain="[('cutting_tool_type', '=', '刀片')]",
         string='适用刀片型号'  # 使用空列表作为默认值
     )
@@ -451,24 +458,23 @@ class ResProductMo(models.Model):
     cutting_tool_interface_diameter = fields.Float('接口直径(mm)')
 
     # 刀柄参数
-    cutting_tool_shank_outer_diameter = fields.Float('柄部外径(mm)')
-    cutting_tool_shank_inner_diameter = fields.Float('柄部内径(mm)')
-    cutting_tool_clamping_length = fields.Float('夹持长度(mm)')
-    cutting_tool_clamping_tolerance = fields.Float('夹持公差(mm)')
     cutting_tool_clamping_diameter_max = fields.Float('最大夹持直径')
     cutting_tool_clamping_diameter_min = fields.Float('最小夹持直径')
     cutting_tool_flange_length = fields.Float('法兰柄长(mm)')
     cutting_tool_flange_diameter = fields.Float('法兰直径(mm)')
-    cutting_tool_is_rough_finish = fields.Boolean('可粗加工', default=False)
-    cutting_tool_is_finish = fields.Boolean('可精加工', default=False)
-    cutting_tool_is_drill_hole = fields.Boolean('可钻孔', default=False)
     cutting_tool_is_safety_lock = fields.Boolean('有无安全锁', default=False)
     cutting_tool_is_high_speed_cutting = fields.Boolean('可高速切削', default=False)
     cutting_tool_change_time = fields.Integer('换刀时间(s)')
     cutting_tool_clamping_way = fields.Char('夹持方式')
+    cutting_tool_fit_chuck_size = fields.Char('适配夹头尺寸')
+    cutting_tool_taper_shank_model = fields.Char('锥柄型号')
     cutting_tool_standard_speed = fields.Integer('标准转速(n/min)')
     cutting_tool_speed_max = fields.Integer('最大转速(n/min)')
     cutting_tool_cooling_type = fields.Char('冷却类型')
+    cutting_tool_dynamic_balance_class = fields.Char('动平衡等级')
+    cutting_tool_fit_nut_model = fields.Char('适用锁紧螺母型号')
+
+
     # 夹头参数
     cutting_tool_taper = fields.Integer('锥度(°)')
     cutting_tool_top_diameter = fields.Float('顶部直径')
@@ -476,7 +482,7 @@ class ResProductMo(models.Model):
     cutting_tool_inner_diameter = fields.Float('内径(mm)')
     cooling_suit_type_ids = fields.Char('适用冷却套型号')
     cutting_tool_max_load_capacity = fields.Float('最大负载能力(kg)')
-    cutting_tool_er_size_model = fields.Char('ER尺寸型号')
+    cutting_tool_er_size_model = fields.Char('尺寸型号')
     cutting_tool_handle_ids = fields.Many2many(
         'sf.cutting_tool.standard.library',
         relation='product_cutting_tool_library_chuck_handle_rel',
@@ -547,12 +553,6 @@ class ResProductMo(models.Model):
             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:
@@ -565,12 +565,6 @@ class ResProductMo(models.Model):
             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:
@@ -603,7 +597,6 @@ class ResProductMo(models.Model):
         for item in self:
             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
                 item.tool_length = item.fixture_model_id.length
                 item.tool_width = item.fixture_model_id.width
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 27edc40f..06269fc5 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -386,8 +386,6 @@ class ReStockMove(models.Model):
                 '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,
diff --git a/sf_manufacturing/security/ir.model.access.csv b/sf_manufacturing/security/ir.model.access.csv
index d71f7f4b..246e1d0f 100644
--- a/sf_manufacturing/security/ir.model.access.csv
+++ b/sf_manufacturing/security/ir.model.access.csv
@@ -107,4 +107,5 @@ access_sf_cnc_processing,sf.cnc.processing,model_sf_cnc_processing,sf_base.group
 
 
 
-access_mrp_workcenter_productivity,mrp.workcenter.productivity,mrp.model_mrp_workcenter_productivity,sf_base.group_plan_dispatch,1,0,0,0
\ No newline at end of file
+access_mrp_workcenter_productivity,mrp.workcenter.productivity,mrp.model_mrp_workcenter_productivity,sf_base.group_plan_dispatch,1,0,0,0
+access_maintenance_equipment_tool_group_plan_dispatch,maintenance.equipment.tool,sf_manufacturing.model_maintenance_equipment_tool,sf_base.group_plan_dispatch,1,0,0,0
diff --git a/sf_mrs_connect/models/res_config_setting.py b/sf_mrs_connect/models/res_config_setting.py
index 91bd52c6..d74db38b 100644
--- a/sf_mrs_connect/models/res_config_setting.py
+++ b/sf_mrs_connect/models/res_config_setting.py
@@ -65,6 +65,15 @@ class ResConfigSettings(models.TransientModel):
             _logger.info("同步能力特征库完成")
             self.env['sf.cutting_tool.standard.library'].sync_all_cutting_tool_standard_library()
             _logger.info("同步刀具标准库完成")
+            self.env['sf.tool.materials.basic.parameters'].sync_all_cutting_tool_basic_parameters()
+            _logger.info("同步刀具物料基本参数完成")
+            self.env['sf.cutting.width.depth'].sync_all_cutting_width_depth()
+            _logger.info("同步刀具物料切削宽度和深度完成")
+            self.env['sf.cutting.speed'].sync_all_cutting_speed()
+            _logger.info("同步刀具物料切削速度完成")
+            self.env['sf.feed.per.tooth'].sync_all_feed_per_tooth()
+            _logger.info("同步刀具物料每齿走刀量完成")
+
         except Exception as e:
             _logger.info("捕获错误信息:%s" % e)
             raise ValidationError("数据错误导致同步失败,请联系管理员")
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index bb4b631f..b23b87b2 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -62,6 +62,14 @@ class MrStaticResourceDataSync(models.Model):
             logging.info("能力特征库已每日同步成功")
             self.env['sf.cutting_tool.standard.library'].sync_cutting_tool_standard_library_yesterday()
             logging.info("刀具标准库已每日同步成功")
+            self.env['sf.tool.materials.basic.parameters'].sync_cutting_tool_basic_parameters_yesterday()
+            _logger.info("同步刀具物料基本参数完成")
+            self.env['sf.cutting.width.depth'].sync_cutting_width_depth_yesterday()
+            _logger.info("同步刀具物料切削宽度和深度完成")
+            self.env['sf.cutting.speed'].sync_cutting_speed_yesterday()
+            _logger.info("同步刀具物料切削速度完成")
+            self.env['sf.feed.per.tooth'].sync_feed_per_tooth_yesterday()
+            _logger.info("同步刀具物料每齿走刀量完成")
         except Exception as e:
             logging.info("捕获错误信息:%s" % e)
             raise ValidationError("数据错误导致同步失败,请联系管理员")
@@ -1929,6 +1937,242 @@ class ModelInternationalStandards(models.Model):
             raise ValidationError("制造标准认证未通过")
 
 
+class CuttingSpeed(models.Model):
+    _inherit = 'sf.cutting.speed'
+    _description = '切削速度'
+    url = '/api/cutting_speed/list'
+
+    def sync_cutting_speed_yesterday(self):
+        config = self.env['res.config.settings'].get_values()
+        headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+        strUrl = config['sf_url'] + self.url
+        r = requests.post(strUrl, json={}, data=None, headers=headers)
+        r = r.json()
+        result = json.loads(r['result'])
+        if result['status'] == 1:
+            for item in result['cutting_speed_yesterday_list']:
+                cutting_speed = self.search([("name", '=', item['name'])])
+                if not cutting_speed:
+                    self.create({
+                        'name': item['name'],
+                        'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
+                            [('code', '=', item['standard_library_code'].replace("JKM", result[
+                                'factory_short_name']))]).id,
+                        'execution_standard_id': self.env['sf.international.standards'].search(
+                            [('code', '=', item['execution_standard_code'])]).id,
+                        'material_name_id': self.env['sf.materials.model'].search(
+                            [('materials_no', '=', item['material_name'])]).id,
+                        'cutting_width_depth_id': self.env['sf.cutting.width.depth'].search(
+                            [('name', '=', item['cutting_width_depth'])]).id,
+                        'ability_feature_library': self.env['maintenance.equipment.image'].search(
+                            [('name', '=', item['ability_feature_library']), ('type', '=', '加工能力')]).id,
+                        'material_code': item['material_code'],
+                        'material_grade': item['material_grade'],
+                        'tensile_strength': item['tensile_strength'],
+                        'hardness': item['hardness'],
+                        'cutting_speed': item['cutting_speed'],
+                        'application': item['application'],
+                        'active': item['active'],
+                    })
+                else:
+                    if item['active'] is False:
+                        item.write({'active': False})
+                    else:
+                        self.write({
+                            'execution_standard_id': self.env['sf.international.standards'].search(
+                                [('code', '=', item['execution_standard_code'])]).id,
+                            'material_name_id': self.env['sf.materials.model'].search(
+                                [('materials_no', '=', item['material_name'])]).id,
+                            'cutting_width_depth_id': self.env['sf.cutting.width.depth'].search(
+                                [('name', '=', item['cutting_width_depth'])]).id,
+                            'ability_feature_library': self.env['maintenance.equipment.image'].search(
+                                [('name', '=', item['ability_feature_library']), ('type', '=', '加工能力')]).id,
+                            'material_code': item['material_code'],
+                            'material_grade': item['material_grade'],
+                            'tensile_strength': item['tensile_strength'],
+                            'hardness': item['hardness'],
+                            'cutting_speed': item['cutting_speed'],
+                            'application': item['application'], })
+        else:
+            raise ValidationError("切削速度认证未通过")
+
+    def sync_all_cutting_speed(self):
+        config = self.env['res.config.settings'].get_values()
+        headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+        strUrl = config['sf_url'] + self.url
+        r = requests.post(strUrl, json={}, data=None, headers=headers)
+        r = r.json()
+        result = json.loads(r['result'])
+        if result['status'] == 1:
+            for item in result['cutting_speed_all_list']:
+                cutting_speed = self.search([("name", '=', item['name'])])
+                if not cutting_speed:
+                    self.create({
+                        'name': item['name'],
+                        'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
+                            [('code', '=', item['standard_library_code'].replace("JKM", result[
+                                'factory_short_name']))]).id,
+                        'execution_standard_id': self.env['sf.international.standards'].search(
+                            [('code', '=', item['execution_standard_code'])]).id,
+                        'material_name_id': self.env['sf.materials.model'].search(
+                            [('materials_no', '=', item['material_name'])]).id,
+                        'cutting_width_depth_id': self.env['sf.cutting.width.depth'].search(
+                            [('name', '=', item['cutting_width_depth'])]).id,
+                        'ability_feature_library': self.env['maintenance.equipment.image'].search(
+                            [('name', '=', item['ability_feature_library']), ('type', '=', '加工能力')]).id,
+                        'material_code': item['material_code'],
+                        'material_grade': item['material_grade'],
+                        'tensile_strength': item['tensile_strength'],
+                        'hardness': item['hardness'],
+                        'cutting_speed': item['cutting_speed'],
+                        'application': item['application'],
+                        'active': item['active'],
+                    })
+                else:
+                    if item['active'] is False:
+                        item.write({'active': False})
+                    else:
+                        self.write({
+                            'execution_standard_id': self.env['sf.international.standards'].search(
+                                [('code', '=', item['execution_standard_code'])]).id,
+                            'material_name_id': self.env['sf.materials.model'].search(
+                                [('materials_no', '=', item['material_name'])]).id,
+                            'cutting_width_depth_id': self.env['sf.cutting.width.depth'].search(
+                                [('name', '=', item['cutting_width_depth'])]).id,
+                            'ability_feature_library': self.env['maintenance.equipment.image'].search(
+                                [('name', '=', item['ability_feature_library']), ('type', '=', '加工能力')]).id,
+                            'material_code': item['material_code'],
+                            'material_grade': item['material_grade'],
+                            'tensile_strength': item['tensile_strength'],
+                            'hardness': item['hardness'],
+                            'cutting_speed': item['cutting_speed'],
+                            'application': item['application'], })
+        else:
+            raise ValidationError("切削速度认证未通过")
+
+
+class CuttingWidthDepth(models.Model):
+    _inherit = 'sf.cutting.width.depth'
+    _description = '切削宽度和深度'
+    url = '/api/cutting_width_depth/list'
+
+    def sync_cutting_width_depth_yesterday(self):
+        config = self.env['res.config.settings'].get_values()
+        headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+        strUrl = config['sf_url'] + self.url
+        r = requests.post(strUrl, json={}, data=None, headers=headers)
+        r = r.json()
+        result = json.loads(r['result'])
+        if result['status'] == 1:
+            for item in result['cutting_width_depth_yesterday_list']:
+                cutting_width_depth = self.search([("name", '=', item['name'])])
+                if not cutting_width_depth:
+                    self.create({
+                        'name': item['name'],
+                    })
+        else:
+            raise ValidationError("切削宽度和深度认证未通过")
+
+    def sync_all_cutting_width_depth(self):
+        config = self.env['res.config.settings'].get_values()
+        headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+        strUrl = config['sf_url'] + self.url
+        r = requests.post(strUrl, json={}, data=None, headers=headers)
+        r = r.json()
+        result = json.loads(r['result'])
+        if result['status'] == 1:
+            for item in result['cutting_width_depth_all_list']:
+                cutting_width_depth = self.search([("name", '=', item['name'])])
+                if not cutting_width_depth:
+                    self.create({
+                        'name': item['name'],
+                    })
+        else:
+            raise ValidationError("切削宽度和深度认证未通过")
+
+
+class CuttingSpeed(models.Model):
+    _inherit = 'sf.feed.per.tooth'
+    _description = '每齿走刀量'
+    url = '/api/feed_per_tooth/list'
+
+    def sync_feed_per_tooth_yesterday(self):
+        config = self.env['res.config.settings'].get_values()
+        headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+        strUrl = config['sf_url'] + self.url
+        r = requests.post(strUrl, json={}, data=None, headers=headers)
+        r = r.json()
+        result = json.loads(r['result'])
+        if result['status'] == 1:
+            for item in result['feed_per_tooth_yesterday_list']:
+                feed_per_tooth = self.search([("name", '=', item['name'])])
+                if not feed_per_tooth:
+                    self.create({
+                        'name': item['name'],
+                        'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
+                            [('code', '=', item['standard_library_code'].replace("JKM", result[
+                                'factory_short_name']))]).id,
+                        'materials_type_id': self.env['sf.materials.model'].search(
+                            [('materials_no', '=', item['materials_type_code'])]).id,
+                        'cutting_width_depth_id': self.env['sf.cutting.width.depth'].search(
+                            [('name', '=', item['cutting_width_depth'])]).id,
+                        'blade_diameter': item['blade_diameter'],
+                        'feed_per_tooth': item['feed_per_tooth'],
+                        'active': item['active'],
+                    })
+                else:
+                    if item['active'] is False:
+                        item.write({'active': False})
+                    else:
+                        self.write({
+                            'materials_type_id': self.env['sf.materials.model'].search(
+                                [('materials_no', '=', item['materials_type_code'])]).id,
+                            'cutting_width_depth_id': self.env['sf.cutting.width.depth'].search(
+                                [('name', '=', item['cutting_width_depth'])]).id,
+                            'blade_diameter': item['blade_diameter'],
+                            'feed_per_tooth': item['feed_per_tooth'], })
+        else:
+            raise ValidationError("每齿走刀量认证未通过")
+
+    def sync_all_feed_per_tooth(self):
+        config = self.env['res.config.settings'].get_values()
+        headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+        strUrl = config['sf_url'] + self.url
+        r = requests.post(strUrl, json={}, data=None, headers=headers)
+        r = r.json()
+        result = json.loads(r['result'])
+        if result['status'] == 1:
+            for item in result['feed_per_tooth_all_list']:
+                feed_per_tooth = self.search([("name", '=', item['name'])])
+                if not feed_per_tooth:
+                    self.create({
+                        'name': item['name'],
+                        'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
+                            [('code', '=', item['standard_library_code'].replace("JKM", result[
+                                'factory_short_name']))]).id,
+                        'materials_type_id': self.env['sf.materials.model'].search(
+                            [('materials_no', '=', item['materials_type_code'])]).id,
+                        'cutting_width_depth_id': self.env['sf.cutting.width.depth'].search(
+                            [('name', '=', item['cutting_width_depth'])]).id,
+                        'blade_diameter': item['blade_diameter'],
+                        'feed_per_tooth': item['feed_per_tooth'],
+                        'active': item['active'],
+                    })
+                else:
+                    if item['active'] is False:
+                        item.write({'active': False})
+                    else:
+                        self.write({
+                            'materials_type_id': self.env['sf.materials.model'].search(
+                                [('materials_no', '=', item['materials_type_code'])]).id,
+                            'cutting_width_depth_id': self.env['sf.cutting.width.depth'].search(
+                                [('name', '=', item['cutting_width_depth'])]).id,
+                            'blade_diameter': item['blade_diameter'],
+                            'feed_per_tooth': item['feed_per_tooth'], })
+        else:
+            raise ValidationError("每齿走刀量认证未通过")
+
+
 class Cutting_tool_standard_library(models.Model):
     _inherit = 'sf.cutting_tool.standard.library'
     _description = '刀具标准库'
@@ -1953,54 +2197,6 @@ class Cutting_tool_standard_library(models.Model):
                 materials_model = self.env['sf.materials.model'].search(
                     [("materials_no", '=', item['material_model_code'])])
                 brand = self.env['sf.machine.brand'].search([("code", '=', item['brand_code'])])
-                integral_tool_basic_param_list = []
-                for integral_tool_item in item['integral_tool_basic_parameter']:
-                    integral_tool_basic_param_list.append(
-                        self.env['sf.tool.materials.basic.parameters']._json_integral_tool_basic_param(
-                            integral_tool_item))
-                blade_basic_param_list = []
-                for blade_item in item['blade_basic_parameter']:
-                    blade_basic_param_list.append(
-                        self.env['sf.tool.materials.basic.parameters']._json_blade_basic_param(blade_item))
-                cutter_arbor_basic_param_list = []
-                for cutter_arbor_item in item['cutter_arbor_basic_parameter']:
-                    cutter_arbor_basic_param_list.append(
-                        self.env['sf.tool.materials.basic.parameters']._json_cutter_arbor_basic_param(
-                            cutter_arbor_item))
-                cutter_head_basic_param_list = []
-                for cutter_head_item in item['cutter_head_basic_parameter']:
-                    cutter_head_basic_param_list.append(
-                        self.env['sf.tool.materials.basic.parameters']._json_cutter_head_basic_param(cutter_head_item))
-                knife_handle_basic_param_list = []
-                for knife_handle_item in item['knife_handle_basic_parameter']:
-                    knife_handle_basic_param_list.append(
-                        self.env['sf.tool.materials.basic.parameters']._json_knife_handle_basic_param(
-                            knife_handle_item))
-                chuck_basic_param_list = []
-                for chuck_item in item['chuck_basic_parameter']:
-                    chuck_basic_param_list.append(
-                        self.env['sf.tool.materials.basic.parameters']._json_chuck_basic_param(chuck_item))
-                cutting_speed_list = []
-                for cutting_speed_item in item['cutting_speed']:
-                    cutting_speed_list.append(
-                        self.env['sf.cutting.speed']._json_cutting_speed(cutting_speed_item))
-                feed_per_tooth_list = []
-                for feed_per_tooth_item in item['feed_per_tooth']:
-                    feed_per_tooth_list.append(
-                        self.env['sf.feed.per.tooth']._json_feed_per_tooth(feed_per_tooth_item))
-                feed_per_tooth_2_list = []
-                for feed_per_tooth_2_item in item['feed_per_tooth_2']:
-                    feed_per_tooth_2_list.append(
-                        self.env['sf.feed.per.tooth']._json_feed_per_tooth(feed_per_tooth_2_item))
-                feed_per_tooth_3_list = []
-                for feed_per_tooth_3_item in item['feed_per_tooth_3']:
-                    feed_per_tooth_3_list.append(
-                        self.env['sf.feed.per.tooth']._json_feed_per_tooth(feed_per_tooth_3_item))
-                feed_per_tooth_4_list = []
-                for feed_per_tooth_4_item in item['feed_per_tooth_4']:
-                    feed_per_tooth_4_list.append(
-                        self.env['sf.feed.per.tooth']._json_feed_per_tooth(feed_per_tooth_4_item))
-
                 if not cutting_tool_standard_library:
                     self.create({
                         "code": item['code'].replace("JKM", result['factory_short_name']),
@@ -2024,6 +2220,10 @@ class Cutting_tool_standard_library(models.Model):
                         "fit_blade_shape_id": False if not item['fit_blade_shape'] else self.env[
                             'maintenance.equipment.image'].search(
                             [('name', '=', item['fit_blade_shape'])]).id,
+                        "chuck_id": False if not item['chuck_code'] else self.search(
+                            [('code', '=', item['chuck_code'].replace("JKM", result['factory_short_name']))]).id,
+                        "handle_id": False if not item['handle_code'] else self.search(
+                            [('code', '=', item['handle_code'].replace("JKM", result['factory_short_name']))]).id,
                         "suitable_machining_method_ids": [(6, 0, [])] if not item.get(
                             'suitable_machining_methods') else self.env['maintenance.equipment.image']._get_ids(
                             item['suitable_machining_methods']),
@@ -2037,17 +2237,6 @@ class Cutting_tool_standard_library(models.Model):
                             'maintenance.equipment.image']._get_ids(item['suitable_coolant']),
                         "compaction_way_id": self.env['maintenance.equipment.image'].search(
                             [('name', '=', item['compaction_way'])]).id,
-                        "integral_tool_basic_parameters_ids": integral_tool_basic_param_list,
-                        "blade_basic_parameters_ids": blade_basic_param_list,
-                        "cutter_bar_basic_parameters_ids": cutter_arbor_basic_param_list,
-                        "cutter_head_basic_parameters_ids": cutter_head_basic_param_list,
-                        "knife_handle_basic_parameters_ids": knife_handle_basic_param_list,
-                        "chuck_basic_parameters_ids": chuck_basic_param_list,
-                        "cutting_speed_ids": cutting_speed_list,
-                        "feed_per_tooth_ids": feed_per_tooth_list,
-                        "feed_per_tooth_ids_2": feed_per_tooth_2_list,
-                        "feed_per_tooth_ids_3": feed_per_tooth_3_list,
-                        "feed_per_tooth_ids_4": feed_per_tooth_4_list,
                         "is_cloud": True,
                         "active": item['active'],
                     })
@@ -2073,6 +2262,10 @@ class Cutting_tool_standard_library(models.Model):
                          "fit_blade_shape_id": False if not item['fit_blade_shape'] else self.env[
                              'maintenance.equipment.image'].search(
                              [('name', '=', item['fit_blade_shape'])]).id,
+                         "chuck_id": False if not item['chuck_code'] else self.search(
+                             [('code', '=', item['chuck_code'].replace("JKM", result['factory_short_name']))]).id,
+                         "handle_id": False if not item['handle_code'] else self.search(
+                             [('code', '=', item['handle_code'].replace("JKM", result['factory_short_name']))]).id,
                          "suitable_machining_method_ids": [(6, 0, [])] if not item.get(
                              'suitable_machining_methods') else self.env['maintenance.equipment.image']._get_ids(
                              item['suitable_machining_methods']),
@@ -2086,17 +2279,6 @@ class Cutting_tool_standard_library(models.Model):
                              'maintenance.equipment.image']._get_ids(item['suitable_coolant']),
                          "compaction_way_id": self.env['maintenance.equipment.image'].search(
                              [('name', '=', item['compaction_way'])]).id,
-                         "integral_tool_basic_parameters_ids": integral_tool_basic_param_list,
-                         "blade_basic_parameters_ids": blade_basic_param_list,
-                         "cutter_bar_basic_parameters_ids": cutter_arbor_basic_param_list,
-                         "cutter_head_basic_parameters_ids": cutter_head_basic_param_list,
-                         "knife_handle_basic_parameters_ids": knife_handle_basic_param_list,
-                         "chuck_basic_parameters_ids": chuck_basic_param_list,
-                         "cutting_speed_ids": cutting_speed_list,
-                         "feed_per_tooth_ids": feed_per_tooth_list,
-                         "feed_per_tooth_ids_2": feed_per_tooth_2_list,
-                         "feed_per_tooth_ids_3": feed_per_tooth_3_list,
-                         "feed_per_tooth_ids_4": feed_per_tooth_4_list,
                          "active": item['active'],
                          })
         else:
@@ -2121,53 +2303,6 @@ class Cutting_tool_standard_library(models.Model):
                 materials_model = self.env['sf.materials.model'].search(
                     [("materials_no", '=', item['material_model_code'])])
                 brand = self.env['sf.machine.brand'].search([("code", '=', item['brand_code'])])
-                integral_tool_basic_param_list = []
-                for integral_tool_item in item['integral_tool_basic_parameter']:
-                    integral_tool_basic_param_list.append(
-                        self.env['sf.tool.materials.basic.parameters']._json_integral_tool_basic_param(
-                            integral_tool_item))
-                blade_basic_param_list = []
-                for blade_item in item['blade_basic_parameter']:
-                    blade_basic_param_list.append(
-                        self.env['sf.tool.materials.basic.parameters']._json_blade_basic_param(blade_item))
-                cutter_arbor_basic_param_list = []
-                for cutter_arbor_item in item['cutter_arbor_basic_parameter']:
-                    cutter_arbor_basic_param_list.append(
-                        self.env['sf.tool.materials.basic.parameters']._json_cutter_arbor_basic_param(
-                            cutter_arbor_item))
-                cutter_head_basic_param_list = []
-                for cutter_head_item in item['cutter_head_basic_parameter']:
-                    cutter_head_basic_param_list.append(
-                        self.env['sf.tool.materials.basic.parameters']._json_cutter_head_basic_param(cutter_head_item))
-                knife_handle_basic_param_list = []
-                for knife_handle_item in item['knife_handle_basic_parameter']:
-                    knife_handle_basic_param_list.append(
-                        self.env['sf.tool.materials.basic.parameters']._json_knife_handle_basic_param(
-                            knife_handle_item))
-                chuck_basic_param_list = []
-                for chuck_item in item['chuck_basic_parameter']:
-                    chuck_basic_param_list.append(
-                        self.env['sf.tool.materials.basic.parameters']._json_chuck_basic_param(chuck_item))
-                cutting_speed_list = []
-                for cutting_speed_item in item['cutting_speed']:
-                    cutting_speed_list.append(
-                        self.env['sf.cutting.speed']._json_cutting_speed(cutting_speed_item))
-                feed_per_tooth_list = []
-                for feed_per_tooth_item in item['feed_per_tooth']:
-                    feed_per_tooth_list.append(
-                        self.env['sf.feed.per.tooth']._json_feed_per_tooth(feed_per_tooth_item))
-                feed_per_tooth_2_list = []
-                for feed_per_tooth_2_item in item['feed_per_tooth_2']:
-                    feed_per_tooth_2_list.append(
-                        self.env['sf.feed.per.tooth']._json_feed_per_tooth_2(feed_per_tooth_2_item))
-                feed_per_tooth_3_list = []
-                for feed_per_tooth_3_item in item['feed_per_tooth_3']:
-                    feed_per_tooth_3_list.append(
-                        self.env['sf.feed.per.tooth']._json_feed_per_tooth_3(feed_per_tooth_3_item))
-                feed_per_tooth_4_list = []
-                for feed_per_tooth_4_item in item['feed_per_tooth_4']:
-                    feed_per_tooth_4_list.append(
-                        self.env['sf.feed.per.tooth']._json_feed_per_tooth_4(feed_per_tooth_4_item))
                 if not cutting_tool_standard_library:
                     self.create({
                         "code": item['code'].replace("JKM", result['factory_short_name']),
@@ -2191,6 +2326,10 @@ class Cutting_tool_standard_library(models.Model):
                         "fit_blade_shape_id": False if not item['fit_blade_shape'] else self.env[
                             'maintenance.equipment.image'].search(
                             [('name', '=', item['fit_blade_shape'])]).id,
+                        "chuck_id": False if not item['chuck_code'] else self.search(
+                            [('code', '=', item['chuck_code'].replace("JKM", result['factory_short_name']))]).id,
+                        "handle_id": False if not item['handle_code'] else self.search(
+                            [('code', '=', item['handle_code'].replace("JKM", result['factory_short_name']))]).id,
                         "suitable_machining_method_ids": [(6, 0, [])] if not item.get(
                             'suitable_machining_method') else self.env['maintenance.equipment.image']._get_ids(
                             item['suitable_machining_method']),
@@ -2204,17 +2343,6 @@ class Cutting_tool_standard_library(models.Model):
                             'maintenance.equipment.image']._get_ids(item['suitable_coolant']),
                         "compaction_way_id": self.env['maintenance.equipment.image'].search(
                             [('name', '=', item['compaction_way'])]).id,
-                        "integral_tool_basic_parameters_ids": integral_tool_basic_param_list,
-                        "blade_basic_parameters_ids": blade_basic_param_list,
-                        "cutter_bar_basic_parameters_ids": cutter_arbor_basic_param_list,
-                        "cutter_head_basic_parameters_ids": cutter_head_basic_param_list,
-                        "knife_handle_basic_parameters_ids": knife_handle_basic_param_list,
-                        "chuck_basic_parameters_ids": chuck_basic_param_list,
-                        "cutting_speed_ids": cutting_speed_list,
-                        "feed_per_tooth_ids": feed_per_tooth_list,
-                        "feed_per_tooth_ids_2": feed_per_tooth_2_list,
-                        "feed_per_tooth_ids_3": feed_per_tooth_3_list,
-                        "feed_per_tooth_ids_4": feed_per_tooth_4_list,
                         "is_cloud": True,
                         "active": item['active'],
                     })
@@ -2240,6 +2368,10 @@ class Cutting_tool_standard_library(models.Model):
                          "fit_blade_shape_id": False if not item['fit_blade_shape'] else self.env[
                              'maintenance.equipment.image'].search(
                              [('name', '=', item['fit_blade_shape'])]).id,
+                         "chuck_id": False if not item['chuck_code'] else self.search(
+                             [('code', '=', item['chuck_code'].replace("JKM", result['factory_short_name']))]).id,
+                         "handle_id": False if not item['handle_code'] else self.search(
+                             [('code', '=', item['handle_code'].replace("JKM", result['factory_short_name']))]).id,
                          "suitable_machining_method_ids": [(6, 0, [])] if not item.get(
                              'suitable_machining_methods') else self.env['maintenance.equipment.image']._get_ids(
                              item['suitable_machining_methods']),
@@ -2253,18 +2385,725 @@ class Cutting_tool_standard_library(models.Model):
                              'maintenance.equipment.image']._get_ids(item['suitable_coolant']),
                          "compaction_way_id": self.env['maintenance.equipment.image'].search(
                              [('name', '=', item['compaction_way'])]).id,
-                         "integral_tool_basic_parameters_ids": integral_tool_basic_param_list,
-                         "blade_basic_parameters_ids": blade_basic_param_list,
-                         "cutter_bar_basic_parameters_ids": cutter_arbor_basic_param_list,
-                         "cutter_head_basic_parameters_ids": cutter_head_basic_param_list,
-                         "knife_handle_basic_parameters_ids": knife_handle_basic_param_list,
-                         "chuck_basic_parameters_ids": chuck_basic_param_list,
-                         "cutting_speed_ids": cutting_speed_list,
-                         "feed_per_tooth_ids": feed_per_tooth_list,
-                         "feed_per_tooth_ids_2": feed_per_tooth_2_list,
-                         "feed_per_tooth_ids_3": feed_per_tooth_3_list,
-                         "feed_per_tooth_ids_4": feed_per_tooth_4_list,
                          "active": item['active'],
                          })
         else:
             raise ValidationError("刀具标准库认证未通过")
+
+
+class CuttingToolBasicParameters(models.Model):
+    _inherit = 'sf.tool.materials.basic.parameters'
+    _description = '刀具基本参数'
+    url = '/api/cutting_tool_basic_parameters/list'
+
+    # 同步刀具基本参数
+    def sync_all_cutting_tool_basic_parameters(self):
+        config = self.env['res.config.settings'].get_values()
+        headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+        strUrl = config['sf_url'] + self.url
+        r = requests.post(strUrl, json={}, data=None, headers=headers)
+        r = r.json()
+        result = json.loads(r['result'])
+        if result['status'] == 1:
+            basic_parameters_integral_tool_list = json.loads(
+                result['cutting_tool_basic_parameters_all_list']['basic_parameters_integral_tool'])
+            if basic_parameters_integral_tool_list:
+                for integral_tool_item in basic_parameters_integral_tool_list:
+                    integral_tool = self.search([('code', '=', integral_tool_item['code'])])
+                    if not integral_tool:
+                        self.create({
+                            'name': integral_tool_item['name'],
+                            'code': integral_tool_item['code'],
+                            'cutting_tool_type': '整体式刀具',
+                            'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
+                                [('code', '=', integral_tool_item['standard_library_code'].replace("JKM", result[
+                                    'factory_short_name']))]).id,
+                            'total_length': integral_tool_item['total_length'],
+                            'blade_diameter': integral_tool_item['blade_diameter'],
+                            'blade_length': integral_tool_item['blade_length'],
+                            'blade_number': integral_tool_item['blade_number'],
+                            'neck_length': integral_tool_item['neck_length'],
+                            'neck_diameter': integral_tool_item['neck_diameter'],
+                            'handle_diameter': integral_tool_item['shank_diameter'],
+                            'handle_length': integral_tool_item['shank_length'],
+                            'blade_tip_diameter': integral_tool_item['tip_diameter'],
+                            'blade_tip_working_size': integral_tool_item['tip_handling_size'],
+                            'blade_tip_taper': integral_tool_item['knife_tip_taper'],
+                            'blade_helix_angle': integral_tool_item['blade_helix_angle'],
+                            'blade_width': integral_tool_item['blade_width'],
+                            'blade_depth': integral_tool_item['blade_depth'],
+                            'pitch': integral_tool_item['pitch'],
+                            'cutting_depth': integral_tool_item['cutting_depth_max'],
+                            'active': integral_tool_item['active'],
+                        })
+                    else:
+                        self.write({
+                            'name': integral_tool_item['name'],
+                            'total_length': integral_tool_item['total_length'],
+                            'blade_diameter': integral_tool_item['blade_diameter'],
+                            'blade_length': integral_tool_item['blade_length'],
+                            'blade_number': integral_tool_item['blade_number'],
+                            'neck_length': integral_tool_item['neck_length'],
+                            'neck_diameter': integral_tool_item['neck_diameter'],
+                            'handle_diameter': integral_tool_item['shank_diameter'],
+                            'handle_length': integral_tool_item['shank_length'],
+                            'blade_tip_diameter': integral_tool_item['tip_diameter'],
+                            'blade_tip_working_size': integral_tool_item['tip_handling_size'],
+                            'blade_tip_taper': integral_tool_item['knife_tip_taper'],
+                            'blade_helix_angle': integral_tool_item['blade_helix_angle'],
+                            'blade_width': integral_tool_item['blade_width'],
+                            'blade_depth': integral_tool_item['blade_depth'],
+                            'pitch': integral_tool_item['pitch'],
+                            'cutting_depth': integral_tool_item['cutting_depth_max'],
+                            'active': integral_tool_item['active'],
+                        })
+            basic_parameters_blade_list = json.loads(
+                result['cutting_tool_basic_parameters_all_list']['basic_parameters_blade'])
+            if basic_parameters_blade_list:
+                for blade_item in basic_parameters_blade_list:
+                    blade = self.search([('code', '=', blade_item['code'])])
+                    if not blade:
+                        self.create({
+                            'name': blade_item['name'],
+                            'code': blade_item['code'],
+                            'cutting_tool_type': '刀片',
+                            'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
+                                [('code', '=', blade_item['standard_library_code'].replace("JKM", result[
+                                    'factory_short_name']))]).id,
+                            'length': blade_item['length'],
+                            'thickness': blade_item['thickness'],
+                            'cutting_blade_length': blade_item['cutting_blade_length'],
+                            'relief_angle': blade_item['relief_angle'],
+                            'blade_tip_circular_arc_radius': blade_item['radius_tip_re'],
+                            'inscribed_circle_diameter': blade_item['diameter_inner_circle'],
+                            'install_aperture_diameter': blade_item['diameter_mounting_hole'],
+                            'pitch': blade_item['pitch'],
+                            'chip_breaker_groove': blade_item['is_chip_breaker'],
+                            'chip_breaker_type_code': blade_item['chip_breaker_type_code'],
+                            'blade_teeth_model': '无' if not blade_item['blade_profile'] else blade_item[
+                                'blade_profile'],
+                            'blade_blade_number': blade_item['blade_number'],
+                            'cutting_depth': blade_item['cutting_depth_max'],
+                            'blade_width': blade_item['blade_width'],
+                            'main_included_angle': blade_item['edge_angle'],
+                            'top_angle': blade_item['top_angle'],
+                            'thread_model': '无' if not blade_item['thread_type'] else blade_item['thread_type'],
+                            'thread_num': blade_item['threads_per_inch'],
+                            'blade_tip_height_tolerance': blade_item['tip_height_tolerance'],
+                            'inscribed_circle_tolerance': blade_item['internal_circle_tolerance'],
+                            'thickness_tolerance': blade_item['thickness_tolerance'],
+                            'active': blade_item['active'],
+                        })
+                    else:
+                        self.write({
+                            'name': integral_tool_item['name'],
+                            'length': blade_item['length'],
+                            'thickness': blade_item['thickness'],
+                            'cutting_blade_length': blade_item['cutting_blade_length'],
+                            'relief_angle': blade_item['relief_angle'],
+                            'blade_tip_circular_arc_radius': blade_item['radius_tip_re'],
+                            'inscribed_circle_diameter': blade_item['diameter_inner_circle'],
+                            'install_aperture_diameter': blade_item['diameter_mounting_hole'],
+                            'pitch': blade_item['pitch'],
+                            'chip_breaker_groove': blade_item['is_chip_breaker'],
+                            'chip_breaker_type_code': blade_item['chip_breaker_type_code'],
+                            'blade_teeth_model': '无' if not blade_item['blade_profile'] else blade_item[
+                                'blade_profile'],
+                            'blade_blade_number': blade_item['blade_number'],
+                            'cutting_depth': blade_item['cutting_depth_max'],
+                            'blade_width': blade_item['blade_width'],
+                            'main_included_angle': blade_item['edge_angle'],
+                            'top_angle': blade_item['top_angle'],
+                            'thread_model': '无' if not blade_item['thread_type'] else blade_item['thread_type'],
+                            'thread_num': blade_item['threads_per_inch'],
+                            'blade_tip_height_tolerance': blade_item['tip_height_tolerance'],
+                            'inscribed_circle_tolerance': blade_item['internal_circle_tolerance'],
+                            'thickness_tolerance': blade_item['thickness_tolerance'],
+                            'active': blade_item['active'],
+                        })
+            basic_parameters_chuck_list = json.loads(
+                result['cutting_tool_basic_parameters_all_list']['basic_parameters_chuck'])
+            if basic_parameters_chuck_list:
+                for chuck_item in basic_parameters_chuck_list:
+                    chuck = self.search([('code', '=', chuck_item['code'])])
+                    if not chuck:
+                        self.create({
+                            'name': chuck_item['name'],
+                            'code': chuck_item['code'],
+                            'cutting_tool_type': '夹头',
+                            'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
+                                [('code', '=', chuck_item['standard_library_code'].replace("JKM", result[
+                                    'factory_short_name']))]).id,
+                            'er_size_model': chuck_item['size_model'],
+                            'min_clamping_diameter': chuck_item['clamping_diameter_min'],
+                            'max_clamping_diameter': chuck_item['clamping_diameter_max'],
+                            'outer_diameter': chuck_item['outer_diameter'],
+                            'inner_diameter': chuck_item['inner_diameter'],
+                            'run_out_accuracy': chuck_item['run_out_accuracy'],
+                            'total_length': chuck_item['total_length'],
+                            'taper': chuck_item['taper'],
+                            'top_diameter': chuck_item['top_diameter'],
+                            'weight': chuck_item['weight'],
+                            'max_load_capacity': chuck_item['load_capacity_max'],
+                            'cooling_jacket': chuck_item['cooling_sleeve_model'],
+                            'active': chuck_item['active'],
+                        })
+                    else:
+                        self.write({
+                            'name': integral_tool_item['name'],
+                            'er_size_model': chuck_item['size_model'],
+                            'min_clamping_diameter': chuck_item['clamping_diameter_min'],
+                            'max_clamping_diameter': chuck_item['clamping_diameter_max'],
+                            'outer_diameter': chuck_item['outer_diameter'],
+                            'inner_diameter': chuck_item['inner_diameter'],
+                            'run_out_accuracy': chuck_item['run_out_accuracy'],
+                            'total_length': chuck_item['total_length'],
+                            'taper': chuck_item['taper'],
+                            'top_diameter': chuck_item['top_diameter'],
+                            'weight': chuck_item['weight'],
+                            'max_load_capacity': chuck_item['load_capacity_max'],
+                            'cooling_jacket': chuck_item['cooling_sleeve_model'],
+                            'active': chuck_item['active'],
+                        })
+            basic_parameters_cutter_arbor_list = json.loads(
+                result['cutting_tool_basic_parameters_all_list']['basic_parameters_cutter_arbor'])
+            if basic_parameters_cutter_arbor_list:
+                for cutter_arbor_item in basic_parameters_cutter_arbor_list:
+                    cutter_arbor = self.search([('code', '=', cutter_arbor_item['code'])])
+                    if not cutter_arbor:
+                        self.create({
+                            'name': cutter_arbor_item['name'],
+                            'code': cutter_arbor_item['code'],
+                            'cutting_tool_type': '刀杆',
+                            'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
+                                [('code', '=', cutter_arbor_item['standard_library_code'].replace("JKM", result[
+                                    'factory_short_name']))]).id,
+                            'height': cutter_arbor_item['height'],
+                            'width': cutter_arbor_item['width'],
+                            'total_length': cutter_arbor_item['total_length'],
+                            'knife_head_height': cutter_arbor_item['head_length'],
+                            'knife_head_width': cutter_arbor_item['head_width'],
+                            'knife_head_length': cutter_arbor_item['head_length'],
+                            'cutter_arbor_diameter': cutter_arbor_item['arbor_diameter'],
+                            'main_included_angle': cutter_arbor_item['edge_angle'],
+                            'relief_angle': cutter_arbor_item['relief_angle'],
+                            'cutting_depth': cutter_arbor_item['cutting_depth_max'],
+                            'min_machining_aperture': cutter_arbor_item['machining_aperture_min'],
+                            'install_blade_tip_num': cutter_arbor_item['number_blade_installed'],
+                            'is_cooling_hole': cutter_arbor_item['is_cooling_hole'],
+                            'locating_slot_code': cutter_arbor_item['locator_slot_code'],
+                            'installing_structure': cutter_arbor_item['mounting_structure'],
+                            'blade_id': False if not cutter_arbor_item['fit_blade_model_code'] else self.env[
+                                'sf.cutting_tool.standard.library'].search(
+                                [('code', '=', cutter_arbor_item['fit_blade_model_code'].replace("JKM", result[
+                                    'factory_short_name']))]).id,
+                            'tool_shim': cutter_arbor_item['fit_knife_pad_model'],
+                            'cotter_pin': cutter_arbor_item['fit_pin_model'],
+                            'pressing_plate': cutter_arbor_item['fit_plate_model'],
+                            'screw': cutter_arbor_item['fit_screw_model'],
+                            'spanner': cutter_arbor_item['fit_wrench_model'],
+                            'active': cutter_arbor_item['active'],
+                        })
+                    else:
+                        self.write({
+                            'name': cutter_arbor_item['name'],
+                            'height': cutter_arbor_item['height'],
+                            'width': cutter_arbor_item['width'],
+                            'total_length': cutter_arbor_item['total_length'],
+                            'knife_head_height': cutter_arbor_item['head_length'],
+                            'knife_head_width': cutter_arbor_item['head_width'],
+                            'knife_head_length': cutter_arbor_item['head_length'],
+                            'cutter_arbor_diameter': cutter_arbor_item['arbor_diameter'],
+                            'main_included_angle': cutter_arbor_item['edge_angle'],
+                            'relief_angle': cutter_arbor_item['relief_angle'],
+                            'cutting_depth': cutter_arbor_item['cutting_depth_max'],
+                            'min_machining_aperture': cutter_arbor_item['machining_aperture_min'],
+                            'install_blade_tip_num': cutter_arbor_item['number_blade_installed'],
+                            'is_cooling_hole': cutter_arbor_item['is_cooling_hole'],
+                            'locating_slot_code': cutter_arbor_item['locator_slot_code'],
+                            'installing_structure': cutter_arbor_item['mounting_structure'],
+                            'blade_id': False if not cutter_arbor_item['fit_blade_model_code'] else self.env[
+                                'sf.cutting_tool.standard.library'].search(
+                                [('code', '=', cutter_arbor_item['fit_blade_model_code'].replace("JKM", result[
+                                    'factory_short_name']))]).id,
+                            'tool_shim': cutter_arbor_item['fit_knife_pad_model'],
+                            'cotter_pin': cutter_arbor_item['fit_pin_model'],
+                            'pressing_plate': cutter_arbor_item['fit_plate_model'],
+                            'screw': cutter_arbor_item['fit_screw_model'],
+                            'spanner': cutter_arbor_item['fit_wrench_model'],
+                            'active': cutter_arbor_item['active'],
+                        })
+            basic_parameters_cutter_head_list = json.loads(
+                result['cutting_tool_basic_parameters_all_list']['basic_parameters_cutter_head'])
+            if basic_parameters_cutter_head_list:
+                for cutter_head_item in basic_parameters_cutter_head_list:
+                    cutter_head = self.search([('code', '=', cutter_head_item['code'])])
+                    if not cutter_head:
+                        self.create({
+                            'name': cutter_head_item['name'],
+                            'code': cutter_head_item['code'],
+                            'cutting_tool_type': '刀盘',
+                            'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
+                                [('code', '=', cutter_head_item['standard_library_code'].replace("JKM", result[
+                                    'factory_short_name']))]).id,
+                            'install_blade_tip_num': cutter_head_item['number_blade_installed'],
+                            'blade_diameter': cutter_head_item['blade_diameter'],
+                            'cutter_head_diameter': cutter_head_item['cutter_diameter'],
+                            'interface_diameter': cutter_head_item['interface_diameter'],
+                            'total_length': cutter_head_item['total_length'],
+                            'blade_length': cutter_head_item['blade_length'],
+                            'cutting_depth': cutter_head_item['cutting_depth_max'],
+                            'main_included_angle': cutter_head_item['edge_angle'],
+                            'installing_structure': cutter_head_item['mounting_structure'],
+                            'blade_id': False if not cutter_head_item['fit_blade_model_code'] else self.env[
+                                'sf.cutting_tool.standard.library'].search(
+                                [('code', '=', cutter_head_item['fit_blade_model_code'].replace("JKM", result[
+                                    'factory_short_name']))]).id,
+                            'screw': cutter_head_item['fit_screw_model'],
+                            'spanner': cutter_head_item['fit_wrench_model'],
+                            'is_cooling_hole': cutter_head_item['is_cooling_hole'],
+                            'locating_slot_code': cutter_head_item['locator_slot_code'],
+                            'active': cutter_head_item['active'],
+                        })
+                    else:
+                        self.write({
+                            'name': cutter_head_item['name'],
+                            'install_blade_tip_num': cutter_head_item['number_blade_installed'],
+                            'blade_diameter': cutter_head_item['blade_diameter'],
+                            'cutter_head_diameter': cutter_head_item['cutter_diameter'],
+                            'interface_diameter': cutter_head_item['interface_diameter'],
+                            'total_length': cutter_head_item['total_length'],
+                            'blade_length': cutter_head_item['blade_length'],
+                            'cutting_depth': cutter_head_item['cutting_depth_max'],
+                            'main_included_angle': cutter_head_item['edge_angle'],
+                            'installing_structure': cutter_head_item['mounting_structure'],
+                            'blade_id': False if not cutter_head_item['fit_blade_model_code'] else self.env[
+                                'sf.cutting_tool.standard.library'].search(
+                                [('code', '=', cutter_head_item['fit_blade_model_code'].replace("JKM", result[
+                                    'factory_short_name']))]).id,
+                            'screw': cutter_head_item['fit_screw_model'],
+                            'spanner': cutter_head_item['fit_wrench_model'],
+                            'is_cooling_hole': cutter_head_item['is_cooling_hole'],
+                            'locating_slot_code': cutter_head_item['locator_slot_code'],
+                            'active': cutter_head_item['active'],
+                        })
+            basic_parameters_knife_handle_list = json.loads(
+                result['cutting_tool_basic_parameters_all_list']['basic_parameters_knife_handle'])
+            if basic_parameters_knife_handle_list:
+                for knife_handle_item in basic_parameters_knife_handle_list:
+                    knife_handle = self.search([('code', '=', knife_handle_item['code'])])
+                    if not knife_handle:
+                        self.create({
+                            'name': knife_handle_item['name'],
+                            'code': knife_handle_item['code'],
+                            'cutting_tool_type': '刀柄',
+                            'taper_shank_model': knife_handle_item['taper_shank_model'],
+                            'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
+                                [('code', '=', knife_handle_item['standard_library_code'].replace("JKM", result[
+                                    'factory_short_name']))]).id,
+                            'total_length': knife_handle_item['total_length'],
+                            'flange_shank_length': knife_handle_item['flange_length'],
+                            'flange_diameter': knife_handle_item['flange_diameter'],
+                            'shank_length': knife_handle_item['shank_length'],
+                            'shank_diameter': knife_handle_item['shank_diameter'],
+                            'min_clamping_diameter': knife_handle_item['clamping_diameter_min'],
+                            'max_clamping_diameter': knife_handle_item['clamping_diameter_max'],
+                            'clamping_mode': knife_handle_item['clamping_way'],
+                            'tool_changing_time': knife_handle_item['tool_changing_time'],
+                            'max_rotate_speed': knife_handle_item['rotate_speed_max'],
+                            'diameter_slip_accuracy': knife_handle_item['diameter_slip_accuracy'],
+                            'cooling_model': knife_handle_item['cooling_model'],
+                            'is_quick_cutting': knife_handle_item['is_quick_cutting'],
+                            'is_safe_lock': knife_handle_item['is_safe_lock'],
+                            'screw': knife_handle_item['fit_wrench_model'],
+                            'nut': knife_handle_item['fit_nut_model'],
+                            'dynamic_balance_class': knife_handle_item['dynamic_balance_class'],
+                            'active': knife_handle_item['active'],
+                        })
+                    else:
+                        self.write({
+                            'name': knife_handle_item['name'],
+                            'taper_shank_model': knife_handle_item['taper_shank_model'],
+                            'total_length': knife_handle_item['total_length'],
+                            'flange_shank_length': knife_handle_item['flange_length'],
+                            'flange_diameter': knife_handle_item['flange_diameter'],
+                            'shank_length': knife_handle_item['shank_length'],
+                            'shank_diameter': knife_handle_item['shank_diameter'],
+                            'min_clamping_diameter': knife_handle_item['clamping_diameter_min'],
+                            'max_clamping_diameter': knife_handle_item['clamping_diameter_max'],
+                            'clamping_mode': knife_handle_item['clamping_way'],
+                            'tool_changing_time': knife_handle_item['tool_changing_time'],
+                            'max_rotate_speed': knife_handle_item['rotate_speed_max'],
+                            'diameter_slip_accuracy': knife_handle_item['diameter_slip_accuracy'],
+                            'cooling_model': knife_handle_item['cooling_model'],
+                            'is_quick_cutting': knife_handle_item['is_quick_cutting'],
+                            'is_safe_lock': knife_handle_item['is_safe_lock'],
+                            'screw': knife_handle_item['fit_wrench_model'],
+                            'nut': knife_handle_item['fit_nut_model'],
+                            'dynamic_balance_class': knife_handle_item['dynamic_balance_class'],
+                            'active': knife_handle_item['active'],
+                        })
+        else:
+            raise ValidationError("刀具物料基本参数认证未通过")
+
+    def sync_cutting_tool_basic_parameters_yesterday(self):
+        config = self.env['res.config.settings'].get_values()
+        headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+        strUrl = config['sf_url'] + self.url
+        r = requests.post(strUrl, json={}, data=None, headers=headers)
+        r = r.json()
+        result = json.loads(r['result'])
+        if result['status'] == 1:
+            basic_parameters_integral_tool_list = json.loads(
+                result['cutting_tool_basic_parameters_all_list']['basic_parameters_integral_tool'])
+            if basic_parameters_integral_tool_list:
+                for integral_tool_item in basic_parameters_integral_tool_list:
+                    integral_tool = self.search([('code', '=', integral_tool_item['code'])])
+                    if not integral_tool:
+                        self.create({
+                            'name': integral_tool_item['name'],
+                            'code': integral_tool_item['code'],
+                            'cutting_tool_type': '整体式刀具',
+                            'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
+                                [('code', '=', integral_tool_item['standard_library_code'].replace("JKM", result[
+                                    'factory_short_name']))]).id,
+                            'total_length': integral_tool_item['total_length'],
+                            'blade_diameter': integral_tool_item['blade_diameter'],
+                            'blade_length': integral_tool_item['blade_length'],
+                            'blade_number': integral_tool_item['blade_number'],
+                            'neck_length': integral_tool_item['neck_length'],
+                            'neck_diameter': integral_tool_item['neck_diameter'],
+                            'handle_diameter': integral_tool_item['shank_diameter'],
+                            'handle_length': integral_tool_item['shank_length'],
+                            'blade_tip_diameter': integral_tool_item['tip_diameter'],
+                            'blade_tip_working_size': integral_tool_item['tip_handling_size'],
+                            'blade_tip_taper': integral_tool_item['knife_tip_taper'],
+                            'blade_helix_angle': integral_tool_item['blade_helix_angle'],
+                            'blade_width': integral_tool_item['blade_width'],
+                            'blade_depth': integral_tool_item['blade_depth'],
+                            'pitch': integral_tool_item['pitch'],
+                            'cutting_depth': integral_tool_item['cutting_depth_max'],
+                            'active': integral_tool_item['active'],
+                        })
+                    else:
+                        if integral_tool_item['active'] is False:
+                            integral_tool.write({'active': False})
+                        else:
+                            self.write({
+                                'name': integral_tool_item['name'],
+                                'total_length': integral_tool_item['total_length'],
+                                'blade_diameter': integral_tool_item['blade_diameter'],
+                                'blade_length': integral_tool_item['blade_length'],
+                                'blade_number': integral_tool_item['blade_number'],
+                                'neck_length': integral_tool_item['neck_length'],
+                                'neck_diameter': integral_tool_item['neck_diameter'],
+                                'handle_diameter': integral_tool_item['shank_diameter'],
+                                'handle_length': integral_tool_item['shank_length'],
+                                'blade_tip_diameter': integral_tool_item['tip_diameter'],
+                                'blade_tip_working_size': integral_tool_item['tip_handling_size'],
+                                'blade_tip_taper': integral_tool_item['knife_tip_taper'],
+                                'blade_helix_angle': integral_tool_item['blade_helix_angle'],
+                                'blade_width': integral_tool_item['blade_width'],
+                                'blade_depth': integral_tool_item['blade_depth'],
+                                'pitch': integral_tool_item['pitch'],
+                                'cutting_depth': integral_tool_item['cutting_depth_max'],
+                                'active': integral_tool_item['active'],
+                            })
+            basic_parameters_blade_list = json.loads(
+                result['cutting_tool_basic_parameters_all_list']['basic_parameters_blade'])
+            if basic_parameters_blade_list:
+                for blade_item in basic_parameters_blade_list:
+                    blade = self.search([('code', '=', blade_item['code'])])
+                    if not blade:
+                        self.create({
+                            'name': blade_item['name'],
+                            'code': blade_item['code'],
+                            'cutting_tool_type': '刀片',
+                            'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
+                                [('code', '=', blade_item['standard_library_code'].replace("JKM", result[
+                                    'factory_short_name']))]).id,
+                            'length': blade_item['length'],
+                            'thickness': blade_item['thickness'],
+                            'cutting_blade_length': blade_item['cutting_blade_length'],
+                            'relief_angle': blade_item['relief_angle'],
+                            'blade_tip_circular_arc_radius': blade_item['radius_tip_re'],
+                            'inscribed_circle_diameter': blade_item['diameter_inner_circle'],
+                            'install_aperture_diameter': blade_item['diameter_mounting_hole'],
+                            'pitch': blade_item['pitch'],
+                            'chip_breaker_groove': blade_item['is_chip_breaker'],
+                            'chip_breaker_type_code': blade_item['chip_breaker_type_code'],
+                            'blade_teeth_model': '无' if not blade_item['blade_profile'] else blade_item[
+                                'blade_profile'],
+                            'blade_blade_number': blade_item['blade_number'],
+                            'cutting_depth': blade_item['cutting_depth_max'],
+                            'blade_width': blade_item['blade_width'],
+                            'main_included_angle': blade_item['edge_angle'],
+                            'top_angle': blade_item['top_angle'],
+                            'thread_model': '无' if not blade_item['thread_type'] else blade_item['thread_type'],
+                            'thread_num': blade_item['threads_per_inch'],
+                            'blade_tip_height_tolerance': blade_item['tip_height_tolerance'],
+                            'inscribed_circle_tolerance': blade_item['internal_circle_tolerance'],
+                            'thickness_tolerance': blade_item['thickness_tolerance'],
+                            'active': blade_item['active'],
+                        })
+                    else:
+                        if blade_item['active'] is False:
+                            blade.write({'active': False})
+                        else:
+                            self.write({
+                                'name': blade_item['name'],
+                                'length': blade_item['length'],
+                                'thickness': blade_item['thickness'],
+                                'cutting_blade_length': blade_item['cutting_blade_length'],
+                                'relief_angle': blade_item['relief_angle'],
+                                'blade_tip_circular_arc_radius': blade_item['radius_tip_re'],
+                                'inscribed_circle_diameter': blade_item['diameter_inner_circle'],
+                                'install_aperture_diameter': blade_item['diameter_mounting_hole'],
+                                'pitch': blade_item['pitch'],
+                                'chip_breaker_groove': blade_item['is_chip_breaker'],
+                                'chip_breaker_type_code': blade_item['chip_breaker_type_code'],
+                                'blade_teeth_model': '无' if not blade_item['blade_profile'] else blade_item[
+                                    'blade_profile'],
+                                'blade_blade_number': blade_item['blade_number'],
+                                'cutting_depth': blade_item['cutting_depth_max'],
+                                'blade_width': blade_item['blade_width'],
+                                'main_included_angle': blade_item['edge_angle'],
+                                'top_angle': blade_item['top_angle'],
+                                'thread_model': '无' if not blade_item['thread_type'] else blade_item['thread_type'],
+                                'thread_num': blade_item['threads_per_inch'],
+                                'blade_tip_height_tolerance': blade_item['tip_height_tolerance'],
+                                'inscribed_circle_tolerance': blade_item['internal_circle_tolerance'],
+                                'thickness_tolerance': blade_item['thickness_tolerance'],
+                            })
+            basic_parameters_chuck_list = json.loads(
+                result['cutting_tool_basic_parameters_all_list']['basic_parameters_chuck'])
+            if basic_parameters_chuck_list:
+                for chuck_item in basic_parameters_chuck_list:
+                    chuck = self.search([('code', '=', chuck_item['code'])])
+                    if not chuck:
+                        self.create({
+                            'name': chuck_item['name'],
+                            'code': chuck_item['code'],
+                            'cutting_tool_type': '夹头',
+                            'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
+                                [('code', '=', chuck_item['standard_library_code'].replace("JKM", result[
+                                    'factory_short_name']))]).id,
+                            'er_size_model': chuck_item['size_model'],
+                            'min_clamping_diameter': chuck_item['clamping_diameter_min'],
+                            'max_clamping_diameter': chuck_item['clamping_diameter_max'],
+                            'outer_diameter': chuck_item['outer_diameter'],
+                            'inner_diameter': chuck_item['inner_diameter'],
+                            'run_out_accuracy': chuck_item['run_out_accuracy'],
+                            'total_length': chuck_item['total_length'],
+                            'taper': chuck_item['taper'],
+                            'top_diameter': chuck_item['top_diameter'],
+                            'weight': chuck_item['weight'],
+                            'max_load_capacity': chuck_item['load_capacity_max'],
+                            'cooling_jacket': chuck_item['cooling_sleeve_model'],
+                            'active': chuck_item['active'],
+                        })
+                    else:
+                        if chuck_item['active'] is False:
+                            chuck.write({'active': False})
+                        else:
+                            self.write({
+                                'name': chuck_item['name'],
+                                'er_size_model': chuck_item['size_model'],
+                                'min_clamping_diameter': chuck_item['clamping_diameter_min'],
+                                'max_clamping_diameter': chuck_item['clamping_diameter_max'],
+                                'outer_diameter': chuck_item['outer_diameter'],
+                                'inner_diameter': chuck_item['inner_diameter'],
+                                'run_out_accuracy': chuck_item['run_out_accuracy'],
+                                'total_length': chuck_item['total_length'],
+                                'taper': chuck_item['taper'],
+                                'top_diameter': chuck_item['top_diameter'],
+                                'weight': chuck_item['weight'],
+                                'max_load_capacity': chuck_item['load_capacity_max'],
+                                'cooling_jacket': chuck_item['cooling_sleeve_model'],
+                            })
+            basic_parameters_cutter_arbor_list = json.loads(
+                result['cutting_tool_basic_parameters_all_list']['basic_parameters_cutter_arbor'])
+            if basic_parameters_cutter_arbor_list:
+                for cutter_arbor_item in basic_parameters_cutter_arbor_list:
+                    cutter_arbor = self.search([('code', '=', cutter_arbor_item['code'])])
+                    if not cutter_arbor:
+                        self.create({
+                            'name': cutter_arbor_item['name'],
+                            'code': cutter_arbor_item['code'],
+                            'cutting_tool_type': '刀杆',
+                            'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
+                                [('code', '=', cutter_arbor_item['standard_library_code'].replace("JKM", result[
+                                    'factory_short_name']))]).id,
+                            'height': cutter_arbor_item['height'],
+                            'width': cutter_arbor_item['width'],
+                            'total_length': cutter_arbor_item['total_length'],
+                            'knife_head_height': cutter_arbor_item['head_length'],
+                            'knife_head_width': cutter_arbor_item['head_width'],
+                            'knife_head_length': cutter_arbor_item['head_length'],
+                            'cutter_arbor_diameter': cutter_arbor_item['arbor_diameter'],
+                            'main_included_angle': cutter_arbor_item['edge_angle'],
+                            'relief_angle': cutter_arbor_item['relief_angle'],
+                            'cutting_depth': cutter_arbor_item['cutting_depth_max'],
+                            'min_machining_aperture': cutter_arbor_item['machining_aperture_min'],
+                            'install_blade_tip_num': cutter_arbor_item['number_blade_installed'],
+                            'is_cooling_hole': cutter_arbor_item['is_cooling_hole'],
+                            'locating_slot_code': cutter_arbor_item['locator_slot_code'],
+                            'installing_structure': cutter_arbor_item['mounting_structure'],
+                            'blade_id': False if not cutter_arbor_item['fit_blade_model_code'] else self.env[
+                                'sf.cutting_tool.standard.library'].search(
+                                [('code', '=', cutter_arbor_item['fit_blade_model_code'].replace("JKM", result[
+                                    'factory_short_name']))]).id,
+                            'tool_shim': cutter_arbor_item['fit_knife_pad_model'],
+                            'cotter_pin': cutter_arbor_item['fit_pin_model'],
+                            'pressing_plate': cutter_arbor_item['fit_plate_model'],
+                            'screw': cutter_arbor_item['fit_screw_model'],
+                            'spanner': cutter_arbor_item['fit_wrench_model'],
+                            'active': cutter_arbor_item['active'],
+                        })
+                    else:
+                        if cutter_arbor_item['active'] is False:
+                            cutter_arbor.write({'active': False})
+                        else:
+                            self.write({
+                                'name': cutter_arbor_item['name'],
+                                'height': cutter_arbor_item['height'],
+                                'width': cutter_arbor_item['width'],
+                                'total_length': cutter_arbor_item['total_length'],
+                                'knife_head_height': cutter_arbor_item['head_length'],
+                                'knife_head_width': cutter_arbor_item['head_width'],
+                                'knife_head_length': cutter_arbor_item['head_length'],
+                                'cutter_arbor_diameter': cutter_arbor_item['arbor_diameter'],
+                                'main_included_angle': cutter_arbor_item['edge_angle'],
+                                'relief_angle': cutter_arbor_item['relief_angle'],
+                                'cutting_depth': cutter_arbor_item['cutting_depth_max'],
+                                'min_machining_aperture': cutter_arbor_item['machining_aperture_min'],
+                                'install_blade_tip_num': cutter_arbor_item['number_blade_installed'],
+                                'is_cooling_hole': cutter_arbor_item['is_cooling_hole'],
+                                'locating_slot_code': cutter_arbor_item['locator_slot_code'],
+                                'installing_structure': cutter_arbor_item['mounting_structure'],
+                                'blade_id': False if not cutter_arbor_item['fit_blade_model_code'] else self.env[
+                                    'sf.cutting_tool.standard.library'].search(
+                                    [('code', '=', cutter_arbor_item['fit_blade_model_code'].replace("JKM", result[
+                                        'factory_short_name']))]).id,
+                                'tool_shim': cutter_arbor_item['fit_knife_pad_model'],
+                                'cotter_pin': cutter_arbor_item['fit_pin_model'],
+                                'pressing_plate': cutter_arbor_item['fit_plate_model'],
+                                'screw': cutter_arbor_item['fit_screw_model'],
+                                'spanner': cutter_arbor_item['fit_wrench_model'],
+                            })
+            basic_parameters_cutter_head_list = json.loads(
+                result['cutting_tool_basic_parameters_all_list']['basic_parameters_cutter_head'])
+            if basic_parameters_cutter_head_list:
+                for cutter_head_item in basic_parameters_cutter_head_list:
+                    cutter_head = self.search([('code', '=', cutter_head_item['code'])])
+                    if not cutter_head:
+                        self.create({
+                            'name': cutter_head_item['name'],
+                            'code': cutter_head_item['code'],
+                            'cutting_tool_type': '刀盘',
+                            'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
+                                [('code', '=', cutter_head_item['standard_library_code'].replace("JKM", result[
+                                    'factory_short_name']))]).id,
+                            'install_blade_tip_num': cutter_head_item['number_blade_installed'],
+                            'blade_diameter': cutter_head_item['blade_diameter'],
+                            'cutter_head_diameter': cutter_head_item['cutter_diameter'],
+                            'interface_diameter': cutter_head_item['interface_diameter'],
+                            'total_length': cutter_head_item['total_length'],
+                            'blade_length': cutter_head_item['blade_length'],
+                            'cutting_depth': cutter_head_item['cutting_depth_max'],
+                            'main_included_angle': cutter_head_item['edge_angle'],
+                            'installing_structure': cutter_head_item['mounting_structure'],
+                            'blade_id': False if not cutter_head_item['fit_blade_model_code'] else self.env[
+                                'sf.cutting_tool.standard.library'].search(
+                                [('code', '=', cutter_head_item['fit_blade_model_code'].replace("JKM", result[
+                                    'factory_short_name']))]).id,
+                            'screw': cutter_head_item['fit_screw_model'],
+                            'spanner': cutter_head_item['fit_wrench_model'],
+                            'is_cooling_hole': cutter_head_item['is_cooling_hole'],
+                            'locating_slot_code': cutter_head_item['locator_slot_code'],
+                            'active': cutter_head_item['active'],
+                        })
+                    else:
+                        if cutter_head_item['active'] is False:
+                            cutter_head.write({'active': False})
+                        else:
+                            self.write({
+                                'name': cutter_head_item['name'],
+                                'install_blade_tip_num': cutter_head_item['number_blade_installed'],
+                                'blade_diameter': cutter_head_item['blade_diameter'],
+                                'cutter_head_diameter': cutter_head_item['cutter_diameter'],
+                                'interface_diameter': cutter_head_item['interface_diameter'],
+                                'total_length': cutter_head_item['total_length'],
+                                'blade_length': cutter_head_item['blade_length'],
+                                'cutting_depth': cutter_head_item['cutting_depth_max'],
+                                'main_included_angle': cutter_head_item['edge_angle'],
+                                'installing_structure': cutter_head_item['mounting_structure'],
+                                'blade_id': False if not cutter_head_item['fit_blade_model_code'] else self.env[
+                                    'sf.cutting_tool.standard.library'].search(
+                                    [('code', '=', cutter_head_item['fit_blade_model_code'].replace("JKM", result[
+                                        'factory_short_name']))]).id,
+                                'screw': cutter_head_item['fit_screw_model'],
+                                'spanner': cutter_head_item['fit_wrench_model'],
+                                'is_cooling_hole': cutter_head_item['is_cooling_hole'],
+                                'locating_slot_code': cutter_head_item['locator_slot_code'],
+                            })
+            basic_parameters_knife_handle_list = json.loads(
+                result['cutting_tool_basic_parameters_all_list']['basic_parameters_knife_handle'])
+            if basic_parameters_knife_handle_list:
+                for knife_handle_item in basic_parameters_knife_handle_list:
+                    knife_handle = self.search([('code', '=', knife_handle_item['code'])])
+                    if not knife_handle:
+                        self.create({
+                            'name': knife_handle_item['name'],
+                            'code': knife_handle_item['code'],
+                            'cutting_tool_type': '刀柄',
+                            'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
+                                [('code', '=', knife_handle_item['standard_library_code'].replace("JKM", result[
+                                    'factory_short_name']))]).id,
+                            'total_length': knife_handle_item['total_length'],
+                            'taper_shank_model': knife_handle_item['taper_shank_model'],
+                            'flange_shank_length': knife_handle_item['flange_length'],
+                            'flange_diameter': knife_handle_item['flange_diameter'],
+                            'shank_length': knife_handle_item['shank_length'],
+                            'shank_diameter': knife_handle_item['shank_diameter'],
+                            'min_clamping_diameter': knife_handle_item['clamping_diameter_min'],
+                            'max_clamping_diameter': knife_handle_item['clamping_diameter_max'],
+                            'clamping_mode': knife_handle_item['clamping_way'],
+                            'tool_changing_time': knife_handle_item['tool_changing_time'],
+                            'max_rotate_speed': knife_handle_item['rotate_speed_max'],
+                            'diameter_slip_accuracy': knife_handle_item['diameter_slip_accuracy'],
+                            'cooling_model': knife_handle_item['cooling_model'],
+                            'is_quick_cutting': knife_handle_item['is_quick_cutting'],
+                            'is_safe_lock': knife_handle_item['is_safe_lock'],
+                            'screw': knife_handle_item['fit_wrench_model'],
+                            'nut': knife_handle_item['fit_nut_model'],
+                            'dynamic_balance_class': knife_handle_item['dynamic_balance_class'],
+                            'active': knife_handle_item['active'],
+                        })
+                    else:
+                        if knife_handle_item['active'] is False:
+                            knife_handle.write({'active': False})
+                        else:
+                            self.write({
+                                'name': knife_handle_item['name'],
+                                'total_length': knife_handle_item['total_length'],
+                                'taper_shank_model': knife_handle_item['taper_shank_model'],
+                                'flange_shank_length': knife_handle_item['flange_length'],
+                                'flange_diameter': knife_handle_item['flange_diameter'],
+                                'shank_length': knife_handle_item['shank_length'],
+                                'shank_diameter': knife_handle_item['shank_diameter'],
+                                'min_clamping_diameter': knife_handle_item['clamping_diameter_min'],
+                                'max_clamping_diameter': knife_handle_item['clamping_diameter_max'],
+                                'clamping_mode': knife_handle_item['clamping_way'],
+                                'tool_changing_time': knife_handle_item['tool_changing_time'],
+                                'max_rotate_speed': knife_handle_item['rotate_speed_max'],
+                                'diameter_slip_accuracy': knife_handle_item['diameter_slip_accuracy'],
+                                'cooling_model': knife_handle_item['cooling_model'],
+                                'is_quick_cutting': knife_handle_item['is_quick_cutting'],
+                                'is_safe_lock': knife_handle_item['is_safe_lock'],
+                                'screw': knife_handle_item['fit_wrench_model'],
+                                'nut': knife_handle_item['fit_nut_model'],
+                                'dynamic_balance_class': knife_handle_item['dynamic_balance_class'],
+                            })
+        else:
+            raise ValidationError("刀具物料基本参数认证未通过")
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index e1d0bad0..c32bde08 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -104,7 +104,8 @@ class RePurchaseOrder(models.Model):
 
     def button_confirm(self):
         self.check_status = 'pending'
-        return super().button_confirm()
+        res = super().button_confirm()
+        return res
 
 
 class ResPartnerToSale(models.Model):
@@ -149,10 +150,10 @@ class ResPartnerToSale(models.Model):
             if self.env.user.has_group('sf_base.group_purchase_director'):
                 domain = [('supplier_rank', '>', 0)]
             elif self.env.user.has_group('sf_base.group_purchase'):
-                customer = self.env['res.partner'].search(
-                    [('supplier_rank', '>', 0), ('user_id', '=', self.env.user.id)])
-                if customer:
-                    ids = [t.id for t in customer]
+                supplier = self.env['res.partner'].search(
+                    [('supplier_rank', '>', 0), ('purchase_user_id', '=', self.env.user.id)])
+                if supplier:
+                    ids = [t.id for t in supplier]
                     domain = [('id', 'in', ids)]
                 else:
                     domain = [('id', '=', False)]
@@ -190,12 +191,9 @@ class ResUserToSale(models.Model):
             if self.env.user.has_group('sf_base.group_purchase_director'):
                 domain = [('supplier_rank', '>', 0)]
             elif self.env.user.has_group('sf_base.group_purchase'):
-                supplier = self.env['res.partner'].search(
-                    [('supplier_rank', '>', 0), ('purchase_user_id', '=', self.env.user.id)])
-                if supplier:
-                    ids = [t.id for t in supplier]
-                    domain = [('id', 'in', ids)]
+                if self.id != self.env.user.id:
+                    domain = [('id', '=', self.id)]
                 else:
-                    domain = [('id', '=', False)]
+                    domain = [('id', '=', self.env.user.id)]
             return self._search(domain, limit=limit, access_rights_uid=name_get_uid)
         return super()._name_search(name, args, operator, limit, name_get_uid)
diff --git a/sf_sale/views/res_partner_view.xml b/sf_sale/views/res_partner_view.xml
index c7bb79af..e751fe9f 100644
--- a/sf_sale/views/res_partner_view.xml
+++ b/sf_sale/views/res_partner_view.xml
@@ -6,8 +6,8 @@
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                 <form position="attributes">
-                     <attribute name="delete">false</attribute>
+                <form position="attributes">
+                    <attribute name="delete">false</attribute>
                 </form>
                 <field name="vat" position="after">
                     <field name="customer_rank" invisible="1"/>
@@ -45,7 +45,7 @@
                 </field>
                 <xpath expr="//group[@name='sale']/field[@name='user_id']" position="replace">
                     <field name="user_id" widget="many2one_avatar_user" context="{'is_sale': True }"
-                           attrs="{'required' : [('customer_rank','>', 0)]}"/>
+                           attrs="{'required' : [('customer_rank','>', 0)],'readonly': [('supplier_rank','>', 0)]}"/>
                 </xpath>
                 <field name="category_id" position="attributes">
                     <attribute name="required">1</attribute>
@@ -67,13 +67,13 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_partner_property_form_inherit_sf">
+        <record model="ir.ui.view" id="view_partner_tree_inherit_sf">
             <field name="name">res.partner.property.form.inherit.sf</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_tree"/>
             <field name="arch" type="xml">
                 <tree position="attributes">
-                     <attribute name="delete">false</attribute>
+                    <attribute name="delete">false</attribute>
                 </tree>
                 <field name="function" position="before">
                     <field name="customer_rank" invisible="1"/>
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 80ac3811..f1947227 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -118,8 +118,8 @@ class FunctionalCuttingToolEntity(models.Model):
         'maintenance.equipment.image', 'rel_cutting_product_template_tool_entity', '走刀方向',
         domain=[('type', '=', '走刀方向')])
     suitable_coolant_ids = fields.Many2many(
-        'maintenance.equipment.image', 'rel_coolant_product_template_tool_entity', '适合冷却液',
-        domain=[('type', '=', '冷却液')])
+        'maintenance.equipment.image', 'rel_coolants_product_template_tool_entity', '适合冷却方式',
+        domain=[('type', '=', '冷却方式')])
 
     @api.depends('cutting_tool_integral_model_id', 'cutting_tool_blade_model_id')
     def _compute_maintenance_equipment_image(self):
@@ -287,7 +287,7 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
         'maintenance.equipment.image', 'rel_cutting_product_template_distribution', '走刀方向',
         domain=[('type', '=', '走刀方向')], related='sf_functional_cutting_tool_entity_ids.cutting_direction_ids')
     suitable_coolant_ids = fields.Many2many(
-        'maintenance.equipment.image', 'rel_coolant_product_template_distribution', '适合冷却液',
+        'maintenance.equipment.image', 'rel_coolant_product_template_distribution', '适合冷却方式',
         domain=[('type', '=', '冷却液')], related='sf_functional_cutting_tool_entity_ids.suitable_coolant_ids')
 
     sf_functional_cutting_tool_entity_ids = fields.Many2many('sf.functional.cutting.tool.entity',
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 62c0f0eb..06ad43aa 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -130,7 +130,7 @@
                                     <field name="cutting_direction_ids" string="" widget="custom_many2many_checkboxes"
                                            domain="[('id','in',cutting_direction_ids)]"/>
                                 </group>
-                                <group string="适合冷却液">
+                                <group string="适合冷却方式">
                                     <field name="suitable_coolant_ids" string="" widget="custom_many2many_checkboxes"
                                            domain="[('id','in',suitable_coolant_ids)]"/>
                                 </group>
@@ -359,7 +359,7 @@
                                            readonly="1"
                                            domain="[('id','in',cutting_direction_ids)]"/>
                                 </group>
-                                <group string="适合冷却液">
+                                <group string="适合冷却方式">
                                     <field name="suitable_coolant_ids" string="" widget="custom_many2many_checkboxes"
                                            readonly="1"
                                            domain="[('id','in',suitable_coolant_ids)]"/>
diff --git a/sf_tool_management/views/tool_material_search.xml b/sf_tool_management/views/tool_material_search.xml
index 3bb5d3ea..92369fa8 100644
--- a/sf_tool_management/views/tool_material_search.xml
+++ b/sf_tool_management/views/tool_material_search.xml
@@ -241,7 +241,7 @@
                                     <group string="走刀方向">
                                         <field name="cutting_direction_ids" string="" widget="custom_many2many_checkboxes"/>
                                     </group>
-                                    <group string="适合冷却液">
+                                    <group string="适合冷却方式">
                                         <field name="suitable_coolant_ids" string="" widget="custom_many2many_checkboxes"/>
                                     </group>
                                 </group>