From 296efcc395d26556d8382a14583aef19eae9d60e Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 11 Oct 2023 17:39:46 +0800
Subject: [PATCH 01/21] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B0=83=E5=8F=96cloud?=
 =?UTF-8?q?=E7=9A=84=E5=88=80=E5=85=B7=E6=A0=87=E5=87=86=E5=BA=93=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/common.py                    |  1 +
 sf_dlm/views/product_template_view.xml      | 18 ++++++---
 sf_manufacturing/models/product_template.py | 44 ++++++++++++++++-----
 sf_mrs_connect/models/sync_common.py        | 21 +++-------
 sf_sale/models/quick_easy_order.py          |  8 ++--
 5 files changed, 58 insertions(+), 34 deletions(-)

diff --git a/sf_base/models/common.py b/sf_base/models/common.py
index a6aaf0f8..7afefcea 100644
--- a/sf_base/models/common.py
+++ b/sf_base/models/common.py
@@ -79,6 +79,7 @@ class MrsMaterialModel(models.Model):
     active = fields.Boolean('有效', default=True)
 
 
+
 class MrsProductionProcessCategory(models.Model):
     _name = 'sf.production.process.category'
     _description = '表面工艺类别'
diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index fbc12cee..8c4ff1ae 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -51,10 +51,18 @@
                            attrs="{'invisible': ['|',('categ_type', '!=', '表面工艺'),('categ_type', '=', False)]}"/>
                     <field name="cutting_tool_material_id" attrs="{'invisible': [('categ_type', '!=', '刀具')]}"
                            placeholder="请选择"/>
-                    <field name="cutting_tool_model_id" placeholder="请选择"
-                           context="{'default_cutting_tool_material_id': cutting_tool_material_id,'default_cutting_tool_type_id': cutting_tool_type_id}"
-                           attrs="{'invisible': [('categ_type', '!=', '刀具')]}"
-                           domain="[('cutting_tool_material_id','=',cutting_tool_material_id)]"/>
+                    <!--                    <field name="cutting_tool_model_id" placeholder="请选择"-->
+                    <!--                           attrs="{'invisible': [('categ_type', '!=', '刀具')]}"/>-->
+                    <field name="cutting_tool_model" attrs="{'invisible': [('categ_type', '!=', '刀具')]}">
+                        <templates>
+
+                            <t t-foreach="cutting_tool_model_data" t-as="data">
+                                <td>
+                                    <t t-esc="cutting_tool_model_data.name"/>
+                                </td>
+                            </t>
+                        </templates>
+                    </field>
                     <field name="fixture_material_id" attrs="{'invisible': [('categ_type', '!=', '夹具')]}"
                            placeholder="请选择"/>
                     <field name="fixture_model_id" string="型号" placeholder="请选择"
@@ -106,7 +114,7 @@
                     <page string="刀具物料参数" attrs="{'invisible': [('categ_type', '!=', '刀具')]}">
                         <group>
                             <group attrs="{'invisible': [('categ_type', '!=', '刀具')]}" col="1">
-                                <field name="cutting_tool_type_id" options="{'no_create': True}" placeholder="请选择" />
+                                <field name="cutting_tool_type_id" options="{'no_create': True}" placeholder="请选择"/>
                                 <field name="brand_id" options="{'no_create': True}" placeholder="请选择"/>
                                 <field name="materials_type_id" options="{'no_create': True}"
                                        attrs="{'invisible': [('cutting_tool_type', 'in', ('整体式刀具','夹头','刀柄'))]}"
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index baf86eb6..d28ae68e 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -1,12 +1,15 @@
 from odoo import models, fields, api
 from odoo.exceptions import ValidationError
 from odoo.modules import get_resource_path
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+from odoo.addons.sf_base.commons.common import Common
+# from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import write_stl_file
 import logging
 import base64
 import hashlib
 import os
+import requests
+import json
 
 
 class ResProductMo(models.Model):
@@ -62,6 +65,8 @@ class ResProductMo(models.Model):
 
     cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', string='型号',
                                             )
+
+    cutting_tool_model = fields.Char('型号')
     cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', string='类型',
                                            domain="[('cutting_tool_material_id.name', '=', cutting_tool_type)]")
 
@@ -104,7 +109,6 @@ class ResProductMo(models.Model):
     suitable_coolant_ids = fields.Many2many('maintenance.equipment.image', 'rel_coolant_product_template',
                                             '适合冷却液', domain=[('type', '=', '冷却液')])
 
-
     # @api.constrains('suitable_machining_method_ids')
     # def _check_suitable_machining_method_ids(self):
     #     for record in self:
@@ -406,9 +410,31 @@ class ResProductMo(models.Model):
 
     @api.onchange('cutting_tool_material_id')
     def _onchange_cutting_tool_material_id(self):
-        for item in self:
-            if item.cutting_tool_material_id.id != item.cutting_tool_model_id.cutting_tool_material_id.id:
-                item.cutting_tool_model_id = False
+        try:
+            config = self.env['res.config.settings'].get_values()
+            headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+            url = config['sf_url'] + '/api/cutting_model/list'
+            res = {'token': config['token'], 'cutting_tool_material_code': self.cutting_tool_material_id.code}
+            result = requests.post(url, json={}, data=res, headers=headers)
+            result = result.json()
+            if result['status'] == 1:
+                self.cutting_tool_model = result['data']
+        except Exception as e:
+            logging.info("获取刀具标准库失败")
+
+    @api.depends('cutting_tool_material_id')
+    def _get_cutting_tool_model(self):
+        try:
+            config = self.env['res.config.settings'].get_values()
+            headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+            url = config['sf_url'] + '/api/cutting_model/list'
+            res = {'token': config['token'], 'cutting_tool_material_code': self.cutting_tool_material_id.code}
+            result = requests.post(url, json=res, data=None, headers=headers)
+            cutting_model_data = result.json()
+            if result['state'] == 1:
+                return {'cutting_model_data': cutting_model_data}
+        except Exception as e:
+            logging.info("获取刀具标准库失败")
 
     @api.onchange('fixture_material_id')
     def _onchange_fixture_material_id(self):
@@ -736,9 +762,9 @@ class ResProductMo(models.Model):
 
     # 将attach的datas内容转为glb文件
     def transition_glb_file(self, report_path, code):
-        shapes = read_step_file(report_path)
+        # shapes = read_step_file(report_path)
         output_file = os.path.join('/tmp', str(code) + '.stl')
-        write_stl_file(shapes, output_file, 'binary', 0.03, 0.5)
+        # write_stl_file(shapes, output_file, 'binary', 0.03, 0.5)
         # 转化为glb
         output_glb_file = os.path.join('/tmp', str(code) + '.glb')
         util_path = get_resource_path('sf_dlm', 'static/util')
@@ -783,6 +809,7 @@ class ResMrpBomMo(models.Model):
         # 坯料BOM组件：选取当前坯料原材料，
         # 然后根据当前的坯料的体积得出需要的原材料重量（立方米m³） *材料密度 * 1000 = 所需原材料重量KG（公斤）
         # 坯料所需原材料公式：当前的坯料的体积（立方米m³） *材料密度 * 1000 = 所需原材料重量KG（公斤）
+
     def bom_create_line(self, embryo):
         # 选取当前坯料原材料
         raw_bom_line = self.get_raw_bom(embryo)
@@ -801,7 +828,6 @@ class ResMrpBomMo(models.Model):
         else:
             return False
 
-
         # 查询材料型号默认排第一的供应商
 
     def get_supplier(self, materials_type):
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index 9a5146ea..b5f285e4 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -345,7 +345,7 @@ class sfProductionProcess(models.Model):
                         self.create({
                             "name": item['name'],
                             "category_id": category.id,
-                            "process_encode": item['process_encode'],
+                            "process_encode": item['code'],
                             "remark": item['remark'],
                             "active": item['active'],
                         })
@@ -563,7 +563,7 @@ class MachineBrand(models.Model):
                 brand = self.search([("code", '=', item['code'])])
                 if brand:
                     brand.name = item['name']
-                    brand.image_brand = '' if not item['image_brand'] else base64.b64encode(item.image_brand)
+                    brand.image_brand = '' if not item['image_brand'] else base64.b64decode(item['image_brand'])
                     brand.active = item['active']
                     brand.remark = item['remark']
                     brand.tag_ids = self.env['sf.machine.brand.tags'].search([("name", 'in', item['tag_ids'])]).ids
@@ -571,7 +571,7 @@ class MachineBrand(models.Model):
                     self.create({
                         "name": item['name'],
                         "code": item['code'],
-                        "image_brand": '' if not item['image_brand'] else base64.b64encode(item.image_brand),
+                        "image_brand": '' if not item['image_brand'] else base64.b64decode(item['image_brand']),
                         "active": item['active'],
                         "remark": item['remark'],
                         "tag_ids": self.env['sf.machine.brand.tags'].search([("name", 'in', item['tag_ids'])]).ids,
@@ -593,22 +593,18 @@ class MachineBrand(models.Model):
             for item in result['machine_brand_all_list']:
                 brand = self.search([("code", '=', item['code'])])
                 if not brand:
-                    if item.get('image_brand'):
-                        image = base64.b64decode(item['image_brand'])
-                    else:
-                        image = ''
                     self.create({
                         "name": item['name'],
                         "code": item['code'],
                         "remark": item['remark'],
-                        "image_brand": image,
+                        "image_brand": '' if not item['image_brand'] else base64.b64decode(item['image_brand']),
                         "tag_ids": self.env['sf.machine.brand.tags'].search(
                             [("name", 'in', item['tag_ids'])]).ids
                     })
                 else:
                     brand.name = item['name']
                     brand.remark = item['remark']
-                    brand.image_brand = '' if not item['image_brand'] else base64.b64encode(item.image_brand)
+                    brand.image_brand = '' if not item['image_brand'] else base64.b64decode(item['image_brand'])
                     brand.tag_ids = self.env['sf.machine.brand.tags'].search(
                         [("name", 'in', item['tag_ids'])]).ids
         else:
@@ -933,16 +929,13 @@ class sfProductionProcessParameter(models.Model):
         r = r.json()
         result = json.loads(r['result'])
         if result['status'] == 1:
-            _logger.info('result:%s' % result)
             for item in result['mrs_production_process_parameter_all_list']:
                 if item:
-                    _logger.info('create可选参数:%s' % item)
                     production_process_parameter = self.search(
                         [("code", '=', item['code'])])
                     process = self.env['sf.production.process'].search(
                         [('process_encode', '=', item['process_id_code'])])
                     if not production_process_parameter:
-                        _logger.info('create可选参数:%s' % item)
                         self.create({
                             "name": item['name'],
                             "code": item['code'],
@@ -1569,7 +1562,6 @@ class SfToolType(models.Model):
         r = r.json()
         result = json.loads(r['result'])
         if result['status'] == 1:
-            _logger.info('result:%s' % result)
             for item in result['mrs_cutting_tool_type_yesterday_list']:
                 if item:
                     cutting_tool_type = self.search([("code", '=', item['code'])])
@@ -1604,7 +1596,6 @@ class SfToolType(models.Model):
         r = r.json()
         result = json.loads(r['result'])
         if result['status'] == 1:
-            _logger.info('result:%s' % result)
             for item in result['mrs_cutting_tool_type_all_list']:
                 if item:
                     cutting_tool_type = self.search([("code", '=', item['code'])])
@@ -1647,7 +1638,6 @@ class SfMaintenanceEquipmentImage(models.Model):
         r = r.json()
         result = json.loads(r['result'])
         if result['status'] == 1:
-            _logger.info('result:%s' % result)
             for item in result['ability_feature_library_yesterday_list']:
                 if item:
                     ability_feature_library = self.search([("name", '=', item['name'])])
@@ -1678,7 +1668,6 @@ class SfMaintenanceEquipmentImage(models.Model):
         r = r.json()
         result = json.loads(r['result'])
         if result['status'] == 1:
-            _logger.info('result:%s' % result)
             for item in result['ability_feature_library_all_list']:
                 if item:
                     ability_feature_library = self.search([("name", '=', item['name'])])
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index 0a20a676..9ab4e5b8 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -1,7 +1,7 @@
 from odoo import models, fields, api
 from odoo.modules import get_resource_path
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+# from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import write_stl_file
 from odoo.exceptions import ValidationError, UserError
 from odoo.addons.sf_base.commons.common import Common
 from datetime import datetime
@@ -89,10 +89,10 @@ class QuickEasyOrder(models.Model):
 
     # 将attach的datas内容转为glb文件
     def transition_glb_file(self, report_path, model_code):
-        shapes = read_step_file(report_path)
+        # shapes = read_step_file(report_path)
         # output_file = os.path.join('C:/Users/43484/Desktop/机企猫工作文档', str(model_code) + '.stl')
         output_file = os.path.join('/tmp', str(model_code) + '.stl')
-        write_stl_file(shapes, output_file, 'binary', 0.03, 0.5)
+        # write_stl_file(shapes, output_file, 'binary', 0.03, 0.5)
         # 转化为glb
         # output_glb_file = os.path.join('C:/Users/43484/Desktop/机企猫工作文档', str(model_code) + '.glb')
         output_glb_file = os.path.join('/tmp', str(model_code) + '.glb')

From 9acdcc04294a8621e215e1b041a23e69fb009777 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Fri, 13 Oct 2023 17:29:34 +0800
Subject: [PATCH 02/21] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=8C=E6=AD=A5cloud?=
 =?UTF-8?q?=E7=9A=84=E5=88=80=E5=85=B7=E6=A0=87=E5=87=86=E5=BA=93=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/__manifest__.py                     |   2 +-
 sf_base/models/tool_base.py                 | 304 -------
 sf_base/models/tool_base_new.py             | 229 +++---
 sf_base/security/ir.model.access.csv        |   1 +
 sf_base/views/tool_base_menu.xml            | 234 ------
 sf_base/views/tool_base_views.xml           | 849 --------------------
 sf_base/views/tool_menu.xml                 |  23 +-
 sf_base/views/tool_views.xml                | 326 ++++----
 sf_dlm/views/product_template_view.xml      |  12 -
 sf_manufacturing/models/product_template.py |  34 +-
 sf_mrs_connect/models/res_config_setting.py |   5 +-
 sf_mrs_connect/models/sync_common.py        | 149 +++-
 12 files changed, 406 insertions(+), 1762 deletions(-)
 delete mode 100644 sf_base/models/tool_base.py
 delete mode 100644 sf_base/views/tool_base_menu.xml
 delete mode 100644 sf_base/views/tool_base_views.xml

diff --git a/sf_base/__manifest__.py b/sf_base/__manifest__.py
index 60077453..0aa2daa0 100644
--- a/sf_base/__manifest__.py
+++ b/sf_base/__manifest__.py
@@ -10,7 +10,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['account', 'base', 'mrp_workorder', 'sale'],
+    'depends': ['account', 'base', 'mrp_workorder', 'sale', 'sf_maintenance'],
     'data': [
         'security/group_security.xml',
         'security/ir.model.access.csv',
diff --git a/sf_base/models/tool_base.py b/sf_base/models/tool_base.py
deleted file mode 100644
index 2d7d7028..00000000
--- a/sf_base/models/tool_base.py
+++ /dev/null
@@ -1,304 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging
-
-from odoo import fields, models, api
-# from odoo.exceptions import UserError
-# # from odoo.addons import sf_base, sf_common
-# from datetime import datetime
-
-
-# 功能刀具物料
-class CuttingToolMaterial(models.Model):
-    _name = 'sf.cutting.tool.material'
-    _description = '刀具物料'
-
-    code = fields.Char('编码')
-    name = fields.Char('名称')
-    remark = fields.Char('备注')
-    active = fields.Boolean('有效', default=True)
-
-
-# 功能刀具
-class FunctionalCuttingTool(models.Model):
-    _name = 'sf.functional.cutting.tool'
-    _description = '功能刀具'
-
-    code = fields.Char('编码')
-    name = fields.Char('名称')
-    functional_model_number = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型')
-    integral_model_number = fields.Many2one('sf.integral.cutting.tool', string='整体式刀具型号')
-    blade_model_number = fields.Many2one('sf.blade', string='刀片型号')
-    cutterbar_model_number = fields.Many2one('sf.cutter.bar', string='刀杆型号')
-    cutterpad_model_number = fields.Many2one('sf.cutter.pad', string='刀盘型号')
-    handle_model_number = fields.Many2one('sf.handle', string='刀柄型号')
-    chuck_model_number = fields.Many2one('sf.chuck', string='夹头型号')
-    diameter = fields.Float('直径(mm)')
-    tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
-                                  string='刀具等级')
-    machining_accuracy = fields.Float('加工精度(mm)')
-    tool_length = fields.Float('装刀长')
-    blade_number = fields.Integer('刃数')
-    integral_blade_length = fields.Float('整体刃长(mm)')
-    effective_blade_length = fields.Float('有效刃长(mm)')
-    max_life = fields.Float('最大寿命值')
-    is_standard = fields.Boolean('是否标准刀')
-    applicable_range = fields.Char('适用范围')
-    image = fields.Binary('图片')
-    active = fields.Boolean('有效', default=True)
-
-
-# 功能刀具类型
-class FunctionalCuttingToolModel(models.Model):
-    _name = 'sf.functional.cutting.tool.model'
-    _description = '功能刀具类型'
-
-    name = fields.Char('名称')
-    code = fields.Char('编码')
-    remark = fields.Char('备注')
-    active = fields.Boolean('有效', default=True)
-
-
-# 整体式刀具
-class IntegralCuttingTool(models.Model):
-    _name = 'sf.integral.cutting.tool'
-    _description = '整体式刀具'
-
-    code = fields.Char('编码')
-    name = fields.Char('型号名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    # 整体式刀具类型字段，关联整体式刀具类型对象
-    integral_model_number = fields.Many2one('sf.integral.cutting.tool.model', '整体式刀具类型')
-    # 增加品牌、总长度(mm)、柄部长度(mm)、刃部长度(mm)、直径(mm)、刃数、前角(°)、后角(°)、主偏角(°)、材料型号、配对螺母(mm)、适用夹头型号、适用范围、图片、创建人、创建时间等字段
-    brand = fields.Many2one('sf.machine.brand', '品牌')
-    total_length = fields.Float('总长度(mm)')
-    shank_length = fields.Float('柄部长度(mm)')
-    blade_length = fields.Float('刃部长度(mm)')
-    diameter = fields.Float('直径(mm)')
-    blade_number = fields.Integer('刃数')
-    front_angle = fields.Float('前角(°)')
-    rear_angle = fields.Float('后角(°)')
-    main_included_angle = fields.Float('主偏角(°)')
-    material_model = fields.Many2one('sf.materials.model', '材料型号')
-    nut = fields.Float('配对螺母(mm)')
-    # 适用夹头型号可以多选
-    chuck_model = fields.Many2many('sf.chuck', string='适用夹头型号')
-    scope = fields.Char('适用范围')
-    image = fields.Binary('图片')
-    active = fields.Boolean('有效', default=True)
-
-
-# 整体式刀具类型
-class IntegralCuttingToolModel(models.Model):
-    _name = 'sf.integral.cutting.tool.model'
-    _description = '整体式刀具类型'
-
-    code = fields.Char('编码')
-    name = fields.Char('名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    remark = fields.Char('备注')
-
-
-# 刀片
-class Blade(models.Model):
-    _name = 'sf.blade'
-    _description = '刀片'
-
-    code = fields.Char('编码')
-    name = fields.Char('型号名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    # 刀片类型字段，关联刀片类型对象
-    blade_model_number = fields.Many2one('sf.blade.model', '刀片类型')
-    # 编码、型号名称、刀片类型、品牌、长度L(mm)、宽度D(mm)、高度T(mm)、顶角(°)、前角(°)、后角(°)、主偏角(°)、R角(°)、材料型号、加工硬度、配对螺母(mm)、适用刀杆/刀盘型号、刀尖半径(mm)、图片、创建人、创建时间字段
-    brand = fields.Many2one('sf.machine.brand', '品牌', )
-    length = fields.Float('长度L(mm)')
-    width = fields.Float('宽度D(mm)')
-    height = fields.Float('高度T(mm)')
-    top_angle = fields.Float('顶角(°)')
-    front_angle = fields.Float('前角(°)')
-    rear_angle = fields.Float('后角(°)')
-    main_included_angle = fields.Float('主偏角(°)')
-    r_angle = fields.Float('R角(°)')
-    material_model = fields.Many2one('sf.materials.model', '材料型号')
-    hardness = fields.Char('加工硬度')
-    nut = fields.Float('配对螺母(mm)')
-    # 适用刀杆型号可以多选
-    cutter_bar = fields.Many2many('sf.cutter.bar', string='适用刀杆型号')
-    # 适用刀盘型号可以多选
-    cutter_pad = fields.Many2many('sf.cutter.pad', string='适用刀盘型号')
-    radius = fields.Float('刀尖半径(mm)')
-    image = fields.Binary('图片')
-
-
-# 刀片类型
-class BladeModel(models.Model):
-    _name = 'sf.blade.model'
-    _description = '刀片类型'
-
-    code = fields.Char('编码')
-    name = fields.Char('名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    # 刀片类型字段，关联刀片对象
-    blade_ids = fields.One2many('sf.blade', 'blade_model_number', '刀片类型')
-    remark = fields.Char('备注')
-
-
-# 刀杆
-class CutterBar(models.Model):
-    _name = 'sf.cutter.bar'
-    _description = '刀杆'
-
-    code = fields.Char('编码')
-    name = fields.Char('型号名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    # 刀杆类型字段，关联刀杆类型对象
-    cutter_bar_model_number = fields.Many2one('sf.cutter.bar.model', '刀杆类型')
-    # 品牌、C柄径(mm)、L总长(mm)、材料型号、刃数、D刃径(mm)、适用刀片型号、配对扳手(mm)、配备螺丝(mm)、刀尖圆角半径、精度等级、硬度(°)、适用范围、图片、创建人、创建时间
-    brand = fields.Many2one('sf.machine.brand', '品牌')
-    c_diameter = fields.Float('C柄径(mm)')
-    total_length = fields.Float('L总长(mm)')
-    material_model = fields.Many2one('sf.materials.model', '材料型号')
-    blade_number = fields.Integer('刃数')
-    d_diameter = fields.Float('D刃径(mm)')
-    blade = fields.Many2many('sf.blade', string='适用刀片型号')
-    wrench = fields.Float('配对扳手(mm)')
-    screw = fields.Float('配备螺丝(mm)')
-    radius = fields.Float('刀尖圆角半径')
-    accuracy = fields.Char('精度等级')
-    hardness = fields.Char('硬度(°)')
-    scope = fields.Char('适用范围')
-    image = fields.Binary('图片')
-
-
-# 刀杆类型
-class CutterBarModel(models.Model):
-    _name = 'sf.cutter.bar.model'
-    _description = '刀杆类型'
-
-    code = fields.Char('编码')
-    name = fields.Char('名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    remark = fields.Char('备注')
-
-
-# 刀盘
-class CutterPad(models.Model):
-    _name = 'sf.cutter.pad'
-    _description = '刀盘'
-
-    code = fields.Char('编码')
-    name = fields.Char('型号名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    # 刀盘类型字段，关联刀盘类型对象
-    cutter_pad_model_number = fields.Many2one('sf.cutter.pad.model', '刀盘类型')
-    # 增加品牌、C柄径(mm)、L总长(mm)、材料型号、刃数、D刃径(mm)、适用刀片型号、配对扳手(mm)、配备螺丝(mm)、刀尖圆角半径、精度等级、硬度(°)、适用范围、图片、创建人、创建时间
-    brand = fields.Many2one('sf.machine.brand', '品牌')
-    c_diameter = fields.Float('C柄径(mm)')
-    total_length = fields.Float('L总长(mm)')
-    material_model = fields.Many2one('sf.materials.model', '材料型号')
-    blade_number = fields.Integer('刃数')
-    d_diameter = fields.Float('D刃径(mm)')
-    blade = fields.Many2many('sf.blade', string='适用刀片型号')
-    wrench = fields.Float('配对扳手(mm)')
-    screw = fields.Float('配备螺丝(mm)')
-    radius = fields.Float('刀尖圆角半径')
-    accuracy = fields.Char('精度等级')
-    hardness = fields.Char('硬度(°)')
-    scope = fields.Char('适用范围')
-    image = fields.Binary('图片')
-
-
-# 刀盘类型
-class CutterPadModel(models.Model):
-    _name = 'sf.cutter.pad.model'
-    _description = '刀盘类型'
-
-    code = fields.Char('编码')
-    name = fields.Char('名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    remark = fields.Char('备注')
-
-
-# 刀柄
-class Handle(models.Model):
-    _name = 'sf.handle'
-    _description = '刀柄'
-
-    code = fields.Char('编码')
-    name = fields.Char('型号名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    # 刀柄类型字段，关联刀柄类型对象
-    handle_model_number = fields.Many2one('sf.handle.model', '刀柄类型')
-    # 增加、刀柄类型、品牌、L(mm)、L1(mm)、D1(mm)、重量(kg)、材料型号、本体精度(mm)、配对螺母(mm)、适用夹头型号、夹持范围(mm)、检测精度、检测硬度、标准转速、图片、创建人、创建时间
-    brand = fields.Many2one('sf.machine.brand', '品牌')
-    length = fields.Float('L(mm)')
-    length1 = fields.Float('L1(mm)')
-    diameter1 = fields.Float('D1(mm)')
-    weight = fields.Float('重量(kg)')
-    material_model = fields.Many2one('sf.materials.model', '材料型号')
-    body_accuracy = fields.Float('本体精度(mm)')
-    nut = fields.Float('配对螺母(mm)')
-    chuck_model = fields.Many2many('sf.chuck.model', string='适用夹头型号')
-    clamping_range = fields.Float('夹持范围(mm)')
-    detection_accuracy = fields.Float('检测精度')
-    detection_hardness = fields.Char('检测硬度')
-    standard_speed = fields.Float('标准转速')
-    image = fields.Binary('图片')
-
-
-# 刀柄类型
-class HandleModel(models.Model):
-    _name = 'sf.handle.model'
-    _description = '刀柄类型'
-
-    code = fields.Char('编码')
-    name = fields.Char('名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    remark = fields.Char('备注')
-
-
-# 夹头对象（夹头型号对象）
-class Chuck(models.Model):
-    _name = 'sf.chuck'
-    _description = '夹头'
-    _rec_name = 'code'
-
-    code = fields.Char('编码')
-    name = fields.Char('型号名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    # 夹头类型字段，关联夹头类型对象
-    chuck_model_number = fields.Many2one('sf.chuck.model', '夹头类型')
-    # 增加品牌、精度(mm)、外径(mm)、内径(mm)、高度(mm)、材料型号、配对螺母(mm)、适用刀柄型号、夹持范围(mm)、特性、图片、创建人、创建时间
-    brand = fields.Many2one('sf.machine.brand', '品牌')
-    accuracy = fields.Float('精度(mm)')
-    diameter = fields.Float('外径(mm)')
-    inner_diameter = fields.Float('内径(mm)')
-    height = fields.Float('高度(mm)')
-    material_model = fields.Many2one('sf.materials.model', '材料型号')
-    nut = fields.Float('配对螺母(mm)')
-    handle_model = fields.Many2many('sf.handle.model', string='适用刀柄型号')
-    clamping_range = fields.Float('夹持范围(mm)')
-    feature = fields.Char('特性')
-    image = fields.Binary('图片')
-
-
-# 夹头类型
-class ChuckModel(models.Model):
-    _name = 'sf.chuck.model'
-    _description = '夹头类型'
-
-    code = fields.Char('编码')
-    name = fields.Char('名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    remark = fields.Char('备注')
diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py
index fc62074e..5ed37a94 100644
--- a/sf_base/models/tool_base_new.py
+++ b/sf_base/models/tool_base_new.py
@@ -91,133 +91,6 @@ class FunctionalCuttingToolModel(models.Model):
     active = fields.Boolean('有效', default=True)
 
 
-# 刀具型号
-class CuttingToolModel(models.Model):
-    _name = 'sf.cutting.tool.model'
-    _description = '刀具型号'
-
-    name = fields.Char('名称')
-    cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', string='刀具物料')
-    cutting_tool_type = fields.Char(string="刀具物料类型", related='cutting_tool_material_id.name', store=True)
-    cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', string='刀具类型',
-                                           )
-    brand_id = fields.Many2one('sf.machine.brand', '品牌')
-    tool_length = fields.Integer('长度(mm)')
-    tool_width = fields.Integer('宽度(mm)')
-    tool_height = fields.Integer('高度(mm)')
-    tool_thickness = fields.Integer('厚度(mm)')
-    tool_weight = fields.Float('重量(kg)')
-    coating_material = fields.Char('涂层材质')
-
-    # 整体式刀具参数
-    total_length = fields.Float('总长度(mm)')
-    shank_length = fields.Float('柄部长度(mm)')
-    blade_length = fields.Float('刃部长度(mm)')
-    diameter = fields.Float('直径(mm)')
-    blade_number = fields.Integer('刃数')
-    front_angle = fields.Float('前角(°)')
-    rear_angle = fields.Float('后角(°)')
-    main_included_angle = fields.Float('主偏角(°)')
-    material_model_id = fields.Many2one('sf.materials.model', '材料型号')
-    nut = fields.Float('配对螺母(mm)')
-    # 适用夹头型号可以多选
-    chuck_ids = fields.Many2many(
-        'sf.cutting.tool.model',
-        relation='cutting_tool_model_handle_chuck_rel',
-        column1='model_id_1',
-        column2='model_id_2',
-        domain="[('cutting_tool_type', '=', '夹头')]",
-        string='适用夹头型号')
-    # 刀片参数
-    top_angle = fields.Float('顶角(°)')
-    jump_accuracy = fields.Float('径跳精度(um)')
-    working_hardness = fields.Char('加工硬度(hrc)')
-    cutter_bar_ids = fields.Many2many(
-        'sf.cutting.tool.model',
-        relation='cutting_tool_model_blade_cutter_bar_rel',
-        column1='model_id_1',
-        column2='model_id_2',
-        domain="[('cutting_tool_type', '=', '刀杆')]",
-        string='适用刀杆型号'
-    )
-    cutter_pad_ids = fields.Many2many(
-        'sf.cutting.tool.model',
-        relation='cutting_tool_model_blade_cutter_pad_rel',
-        column1='model_id_1',
-        column2='model_id_2',
-        domain="[('cutting_tool_type', '=', '刀盘')]",
-        string='适用刀盘型号'  # 使用空列表作为默认值
-    )
-    # 刀杆/参数
-    blade_diameter = fields.Float('刃径(mm)')
-    blade_ids = fields.Many2many(
-        'sf.cutting.tool.model',
-        relation='cutting_tool_model_pad_blade_rel',
-        column1='model_id_1',
-        column2='model_id_2',
-        domain="[('cutting_tool_type', '=', '刀片')]",
-        string='适用刀片型号'  # 使用空列表作为默认值
-    )
-    wrench = fields.Float('配对扳手(mm)')
-    screw = fields.Float('配备螺丝(mm)')
-    accuracy_level = fields.Char('精度等级')
-    # 刀柄参数
-    diameter_max = fields.Float('最大直径(mm)')
-    clamping_diameter = fields.Float('夹持直径(mm)')
-    flange_length = fields.Float('法兰柄长度(mm)')
-    flange_diameter = fields.Float('法兰直径(mm)')
-    # 夹头参数
-    outer_diameter = fields.Float('外径(mm)')
-    inner_diameter = fields.Float('内径(mm)')
-    handle_ids = fields.Many2many(
-        'sf.cutting.tool.model',
-        relation='cutting_tool_model_chuck_handle_rel',
-        column1='model_id_1',
-        column2='model_id_2',
-        domain="[('cutting_tool_type', '=', '刀柄')]",
-        string='适用刀柄型号'
-    )
-    active = fields.Boolean('有效', default=True)
-
-    def _get_code(self, cutting_tool_type_code):
-        cutting_tool_model = self.search(
-            [('code', 'ilike', cutting_tool_type_code)],
-            limit=1,
-            order="id desc")
-        if not cutting_tool_model:
-            num = "%03d" % 1
-        else:
-            m = int(cutting_tool_model.code[-3:]) + 1
-            num = "%03d" % m
-        return "%s%s" % (cutting_tool_type_code, num)
-
-    code = fields.Char(string='编码', readonly=True)
-
-    def _onchange_cutting_tool_material_id(self, cutting_tool_material_id):
-        if cutting_tool_material_id:
-            if cutting_tool_material_id.name == "整体式刀具":
-                code = self._get_code("JKM-T-DJWL-ZTDJ-")
-            elif cutting_tool_material_id.name == "刀片":
-                code = self._get_code("JKM-T-DJWL-DPIA-")
-            elif cutting_tool_material_id.name == "刀杆":
-                code = self._get_code("JKM-T-DJWL-DGAN-")
-            elif cutting_tool_material_id.name == "刀盘":
-                code = self._get_code("JKM-T-DJWL-DPAN-")
-            elif cutting_tool_material_id.name == "夹头":
-                code = self._get_code("JKM-T-DJWL-DJIA-")
-            else:
-                code = self._get_code("JKM-T-DJWL-DBIN-")
-        return code
-
-    @api.model_create_multi
-    def create(self, vals):
-        obj = super(CuttingToolModel, self).create(vals)
-        if obj.cutting_tool_material_id:
-            code = self._onchange_cutting_tool_material_id(obj.cutting_tool_material_id)
-            obj.code = code
-        return obj
-
-
 # 刀具类型
 class CuttingToolType(models.Model):
     _name = 'sf.cutting.tool.type'
@@ -229,3 +102,105 @@ class CuttingToolType(models.Model):
     cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料')
     remark = fields.Char('备注')
     active = fields.Boolean('有效', default=True)
+
+
+# 刀具标准库
+class CuttingToolModel(models.Model):
+    _name = 'sf.cutting_tool.standard.library'
+    _description = '刀具标准库'
+
+    code = fields.Char(string='编码')
+    name = fields.Char('名称')
+    # 关联刀具物料
+    cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料', required=True)
+    # 刀具物料类型
+    cutting_tool_type = fields.Char(related='cutting_tool_material_id.name', string='刀具物料类型',
+                                    store=True)
+    # 关联刀具类型
+    cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', '类型',
+                                           domain="[('cutting_tool_material_id.name', '=', cutting_tool_type)]")
+    brand_id = fields.Many2one('sf.machine.brand', '品牌')
+    status = fields.Boolean(string='状态', default=False)
+    image = fields.Binary('图片')
+
+    # 整体式刀具参数
+    material_model_id = fields.Many2one('mrs.materials.model', '刀具材质')
+    tool_hardness = fields.Integer('刀具硬度(hrc)')
+    coating_material = fields.Char('涂层材质')
+    blade_type = fields.Char('刃部类型')
+    integral_coarse_medium_fine = fields.Selection([('粗', '粗'), ('中', '中'), ('精', '精')], '粗/中/精')
+    integral_run_out_accuracy_max = fields.Char('整体式刀具端跳精度max')
+    integral_run_out_accuracy_min = fields.Char('整体式刀具端跳精度min')
+
+    fit_blade_shape_ids = fields.Many2many('maintenance.equipment.image', 'fit_blade_shape_library_rel',
+                                           '适配刀片形状', domain=[('type', '=', '刀片形状')])
+    suitable_machining_method_ids = fields.Many2many('maintenance.equipment.image',
+                                                     'suitable_machining_method_library_rel',
+                                                     '适合加工方式', domain=[('type', '=', '加工能力')])
+    blade_tip_characteristics_ids = fields.Many2many('maintenance.equipment.image',
+                                                     'blade_tip_character_library_rel',
+                                                     '刀尖特征', domain=[('type', '=', '刀尖特征')])
+    handle_type_ids = fields.Many2many('maintenance.equipment.image', 'handle_type_library_rel',
+                                       '柄部类型', domain=[('type', '=', '柄部类型')])
+    cutting_direction_ids = fields.Many2many('maintenance.equipment.image', 'cutting_direction_library_rel',
+                                             '走刀方向', domain=[('type', '=', '走刀方向')])
+    suitable_coolant_ids = fields.Many2many('maintenance.equipment.image', 'suitable_coolant_library_rel',
+                                            '适合冷却液', domain=[('type', '=', '冷却液')])
+    compaction_way_ids = fields.Many2many('maintenance.equipment.image', 'compaction_way_library_rel',
+                                          '压紧方式', domain=[('type', '=', '压紧方式')])
+    # tool_materials_basic_parameters_ids = fields.One2many('mrs.tool.materials.basic.parameters',
+    #                                                       'cutting_tool_model_id', string='基本参数')
+    # cutting_speed_ids = fields.One2many('mrs.cutting.speed', 'cutting_tool_model_id', string='切削速度Vc')
+    # feed_per_tooth_ids = fields.One2many('mrs.feed.per.tooth', 'cutting_tool_model_id', '每齿走刀量fz')
+
+    material_model_id = fields.Many2one('sf.materials.model', '材料型号')
+    nut = fields.Float('配对螺母(mm)')
+    # 适用夹头型号可以多选
+    chuck_ids = fields.Many2many(
+        'sf.cutting.tool.type',
+        relation='cutting_tool_type_library_handle_chuck_rel',
+        column1='model_id_1',
+        column2='model_id_2',
+        domain="[('cutting_tool_material_id.name', '=', '夹头')]",
+        string='适用夹头型号')
+
+    working_hardness = fields.Char('加工硬度(hrc)')
+    cutter_bar_ids = fields.Many2many(
+        'sf.cutting.tool.type',
+        relation='cutting_tool_type_library_cutter_bar_rel',
+        column1='model_id_1',
+        column2='model_id_2',
+        domain="[('cutting_tool_material_id.name', '=', '刀杆')]",
+        string='适用刀杆型号'
+    )
+    cutter_pad_ids = fields.Many2many(
+        'sf.cutting.tool.type',
+        relation='cutting_tool_type_library_cutter_pad_rel',
+        column1='model_id_1',
+        column2='model_id_2',
+        domain="[('cutting_tool_material_id.name', '=', '刀盘')]",
+        string='适用刀盘型号'  # 使用空列表作为默认值
+    )
+    # 刀杆/参数
+    blade_diameter = fields.Float('刃径(mm)')
+    blade_ids = fields.Many2many(
+        'sf.cutting.tool.type',
+        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.type',
+        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)
+
+    def get_cutter_bar_ids(self):
+        return self.cutter_bar_ids
diff --git a/sf_base/security/ir.model.access.csv b/sf_base/security/ir.model.access.csv
index 1829085c..39ee21cf 100644
--- a/sf_base/security/ir.model.access.csv
+++ b/sf_base/security/ir.model.access.csv
@@ -26,6 +26,7 @@ access_sf_functional_fixture,sf_functional_fixture,model_sf_functional_fixture,b
 access_sf_sync_common,sf_sync_common,model_sf_sync_common,base.group_user,1,1,1,1
 access_sf_international_standards,sf_international_standards,model_sf_international_standards,base.group_user,1,1,1,1
 access_material_apply,material_apply,model_material_apply,base.group_user,1,1,1,1
+access_sf_cutting_tool_standard_library,sf_cutting_tool_standard_library,model_sf_cutting_tool_standard_library,base.group_user,1,1,1,1
 
 
 
diff --git a/sf_base/views/tool_base_menu.xml b/sf_base/views/tool_base_menu.xml
deleted file mode 100644
index 6bd12d74..00000000
--- a/sf_base/views/tool_base_menu.xml
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<odoo>
-    <data>
-        <!-- action -->
-        <record id="action_sf_cutting_tool" model="ir.actions.act_window">
-            <field name="name">整体式刀具型号</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.integral.cutting.tool</field>
-<!--             <field name="view_type">form</field> -->
-            <field name="view_mode">tree,form</field>
-        </record>
-        <!-- 功能刀具action -->
-        <record id="action_sf_functional_cutting_tool" model="ir.actions.act_window">
-            <field name="name">功能刀具</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.functional.cutting.tool</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-        <!-- 刀片action -->
-        <record id="action_sf_cutting_tool_blade" model="ir.actions.act_window">
-            <field name="name">刀片型号</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.blade</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-<!--         刀杆action -->
-        <record id="action_sf_cutting_tool_rod" model="ir.actions.act_window">
-            <field name="name">刀杆型号</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.cutter.bar</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-<!--         刀盘action -->
-        <record id="action_sf_cutting_tool_disc" model="ir.actions.act_window">
-            <field name="name">刀盘型号</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.cutter.pad</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-<!--         刀柄action -->
-        <record id="action_sf_cutting_tool_handle" model="ir.actions.act_window">
-            <field name="name">刀柄型号</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.handle</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-<!--         夹头action -->
-        <record id="action_sf_cutting_tool_clamp_head" model="ir.actions.act_window">
-            <field name="name">夹头型号</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.chuck</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-<!--         功能刀具类型action -->
-        <record id="action_sf_functional_cutting_tool_type" model="ir.actions.act_window">
-            <field name="name">功能刀具类型</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.functional.cutting.tool.model</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-<!--         整体式刀具类型action -->
-        <record id="action_sf_integral_cutting_tool_type" model="ir.actions.act_window">
-            <field name="name">整体式刀具类型</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.integral.cutting.tool.model</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-<!--         刀片类型action -->
-        <record id="action_sf_cutting_tool_blade_type" model="ir.actions.act_window">
-            <field name="name">刀片类型</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.blade.model</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-<!--         刀杆类型action -->
-        <record id="action_sf_cutting_tool_rod_type" model="ir.actions.act_window">
-            <field name="name">刀杆类型</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.cutter.bar.model</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-<!--         刀盘类型action -->
-        <record id="action_sf_cutting_tool_disc_type" model="ir.actions.act_window">
-            <field name="name">刀盘类型</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.cutter.pad.model</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-<!--         刀柄类型action -->
-        <record id="action_sf_cutting_tool_handle_type" model="ir.actions.act_window">
-            <field name="name">刀柄类型</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.handle.model</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-<!--         夹头类型action -->
-        <record id="action_sf_cutting_tool_clamp_head_type" model="ir.actions.act_window">
-            <field name="name">夹头类型</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.chuck.model</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-<!--         刀具物料action -->
-        <record id="action_sf_cutting_tool_material" model="ir.actions.act_window">
-            <field name="name">刀具物料</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.cutting.tool.material</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-<!-- 功能刀具 -->
-<!--        <menuitem-->
-<!--                id="menu_sf_functional_cutting_tool"-->
-<!--                parent="menu_sf_base"-->
-<!--                name="功能刀具"-->
-<!--                sequence="3"-->
-<!--                action="action_sf_functional_cutting_tool"-->
-<!--                />-->
-<!-- 刀具物料 -->
-        <menuitem
-                id="menu_sf_cutting_tool_material"
-                parent="menu_sf_base"
-                name="刀具物料"
-                sequence="1"
-                action="action_sf_cutting_tool_material"
-                />
-
-
-        <!-- 整体式刀具 -->
-        <menuitem
-                id="menu_sf_integral_cutting_tool"
-                parent="menu_sf_base"
-                name="整体式刀具型号"
-                sequence="9"
-                action="action_sf_cutting_tool"
-                />
-        <!-- 刀片 -->
-        <menuitem
-                id="menu_sf_cutting_tool_blade"
-                parent="menu_sf_base"
-                name="刀片型号"
-                sequence="12"
-                action="action_sf_cutting_tool_blade"
-                />
-<!--         刀杆 -->
-        <menuitem
-                id="menu_sf_cutting_tool_rod"
-                parent="menu_sf_base"
-                name="刀杆型号"
-                sequence="16"
-                action="action_sf_cutting_tool_rod"
-                />
-<!--         刀盘 -->
-        <menuitem
-                id="menu_sf_cutting_tool_disc"
-                parent="menu_sf_base"
-                name="刀盘型号"
-                sequence="20"
-                action="action_sf_cutting_tool_disc"
-                />
-<!--         刀柄 -->
-        <menuitem
-                id="menu_sf_cutting_tool_handle"
-                parent="menu_sf_base"
-                name="刀柄型号"
-                sequence="28"
-                action="action_sf_cutting_tool_handle"
-                />
-<!--         夹头 -->
-        <menuitem
-                id="menu_sf_cutting_tool_clamp_head"
-                parent="menu_sf_base"
-                name="夹头型号"
-                sequence="36"
-                action="action_sf_cutting_tool_clamp_head"
-                />
-<!--         功能刀具类型 -->
-        <menuitem
-                id="menu_sf_functional_cutting_tool_type"
-                parent="menu_sf_base"
-                name="功能刀具类型"
-                sequence="40"
-                action="action_sf_functional_cutting_tool_type"
-                />
-<!--         整体式刀具类型 -->
-        <menuitem
-                id="menu_sf_integral_cutting_tool_type"
-                parent="menu_sf_base"
-                name="整体式刀具类型"
-                sequence="44"
-                action="action_sf_integral_cutting_tool_type"
-                />
-<!--         刀片类型 -->
-        <menuitem
-                id="menu_sf_cutting_tool_blade_type"
-                parent="menu_sf_base"
-                name="刀片类型"
-                sequence="48"
-                action="action_sf_cutting_tool_blade_type"
-                />
-<!--         刀杆类型 -->
-        <menuitem
-                id="menu_sf_cutting_tool_rod_type"
-                parent="menu_sf_base"
-                name="刀杆类型"
-                sequence="52"
-                action="action_sf_cutting_tool_rod_type"
-                />
-<!--         刀盘类型 -->
-        <menuitem
-                id="menu_sf_cutting_tool_disc_type"
-                parent="menu_sf_base"
-                name="刀盘类型"
-                sequence="56"
-                action="action_sf_cutting_tool_disc_type"
-                />
-<!--         刀柄类型 -->
-        <menuitem
-                id="menu_sf_cutting_tool_handle_type"
-                parent="menu_sf_base"
-                name="刀柄类型"
-                sequence="60"
-                action="action_sf_cutting_tool_handle_type"
-                />
-<!--         夹头类型 -->
-        <menuitem
-                id="menu_sf_cutting_tool_clamp_head_type"
-                parent="menu_sf_base"
-                name="夹头类型"
-                sequence="64"
-                action="action_sf_cutting_tool_clamp_head_type"
-                />
-    </data>
-</odoo>
diff --git a/sf_base/views/tool_base_views.xml b/sf_base/views/tool_base_views.xml
deleted file mode 100644
index ce16146c..00000000
--- a/sf_base/views/tool_base_views.xml
+++ /dev/null
@@ -1,849 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<odoo>
-    <data>
-<!-- 刀具物料tree view -->
-        <record id="view_cutting_tool_material_tree" model="ir.ui.view">
-            <field name="name">sf.cutting.tool.material.tree</field>
-            <field name="model">sf.cutting.tool.material</field>
-            <field name="arch" type="xml">
-                <tree string="刀具物料">
-                    <field name="code"/>
-                    <field name="name" string="名称"/>
-                    <field name="remark"/>
-                </tree>
-            </field>
-        </record>
-<!--         刀具物料form view -->
-        <record id="view_cutting_tool_material_form" model="ir.ui.view">
-            <field name="name">sf.cutting.tool.material.form</field>
-            <field name="model">sf.cutting.tool.material</field>
-            <field name="arch" type="xml">
-                <form string="刀具物料">
-                    <sheet>
-                        <group col='1'>
-                            <group string='基本信息'>
-                                <group>
-                                <field name="code"/>
-                                <field name="name" string="名称"/>
-                                </group>
-                                <group>
-                                    <field name="remark"/>
-                                </group>
-                            </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-
-<!-- ================================================刀具物料视图================================================ -->
-    <record model="ir.ui.view" id="view_cutting_tool_material_search">
-        <field name="name">sf.cutting.tool.material.search</field>
-        <field name="model">sf.cutting.tool.material</field>
-        <field name="arch" type="xml">
-            <search string="刀具物料">
-                <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
-                <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
-
-            </search>
-        </field>
-    </record>
-        <!--         功能刀具tree view -->
-        <record id="view_functional_cutting_tool_tree" model="ir.ui.view">
-            <field name="name">sf.functional.cutting.tool.tree</field>
-            <field name="model">sf.functional.cutting.tool</field>
-            <field name="arch" type="xml">
-                <tree string="功能刀具">
-                    <field name="code" />
-                    <field name="name" />
-                    <field name="functional_model_number" />
-                    <field name="integral_model_number"/>
-                    <field name="blade_model_number" optional="hide"/>
-                    <field name="cutterbar_model_number" optional="hide"/>
-                    <field name="cutterpad_model_number" optional="hide"/>
-                    <field name="handle_model_number" optional="hide"/>
-                    <field name="chuck_model_number" optional="hide"/>
-                    <field name="diameter" optional="show"/>
-                    <field name="tool_grade" optional="show"/>
-                    <field name="machining_accuracy" optional="hide"/>
-                    <field name="tool_length" optional="show"/>
-                    <field name="blade_number" optional="show"/>
-                    <field name="integral_blade_length" optional="show"/>
-                    <field name="effective_blade_length" optional="show"/>
-                    <field name="max_life" optional="show"/>
-                    <field name="is_standard" optional="show"/>
-                    <field name="applicable_range" optional="show"/>
-                    <field name="image" widget='image' optional="show"/>
-
-                </tree>
-            </field>
-        </record>
-<!--         form view -->
-        <record id="view_functional_cutting_tool_form" model="ir.ui.view">
-            <field name="name">sf.functional.cutting.tool.form</field>
-            <field name="model">sf.functional.cutting.tool</field>
-            <field name="arch" type="xml">
-                <form string="功能刀具">
-                    <sheet>
-                        <group col='1'>
-                            <group string='基本信息'>
-                                <group>
-                                <field name="code"/>
-                                <field name="name"/>
-                                <field name="functional_model_number"/>
-                                <field name="integral_model_number"/>
-                                <field name="blade_model_number"/>
-                                <field name="cutterbar_model_number"/>
-                                <field name="cutterpad_model_number"/>
-                                <field name="handle_model_number"/>
-                                <field name="chuck_model_number"/>
-                                </group>
-                                <group>
-                                    <field name="image" nolabel="1" widget="image"/>
-                                </group>
-
-                            </group>
-                                <group string='参数信息'>
-                                    <group>
-                                        <field name="diameter"/>
-                                        <field name="tool_grade"/>
-                                        <field name="machining_accuracy"/>
-                                        <field name="tool_length"/>
-                                        <field name="blade_number"/>
-                                    </group>
-                                    <group>
-                                        <field name="integral_blade_length"/>
-                                        <field name="effective_blade_length"/>
-                                        <field name="max_life"/>
-                                        <field name="is_standard"/>
-                                    </group>
-                                </group>
-                                <group string='其他信息'>
-                                    <group>
-                                        <field name="applicable_range"/>
-
-                                    </group>
-                                </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-<!--         功能刀具search view -->
-    <record model="ir.ui.view" id="view_sf_functional_cutting_tool_search">
-        <field name="name">sf.functional.cutting.tool.search</field>
-        <field name="model">sf.functional.cutting.tool</field>
-        <field name="arch" type="xml">
-            <search string="功能刀具">
-                <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
-                <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
-            </search>
-        </field>
-    </record>
-
-        <!-- 整体式刀具tree view -->
-        <record id="view_integral_cutting_tool_tree" model="ir.ui.view">
-            <field name="name">sf.integral.cutting.tool.tree</field>
-            <field name="model">sf.integral.cutting.tool</field>
-            <field name="arch" type="xml">
-                <tree string="整体式刀具">
-                    <field name="code"/>
-                    <field name="name"/>
-                    <field name="integral_model_number"/>
-                    <field name="brand"/>
-                    <field name="image" widget='image'/>
-
-                </tree>
-            </field>
-        </record>
-
-        <!-- form view -->
-        <record id="view_integral_cutting_tool_form" model="ir.ui.view">
-            <field name="name">sf.integral.cutting.tool.form</field>
-            <field name="model">sf.integral.cutting.tool</field>
-            <field name="arch" type="xml">
-                <form string="整体式刀具">
-                    <sheet>
-                        <group col='1'>
-                            <group string='基本信息'>
-                                <group>
-                                <field name="code"/>
-                                <field name="name"/>
-                                <field name="integral_model_number"/>
-                                <field name="brand"/>
-                                <field name="cutting_tool_material"/>
-                                </group>
-                                <group>
-                                    <field name="image" nolabel="1" widget="image"/>
-                                </group>
-
-                            </group>
-                                <group string='参数信息'>
-                                <group>
-                                <field name="total_length"/>
-                                <field name="shank_length"/>
-                                <field name="blade_length"/>
-                                <field name="diameter"/>
-                                <field name="blade_number"/>
-                                <field name="chuck_model" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
-
-                                </group>
-                                <group>
-                                <field name="front_angle"/>
-                                <field name="rear_angle"/>
-                                <field name="main_included_angle"/>
-                                <field name="material_model"/>
-                                </group>
-                            </group>
-                            <group string='其他信息'>
-                                <group>
-                                <field name="nut"/>
-                                <field name="scope"/>
-
-                                </group>
-
-                            </group>
-
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-<!--         整体式刀具search view -->
-        <record model="ir.ui.view" id="view_integral_cutting_tool_search">
-            <field name="name">sf.integral.cutting.tool.search</field>
-            <field name="model">sf.integral.cutting.tool</field>
-            <field name="arch" type="xml">
-                <search string="整体式刀具">
-                    <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
-                    <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
-                </search>
-            </field>
-        </record>
-<!--         刀片tree -->
-        <record id="view_blade_tree" model="ir.ui.view">
-            <field name="name">sf.blade.tree</field>
-            <field name="model">sf.blade</field>
-            <field name="arch" type="xml">
-                <tree string="刀片">
-                    <field name="code"/>
-                    <field name="name"/>
-                    <field name="blade_model_number"/>
-                    <field name="image" widget='image'/>
-
-                </tree>
-            </field>
-        </record>
-<!--         刀片form -->
-        <record id="view_blade_form" model="ir.ui.view">
-            <field name="name">sf.blade.form</field>
-            <field name="model">sf.blade</field>
-            <field name="arch" type="xml">
-                <form string="刀片">
-                    <sheet>
-                        <group col='1'>
-                            <group string='基本信息'>
-                                <group>
-                                <field name="code"/>
-                                <field name="name"/>
-                                <field name="blade_model_number"/>
-                                <field name="brand" options="{'no_create': True, 'no_quick_create': True}"/>
-                                <field name="cutting_tool_material"/>
-                                </group>
-                                <group>
-                                    <field name="image" nolabel="1" widget="image"/>
-                                </group>
-
-                            </group>
-                                <group string='参数信息'>
-                                <group>
-                                <field name="length"/>
-                                <field name="width"/>
-                                <field name="height"/>
-                                <field name="top_angle"/>
-                                <field name="front_angle"/>
-                                <field name="cutter_bar" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
-                                <field name="cutter_pad" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
-                                </group>
-                                <group>
-                                <field name="main_included_angle"/>
-                                <field name="r_angle"/>
-                                <field name="material_model"/>
-                                <field name="hardness"/>
-                                <field name="radius"/>
-                                <field name="rear_angle"/>
-                                </group>
-                            </group>
-                            <group string='其他信息'>
-                                <group>
-                                <field name="nut"/>
-                                </group>
-                            </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-<!--         刀片search view -->
-        <record model="ir.ui.view" id="view_blade_search">
-            <field name="name">sf.blade.search</field>
-            <field name="model">sf.blade</field>
-            <field name="arch" type="xml">
-                <search string="刀片">
-                    <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
-                    <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
-                </search>
-            </field>
-        </record>
-<!--         刀杆tree -->
-        <record id="view_cutter_bar_tree" model="ir.ui.view">
-            <field name="name">sf.cutter.bar.tree</field>
-            <field name="model">sf.cutter.bar</field>
-            <field name="arch" type="xml">
-                <tree string="刀杆">
-                    <field name="code"/>
-                    <field name="name"/>
-                    <field name="cutter_bar_model_number"/>
-                    <field name="image" widget='image'/>
-
-                </tree>
-            </field>
-        </record>
-<!--         刀杆form -->
-        <record id="view_cutter_bar_form" model="ir.ui.view">
-            <field name="name">sf.cutter.bar.form</field>
-            <field name="model">sf.cutter.bar</field>
-            <field name="arch" type="xml">
-                <form string="刀杆">
-                    <sheet>
-                        <group col='1'>
-                            <group string='基本信息'>
-                                <group>
-                                <field name="code"/>
-                                <field name="name"/>
-                                <field name="cutter_bar_model_number"/>
-                                <field name="brand"/>
-                                <field name="cutting_tool_material"/>
-                                <field name="blade" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
-
-                                </group>
-                                <group>
-                                    <field name="image" nolabel="1" widget="image"/>
-                                </group>
-
-                            </group>
-                                <group string='参数信息'>
-                                <group>
-                                <field name="c_diameter"/>
-                                <field name="total_length"/>
-                                <field name="material_model"/>
-                                <field name="blade_number"/>
-                                </group>
-                                <group>
-                                <field name="d_diameter"/>
-                                <field name="radius"/>
-                                <field name="accuracy"/>
-                                <field name="hardness"/>
-
-                                </group>
-                            </group>
-                            <group string='其他信息'>
-                                <group>
-                                <field name="wrench"/>
-                                <field name="screw"/>
-                                </group>
-                                <group>
-                                <field name="scope"/>
-
-                                </group>
-                            </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-<!--         刀杆search view -->
-        <record model="ir.ui.view" id="view_cutter_bar_search">
-            <field name="name">sf.cutter.bar.search</field>
-            <field name="model">sf.cutter.bar</field>
-            <field name="arch" type="xml">
-                <search string="刀杆">
-                    <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
-                    <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
-                </search>
-            </field>
-        </record>
-
-<!--         刀盘tree -->
-        <record id="view_cutter_pad_tree" model="ir.ui.view">
-            <field name="name">sf.cutter.pad.tree</field>
-            <field name="model">sf.cutter.pad</field>
-            <field name="arch" type="xml">
-                <tree string="刀盘">
-                    <field name="code"/>
-                    <field name="name"/>
-                    <field name="cutter_pad_model_number"/>
-                    <field name="image" widget='image'/>
-
-                </tree>
-            </field>
-        </record>
-<!--         刀盘form -->
-        <record id="view_cutter_pad_form" model="ir.ui.view">
-            <field name="name">sf.cutter.pad.form</field>
-            <field name="model">sf.cutter.pad</field>
-            <field name="arch" type="xml">
-                <form string="刀盘">
-                    <sheet>
-                        <group col='1'>
-                            <group string='基本信息'>
-                                <group>
-                                <field name="code"/>
-                                <field name="name"/>
-                                <field name="cutter_pad_model_number"/>
-                                <field name="brand"/>
-                                <field name="cutting_tool_material"/>
-                                <field name="blade" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
-
-                                </group>
-                                <group>
-                                    <field name="image" nolabel="1" widget="image"/>
-                                </group>
-
-                            </group>
-                                <group string='参数信息'>
-                                <group>
-                                <field name="c_diameter"/>
-                                <field name="total_length"/>
-                                <field name="material_model"/>
-                                <field name="blade_number"/>
-                                </group>
-                                <group>
-                                <field name="d_diameter"/>
-                                <field name="radius"/>
-                                <field name="accuracy"/>
-                                <field name="hardness"/>
-                                </group>
-                            </group>
-                            <group string='其他信息'>
-                                <group>
-                                <field name="wrench"/>
-                                <field name="screw"/>
-                                </group>
-                                <group>
-                                <field name="scope"/>
-                                </group>
-                            </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-<!--         刀盘search view -->
-        <record model="ir.ui.view" id="view_cutter_pad_search">
-            <field name="name">sf.cutter.pad.search</field>
-            <field name="model">sf.cutter.pad</field>
-            <field name="arch" type="xml">
-                <search string="刀盘">
-                    <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
-                    <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
-                </search>
-            </field>
-        </record>
-
-<!--         刀柄tree -->
-        <record id="view_cutter_handle_tree" model="ir.ui.view">
-            <field name="name">sf.cutter.handle.tree</field>
-            <field name="model">sf.handle</field>
-            <field name="arch" type="xml">
-                <tree string="刀柄">
-                    <field name="code"/>
-                    <field name="name"/>
-                    <field name="handle_model_number"/>
-                    <field name="image" widget='image'/>
-
-                </tree>
-            </field>
-        </record>
-<!--         刀柄form -->
-        <record id="view_cutter_handle_form" model="ir.ui.view">
-            <field name="name">sf.cutter.handle.form</field>
-            <field name="model">sf.handle</field>
-            <field name="arch" type="xml">
-                <form string="刀柄">
-                    <sheet>
-                        <group col='1'>
-                            <group string='基本信息'>
-                                <group>
-                                <field name="code"/>
-                                <field name="name"/>
-                                <field name="handle_model_number"/>
-                                <field name="brand"/>
-                                <field name="cutting_tool_material"/>
-                                <field name="chuck_model" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
-
-                                </group>
-                                <group>
-                                    <field name="image" nolabel="1" widget="image"/>
-                                </group>
-
-                            </group>
-                                <group string='参数信息'>
-                                <group>
-                                <field name="length"/>
-                                <field name="length1"/>
-                                <field name="diameter1"/>
-                                <field name="weight"/>
-                                <field name="material_model"/>
-                                </group>
-                                <group>
-                                <field name="body_accuracy"/>
-                                <field name="clamping_range"/>
-                                <field name="detection_accuracy"/>
-                                <field name="detection_hardness"/>
-                                <field name="standard_speed"/>
-                                </group>
-                            </group>
-                            <group string='其他信息'>
-                                <group>
-                                <field name="nut"/>
-                                </group>
-<!--                                 <group> -->
-<!--                                 <field name="scope"/> -->
-<!--                                 <field name="blade"/> -->
-<!--                                 </group> -->
-                            </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-<!--         刀柄search view -->
-        <record model="ir.ui.view" id="view_handle_search">
-            <field name="name">sf.handle.search</field>
-            <field name="model">sf.handle</field>
-            <field name="arch" type="xml">
-                <search string="刀柄">
-                    <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
-                    <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
-                </search>
-            </field>
-        </record>
-
-<!--         夹头tree -->
-        <record id="view_cutter_chuck_tree" model="ir.ui.view">
-            <field name="name">sf.cutter.chuck.tree</field>
-            <field name="model">sf.chuck</field>
-            <field name="arch" type="xml">
-                <tree string="夹头">
-                    <field name="code"/>
-                    <field name="name"/>
-                    <field name="chuck_model_number"/>
-                    <field name="image" widget='image'/>
-
-                </tree>
-            </field>
-        </record>
-<!--         夹头form -->
-        <record id="view_cutter_chuck_form" model="ir.ui.view">
-            <field name="name">sf.cutter.chuck.form</field>
-            <field name="model">sf.chuck</field>
-            <field name="arch" type="xml">
-                <form string="夹头">
-                    <sheet>
-                        <group col='1'>
-                            <group string='基本信息'>
-                                <group>
-                                <field name="code"/>
-                                <field name="name"/>
-                                <field name="chuck_model_number"/>
-                                <field name="brand"/>
-                                <field name="cutting_tool_material"/>
-                                <field name="handle_model" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
-
-                                </group>
-                                <group>
-                                    <field name="image" nolabel="1" widget="image"/>
-                                </group>
-
-                            </group>
-                                <group string='参数信息'>
-                                <group>
-                                <field name="accuracy"/>
-                                <field name="diameter"/>
-                                <field name="inner_diameter"/>
-                                <field name="height"/>
-                                </group>
-                                <group>
-                                <field name="material_model"/>
-                                <field name="clamping_range"/>
-                                <field name="feature"/>
-                                </group>
-                            </group>
-                            <group string='其他信息'>
-                                <group>
-                                <field name="nut"/>
-                                </group>
-<!--                                 <group> -->
-<!--                                 <field name="scope"/> -->
-<!--                                 <field name="blade"/> -->
-<!--                                 </group> -->
-                            </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-<!--         夹头search view -->
-        <record model="ir.ui.view" id="view_chuck_search">
-            <field name="name">sf.chuck.search</field>
-            <field name="model">sf.chuck</field>
-            <field name="arch" type="xml">
-                <search string="夹头">
-                    <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
-                    <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
-                </search>
-            </field>
-        </record>
-
-<!--         功能刀具类型tree -->
-        <record id="view_cutter_function_tree" model="ir.ui.view">
-            <field name="name">sf.cutter.function.tree</field>
-            <field name="model">sf.functional.cutting.tool.model</field>
-            <field name="arch" type="xml">
-                <tree string="功能刀具类型">
-                    <field name="name"/>
-                    <field name="code"/>
-                    <field name="remark"/>
-
-                </tree>
-            </field>
-        </record>
-<!--         功能刀具类型form -->
-        <record id="view_cutter_function_form" model="ir.ui.view">
-            <field name="name">sf.cutter.function.form</field>
-            <field name="model">sf.functional.cutting.tool.model</field>
-            <field name="arch" type="xml">
-                <form string="功能刀具类型">
-                    <sheet>
-                        <group string="功能刀具类型">
-                        <group>
-                            <field name="code"/>
-                            <field name="name"/>
-                        </group>
-                        <group>
-                            <field name="remark"/>
-                        </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-<!--         整体式刀具类型tree -->
-        <record id="view_integral_cutting_tool_model_tree" model="ir.ui.view">
-            <field name="name">sf.integral.cutting.tool.model.tree</field>
-            <field name="model">sf.integral.cutting.tool.model</field>
-            <field name="arch" type="xml">
-                <tree string="整体式刀具类型">
-                    <field name="name"/>
-                    <field name="code"/>
-                    <field name="remark"/>
-
-                </tree>
-            </field>
-        </record>
-<!--         整体式刀具类型form -->
-        <record id="view_integral_cutting_tool_model_form" model="ir.ui.view">
-            <field name="name">sf.integral.cutting.tool.model.form</field>
-            <field name="model">sf.integral.cutting.tool.model</field>
-            <field name="arch" type="xml">
-                <form string="整体式刀具类型">
-                    <sheet>
-                        <group string="整体式刀具类型">
-                        <group>
-                            <field name="code"/>
-                            <field name="name"/>
-                            <field name="cutting_tool_material"/>
-                        </group>
-                        <group>
-                            <field name="remark"/>
-                        </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-<!--         刀片类型tree -->
-        <record id="view_blade_model_tree" model="ir.ui.view">
-            <field name="name">sf.blade.model.tree</field>
-            <field name="model">sf.blade.model</field>
-            <field name="arch" type="xml">
-                <tree string="刀片类型">
-                    <field name="name"/>
-                    <field name="code"/>
-                    <field name="remark"/>
-
-                </tree>
-            </field>
-        </record>
-<!--         刀片类型form -->
-        <record id="view_blade_model_form" model="ir.ui.view">
-            <field name="name">sf.blade.model.form</field>
-            <field name="model">sf.blade.model</field>
-            <field name="arch" type="xml">
-                <form string="刀片类型">
-                    <sheet>
-                        <group string="刀片类型">
-                        <group>
-                            <field name="code"/>
-                            <field name="name"/>
-                            <field name="cutting_tool_material"/>
-                        </group>
-                        <group>
-                            <field name="remark"/>
-                        </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-<!--         刀杆类型tree -->
-        <record id="view_cutter_bar_model_tree" model="ir.ui.view">
-            <field name="name">sf.cutter.bar.model.tree</field>
-            <field name="model">sf.cutter.bar.model</field>
-            <field name="arch" type="xml">
-                <tree string="刀杆类型">
-                    <field name="code"/>
-                    <field name="name"/>
-                    <field name="remark"/>
-
-                </tree>
-            </field>
-        </record>
-<!--         刀杆类型form -->
-        <record id="view_cutter_bar_model_form" model="ir.ui.view">
-            <field name="name">sf.cutter.bar.model.form</field>
-            <field name="model">sf.cutter.bar.model</field>
-            <field name="arch" type="xml">
-                <form string="刀杆类型">
-                    <sheet>
-                        <group string="刀杆类型">
-                        <group>
-                            <field name="code"/>
-                            <field name="name"/>
-                            <field name="cutting_tool_material"/>
-                        </group>
-                        <group>
-                            <field name="remark"/>
-                        </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-<!--         刀盘类型tree -->
-        <record id="view_cutter_pad_model_tree" model="ir.ui.view">
-            <field name="name">sf.cutter.pad.model.tree</field>
-            <field name="model">sf.cutter.pad.model</field>
-            <field name="arch" type="xml">
-                <tree string="刀盘类型">
-                    <field name="code"/>
-                    <field name="name"/>
-                    <field name="remark"/>
-
-                </tree>
-            </field>
-        </record>
-<!--         刀盘类型form -->
-        <record id="view_cutter_pad_model_form" model="ir.ui.view">
-            <field name="name">sf.cutter.pad.model.form</field>
-            <field name="model">sf.cutter.pad.model</field>
-            <field name="arch" type="xml">
-                <form string="刀盘类型">
-                    <sheet>
-                        <group string="刀盘类型">
-                        <group>
-                            <field name="code"/>
-                            <field name="name"/>
-                            <field name="cutting_tool_material"/>
-                        </group>
-                        <group>
-                            <field name="remark"/>
-                        </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-<!--         刀柄类型tree -->
-        <record id="view_handle_model_tree" model="ir.ui.view">
-            <field name="name">sf.handle.model.tree</field>
-            <field name="model">sf.handle.model</field>
-            <field name="arch" type="xml">
-                <tree string="刀柄类型">
-                    <field name="code"/>
-                    <field name="name"/>
-                    <field name="remark"/>
-
-                </tree>
-            </field>
-        </record>
-<!--         刀柄类型form -->
-        <record id="view_handle_model_form" model="ir.ui.view">
-            <field name="name">sf.handle.model.form</field>
-            <field name="model">sf.handle.model</field>
-            <field name="arch" type="xml">
-                <form string="刀柄类型">
-                    <sheet>
-                        <group string="刀柄类型">
-                        <group>
-                            <field name="code"/>
-                            <field name="name"/>
-                            <field name="cutting_tool_material"/>
-                        </group>
-                        <group>
-                            <field name="remark"/>
-                        </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-<!--         夹头类型tree -->
-        <record id="view_chuck_model_tree" model="ir.ui.view">
-            <field name="name">sf.chuck.model.tree</field>
-            <field name="model">sf.chuck.model</field>
-            <field name="arch" type="xml">
-                <tree string="夹头类型">
-                    <field name="code"/>
-                    <field name="name"/>
-                    <field name="remark"/>
-
-                </tree>
-            </field>
-        </record>
-<!--         夹头类型form -->
-        <record id="view_chuck_model_form" model="ir.ui.view">
-            <field name="name">sf.chuck.model.form</field>
-            <field name="model">sf.chuck.model</field>
-            <field name="arch" type="xml">
-                <form string="夹头类型">
-                    <sheet>
-                        <group string="夹头类型">
-                        <group>
-                            <field name="code"/>
-                            <field name="name"/>
-                            <field name="cutting_tool_material"/>
-                        </group>
-                        <group>
-                            <field name="remark"/>
-                        </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-    </data>
-</odoo>
diff --git a/sf_base/views/tool_menu.xml b/sf_base/views/tool_menu.xml
index 4f6bb693..378277e5 100644
--- a/sf_base/views/tool_menu.xml
+++ b/sf_base/views/tool_menu.xml
@@ -16,11 +16,11 @@
             <field name="res_model">sf.cutting.tool.type</field>
             <field name="view_mode">tree</field>
         </record>
-        <!--         刀具型号action -->
-        <record id="action_sf_cutting_tool" model="ir.actions.act_window">
-            <field name="name">刀具型号</field>
+        <!--         刀具标准库action -->
+        <record id="action_sf_cutting_tool_standard_library" model="ir.actions.act_window">
+            <field name="name">刀具标准库</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sf.cutting.tool.model</field>
+            <field name="res_model">sf.cutting_tool.standard.library</field>
             <field name="view_mode">tree,form</field>
         </record>
         <!-- 功能刀具action -->
@@ -61,14 +61,13 @@
                 sequence="2"
                 action="action_sf_cutting_tool_type"
         />
-        <!--          刀具型号 -->
-<!--        <menuitem-->
-<!--                id="menu_sf_integral_cutting_tool"-->
-<!--                parent="menu_sf_cutting_tool"-->
-<!--                name="刀具型号"-->
-<!--                sequence="3"-->
-<!--                action="action_sf_cutting_tool"-->
-<!--        />-->
+        <menuitem
+                id="menu_sf_cutting_tool_standard_library"
+                parent="menu_sf_cutting_tool"
+                name="刀具标准库"
+                sequence="3"
+                action="action_sf_cutting_tool_standard_library"
+        />
         <!--           功能刀具 -->
 <!--        <menuitem-->
 <!--                id="menu_sf_functional_cutting_tool"-->
diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index ee5546a8..8d837dc7 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -14,29 +14,6 @@
             </field>
         </record>
 
-        <!--    <record id="view_cutting_tool_material_form" model="ir.ui.view">-->
-        <!--        <field name="name">sf.cutting.tool.material.form</field>-->
-        <!--        <field name="model">sf.cutting.tool.material</field>-->
-        <!--        <field name="arch" type="xml">-->
-        <!--            <form string="刀具物料">-->
-        <!--                <sheet>-->
-        <!--                    <group col='1'>-->
-        <!--                        <group string='基本信息'>-->
-        <!--                            <group>-->
-        <!--                            <field name="code"/>-->
-        <!--                            <field name="name"/>-->
-        <!--                            </group>-->
-        <!--                            <group>-->
-        <!--                                <field name="remark"/>-->
-        <!--                            </group>-->
-
-        <!--                        </group>-->
-        <!--                    </group>-->
-        <!--                </sheet>-->
-        <!--            </form>-->
-        <!--        </field>-->
-        <!--    </record>-->
-
         <record model="ir.ui.view" id="view_cutting_tool_material_search">
             <field name="name">sf.cutting.tool.material.search</field>
             <field name="model">sf.cutting.tool.material</field>
@@ -160,25 +137,6 @@
                 </tree>
             </field>
         </record>
-        <!--    <record id="view_cutter_function_form" model="ir.ui.view">-->
-        <!--        <field name="name">sf.cutter.function.form</field>-->
-        <!--        <field name="model">sf.functional.cutting.tool.model</field>-->
-        <!--        <field name="arch" type="xml">-->
-        <!--            <form string="功能刀具类型">-->
-        <!--                <sheet>-->
-        <!--                    <group string="功能刀具类型">-->
-        <!--                    <group>-->
-        <!--                        <field name="code"/>-->
-        <!--                        <field name="name"/>-->
-        <!--                    </group>-->
-        <!--                    <group>-->
-        <!--                        <field name="remark"/>-->
-        <!--                    </group>-->
-        <!--                    </group>-->
-        <!--                </sheet>-->
-        <!--            </form>-->
-        <!--        </field>-->
-        <!--    </record>-->
 
         <!--     功能刀具类型搜索 -->
         <record model="ir.ui.view" id="view_cutter_function_search">
@@ -193,148 +151,178 @@
             </field>
         </record>
 
-        <!-- ================================================刀具型号================================================ -->
-        <record id="view_cutting_tool_model_tree" model="ir.ui.view">
-            <field name="name">sf.cutting.tool.model.tree</field>
-            <field name="model">sf.cutting.tool.model</field>
+        <!-- ================================================刀具标准库================================================ -->
+        <record id="view_cutting_tool_standard_library_tree" model="ir.ui.view">
+            <field name="name">sf.cutting_tool.standard.library.tree</field>
+            <field name="model">sf.cutting_tool.standard.library</field>
             <field name="arch" type="xml">
-                <tree string="刀具型号" edit="0" delete="0" create="1">
-                    <field name="code"/>
-                    <field name="name" string="名称"/>
+                <tree string="刀具标准库" delete="0" create="0" edit="0">
+                    <field name="code" readonly="True"/>
+                    <field name="name" readonly="True" string="型号名称"/>
                     <field name="cutting_tool_material_id"/>
+                    <field name="cutting_tool_type_id"/>
+                    <field name="brand_id"/>
                 </tree>
             </field>
         </record>
 
-        <record id="view_cutting_tool_model_form" model="ir.ui.view">
-            <field name="name">sf.cutting.tool.model.form</field>
-            <field name="model">sf.cutting.tool.model</field>
+        <record id="view_cutting_tool_standard_library_form" model="ir.ui.view">
+            <field name="name">sf.cutting_tool.standard.library.form</field>
+            <field name="model">sf.cutting_tool.standard.library</field>
             <field name="arch" type="xml">
-                <form string="刀具型号" edit="0" delete="0" create="1">
+                <form string="刀具标准库" delete="0" create="0" edit="0">
                     <sheet>
+                        <field name="image" widget='image' class="oe_avatar"
+                               options="{'zoom': true, 'preview_image':'image_128'}"/>
                         <div class="oe_title">
                             <h1>
-                                <field name="name" placeholder="e.g. LED Monitor"/>
+                                <field name="code"/>
                             </h1>
                         </div>
                         <group>
                             <group>
-                                <field name="code" />
-                                <field name="cutting_tool_material_id"
-                                       options="{'no_create': True, 'no_quick_create': True}"/>
-                                <field name="cutting_tool_type" invisible="1"/>
+                                <field name="name"/>
+                                <field name="cutting_tool_material_id"/>
+                                <field name="cutting_tool_type"/>
+                                <field name="cutting_tool_type_id"/>
+                                <field name="brand_id"/>
+                                <label for="integral_run_out_accuracy_min" string="端跳精度"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <div class="o_address_format"
+                                     attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
+                                    <label for="integral_run_out_accuracy_min" string="最小"/>
+                                    <field name="integral_run_out_accuracy_min" class="o_address_zip"
+                                           options="{'format': false}"/>
+                                    <span>(mm)&amp;nbsp;</span>
+                                    <label for="integral_run_out_accuracy_max" string="最大"/>
+                                    <field name="integral_run_out_accuracy_max" class="o_address_zip"
+                                           options="{'format': false}"/>
+                                    <span>(mm)&amp;nbsp;</span>
+                                </div>
+                                <field name="cutter_bar_ids" widget="many2many_tags"
+                                       options="{'no_create': True}" search="[]"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutter_pad_ids" widget="many2many_tags"
+                                       options="{'no_create': True}" search="[]"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                            </group>
+                            <group>
+                                <field name="material_model_id" placeholder="请选择" string="材质"
+                                       attrs="{'required': [('cutting_tool_type', 'not in', ['刀柄', '夹头'])]}"/>
+                                <field name="tool_hardness" string="硬度(hrc)" options="{'format': false}"
+                                       widget="integer"/>
+                                <field name="coating_material"/>
+                                <field name="blade_type"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="integral_coarse_medium_fine" placeholder="请选择"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
                             </group>
-                            <!--                            <group>-->
-                            <!--                                <field name="image" nolabel="1" widget="image"/>-->
-                            <!--                            </group>-->
                         </group>
-                        <notebook>
-                            <page string="参数"
-                                  attrs="{'invisible': [('cutting_tool_type', '=', False)]}">
-                                <group>
-                                    <!--整体式刀具-->
-                                    <group>
-                                        <field name="brand_id"/>
-                                        <field name="cutting_tool_type_id" />
-                                        <field name="material_model_id"/>
-                                        <field name="total_length"
-                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀柄'))]}"/>
-                                        <field name="shank_length"
-                                               attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                        <field name="blade_length"
-                                               attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-
-                                        <!--刀片-->
-                                        <label for="tool_length" string="尺寸(mm)"
-                                               attrs='{"invisible": [("cutting_tool_type","not in",("刀片","刀杆","刀盘"))]}'/>
-                                        <div class="test_model"
-                                             attrs='{"invisible": [("cutting_tool_type","not in",("刀片","刀杆","刀盘"))]}'>
-                                            <label for="tool_length" string="长"/>
-                                            <field name="tool_length" class="o_address_zip"
-                                                   options="{'format': false}"/>
-                                            <label for="tool_width" string="宽"/>
-                                            <field name="tool_width" class="o_address_zip"
-                                                   options="{'format': false}"/>
-                                            <label for="tool_thickness" string="厚"/>
-                                            <field name="tool_thickness" class="o_address_zip"
-                                                   options="{'format': false}"/>
-                                        </div>
-                                        <field name="diameter"
-                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片','刀杆','刀盘'))]}"/>
-                                        <field name="blade_diameter"
-                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
-                                        <field name="blade_number"
-                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片','刀杆','刀盘'))]}"/>
-                                        <field name="diameter_max"
-                                               attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
-                                        <field name="flange_length"
-                                               attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
-                                        <field name="flange_diameter"
-                                               attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
-                                        <!--夹头-->
-                                        <field name="outer_diameter"
-                                               attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
-                                        <field name="inner_diameter"
-                                               attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
-                                        <field name="tool_height"
-                                               attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
-                                        <field name="tool_weight"
-                                               attrs='{"invisible": [("cutting_tool_type","not in",("夹头","刀柄"))]}'/>
-                                        <field name="clamping_diameter"
-                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头','刀柄'))]}"/>
-                                        <field name="cutter_bar_ids" widget="many2many_tags"
-                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
-                                        <field name="cutter_pad_ids" widget="many2many_tags"
-                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
-                                        <field name="blade_ids" widget="many2many_tags"
-                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
-                                        <field name="chuck_ids" widget="many2many_tags"
-                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀柄'))]}"/>
-                                        <field name="handle_ids" widget="many2many_tags"
-                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头'))]}"/>
-                                    </group>
-                                    <group>
-                                        <field name="jump_accuracy"
-                                               attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
-                                        <field name="front_angle"
-                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
-                                        <field name="top_angle"
-                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
-                                        <field name="rear_angle"
-                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
-                                        <field name="main_included_angle"
-                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
-                                        <field name="coating_material"
-                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
-                                        <field name="accuracy_level"
-                                               attrs="{'invisible': [('cutting_tool_type', 'in', ('刀柄'))]}"/>
-                                        <field name="working_hardness"/>
-                                        <field name="wrench"
-                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头','刀柄','刀杆','刀盘' ))]}"/>
-                                        <field name="screw"
-                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头','刀柄'))]}"/>
-                                        <field name="nut"
-                                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
-                                    </group>
-                                </group>
-                            </page>
-                        </notebook>
+                        <group string="适配刀片形状"
+                               attrs="{'invisible': [('cutting_tool_type', 'in', ('刀柄','夹头','整体式刀具',False))]}">
+                            <field name="fit_blade_shape_ids" string="" widget="custom_many2many_checkboxes"/>
+                        </group>
+                        <group string="适合加工方式"
+                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
+                            <field name="suitable_machining_method_ids" string=""
+                                   widget="custom_many2many_checkboxes"/>
+                        </group>
+                        <group string="刀尖特征"
+                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
+                            <field name="blade_tip_characteristics_ids" string=""
+                                   widget="custom_many2many_checkboxes"/>
+                        </group>
+                        <group attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
+                            <group string="柄部类型" attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
+                                <field name="handle_type_ids" string="" widget="custom_many2many_checkboxes"/>
+                            </group>
+                            <group string="压紧方式"
+                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}">
+                                <field name="compaction_way_ids" string="" widget="custom_many2many_checkboxes"/>
+                            </group>
+                        </group>
+                        <group attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
+                            <group string="走刀方向">
+                                <field name="cutting_direction_ids" string="" widget="custom_many2many_checkboxes"/>
+                            </group>
+                            <group string="适合冷却液">
+                                <field name="suitable_coolant_ids" string="" widget="custom_many2many_checkboxes"/>
+                            </group>
+                        </group>
+                        <!--                        <notebook>-->
+                        <!--                            <page string="基本参数">-->
+                        <!--                                <field name="tool_materials_basic_parameters_ids">-->
+                        <!--                                    <tree editable="bottom" class="center">-->
+                        <!--                                        <field name="code"/>-->
+                        <!--                                        <field name="total_length"/>-->
+                        <!--                                        <field name="blade_diameter"/>-->
+                        <!--                                        <field name="blade_length"/>-->
+                        <!--                                        <field name="blade_number"/>-->
+                        <!--                                        <field name="neck_length"/>-->
+                        <!--                                        <field name="neck_diameter"/>-->
+                        <!--                                        <field name="handle_length"/>-->
+                        <!--                                        <field name="handle_diameter"/>-->
+                        <!--                                        <field name="blade_tip_diameter"/>-->
+                        <!--                                        <field name="blade_tip_working_size"/>-->
+                        <!--                                        <field name="blade_tip_taper"/>-->
+                        <!--                                        <field name="blade_helix_angle"/>-->
+                        <!--                                        <field name="blade_width"/>-->
+                        <!--                                        <field name="blade_depth"/>-->
+                        <!--                                        <field name="pitch"/>-->
+                        <!--                                        <field name="cutting_depth"/>-->
+                        <!--                                    </tree>-->
+                        <!--                                </field>-->
+                        <!--                            </page>-->
+                        <!--                            <page string="切削速度Vc"-->
+                        <!--                                  attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}">-->
+                        <!--                                <field name="cutting_speed_ids">-->
+                        <!--                                    <tree editable="bottom" class="center">-->
+                        <!--                                        <field name="execution_standard_id"/>-->
+                        <!--                                        <field name="material_code"/>-->
+                        <!--                                        <field name="material_name_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>-->
+                        <!--                            </page>-->
+                        <!--                            <page string="每齿走刀量fz"-->
+                        <!--                                  attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}">-->
+                        <!--                                <field name="feed_per_tooth_ids">-->
+                        <!--                                    <tree editable="bottom" class="center">-->
+                        <!--                                        <field name="cutting_speed"/>-->
+                        <!--                                        <field name="machining_method"/>-->
+                        <!--                                        <field name="materials_type_id"/>-->
+                        <!--                                        <field name="blade_diameter"/>-->
+                        <!--                                        <field name="feed_per_tooth"/>-->
+                        <!--                                        <field name="unit"/>-->
+                        <!--                                    </tree>-->
+                        <!--                                </field>-->
+                        <!--                            </page>-->
+                        <!--                        </notebook>-->
                     </sheet>
                 </form>
             </field>
         </record>
 
-        <!--     刀具型号搜索 -->
-        <record id="view_cutting_tool_model_search" model="ir.ui.view">
-            <field name="name">sf.cutting.tool.model.search</field>
-            <field name="model">sf.cutting.tool.model</field>
+        <record id="view_cutting_tool_standard_library_search" model="ir.ui.view">
+            <field name="name">sf.cutting_tool.standard.library.search</field>
+            <field name="model">sf.cutting_tool.standard.library</field>
             <field name="arch" type="xml">
-                <search string="刀具型号">
+                <search string="刀具标准库">
                     <field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
                     <field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
                     <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
                     <searchpanel class="account_root">
-                        <field name="cutting_tool_material_id" icon="fa-filter"/>
+                        <field name="cutting_tool_material_id" icon="fa-filter" enable_counters="1"/>
                     </searchpanel>
                 </search>
             </field>
@@ -355,27 +343,6 @@
             </field>
         </record>
 
-        <!--    <record id="view_cutting_tool_type_form" model="ir.ui.view">-->
-        <!--        <field name="name">sf.cutting.tool.type.form</field>-->
-        <!--        <field name="model">sf.cutting.tool.type</field>-->
-        <!--        <field name="arch" type="xml">-->
-        <!--            <form string="刀具类型">-->
-        <!--                <sheet>-->
-        <!--                    <group string="刀具类型">-->
-        <!--                    <group>-->
-        <!--                        <field name="code"/>-->
-        <!--                        <field name="name"/>-->
-        <!--                        <field name="mrs_cutting_tool_material_id" options="{'no_create': True, 'no_quick_create': True}"/>-->
-        <!--                    </group>-->
-        <!--                    <group>-->
-        <!--                        <field name="remark"/>-->
-        <!--                    </group>-->
-        <!--                    </group>-->
-        <!--                </sheet>-->
-        <!--            </form>-->
-        <!--        </field>-->
-        <!--    </record>-->
-
         <!--     刀具类型搜索 -->
         <record id="view_cutting_tool_type_search" model="ir.ui.view">
             <field name="name">sf.cutting.tool.type.search</field>
@@ -391,6 +358,5 @@
                 </search>
             </field>
         </record>
-
     </data>
 </odoo>
diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index 8c4ff1ae..ce888b90 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -51,18 +51,6 @@
                            attrs="{'invisible': ['|',('categ_type', '!=', '表面工艺'),('categ_type', '=', False)]}"/>
                     <field name="cutting_tool_material_id" attrs="{'invisible': [('categ_type', '!=', '刀具')]}"
                            placeholder="请选择"/>
-                    <!--                    <field name="cutting_tool_model_id" placeholder="请选择"-->
-                    <!--                           attrs="{'invisible': [('categ_type', '!=', '刀具')]}"/>-->
-                    <field name="cutting_tool_model" attrs="{'invisible': [('categ_type', '!=', '刀具')]}">
-                        <templates>
-
-                            <t t-foreach="cutting_tool_model_data" t-as="data">
-                                <td>
-                                    <t t-esc="cutting_tool_model_data.name"/>
-                                </td>
-                            </t>
-                        </templates>
-                    </field>
                     <field name="fixture_material_id" attrs="{'invisible': [('categ_type', '!=', '夹具')]}"
                            placeholder="请选择"/>
                     <field name="fixture_model_id" string="型号" placeholder="请选择"
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 9c3bc6cb..493da9fd 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -410,17 +410,25 @@ class ResProductMo(models.Model):
 
     @api.onchange('cutting_tool_material_id')
     def _onchange_cutting_tool_material_id(self):
-        try:
-            config = self.env['res.config.settings'].get_values()
-            headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
-            url = config['sf_url'] + '/api/cutting_model/list'
-            res = {'token': config['token'], 'cutting_tool_material_code': self.cutting_tool_material_id.code}
-            result = requests.post(url, json={}, data=res, headers=headers)
-            result = result.json()
-            if result['status'] == 1:
-                self.cutting_tool_model = result['data']
-        except Exception as e:
-            logging.info("获取刀具标准库失败")
+        if self.cutting_tool_material_id:
+            try:
+                config = self.env['res.config.settings'].get_values()
+                headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
+                url = config['sf_url'] + '/api/cutting_model/list'
+                res = {'token': config['token'], 'cutting_tool_material_code': self.cutting_tool_material_id.code}
+                result = requests.post(url, json={}, data=res, headers=headers)
+                result = result.json()
+                if result['status'] == 1:
+                    data = result['data']
+                    model_ids = []
+                    for item in data:
+                        model_ids.append((0, 0, {
+                            'name': item['name']
+                        }))
+                    self.cutting_tool_model = model_ids
+                return {}
+            except Exception as e:
+                logging.info("获取刀具标准库失败")
 
     @api.depends('cutting_tool_material_id')
     def _get_cutting_tool_model(self):
@@ -888,7 +896,8 @@ class SfMaintenanceEquipmentTool(models.Model):
     _description = '机床刀位'
 
     equipment_id = fields.Many2one('maintenance.equipment', string='设备')
-    product_template_id = fields.Many2one('product.template', string='功能刀具名称', domain="[('categ_type', '=', '刀具')]")
+    product_template_id = fields.Many2one('product.template', string='功能刀具名称',
+                                          domain="[('categ_type', '=', '刀具')]")
     image_1920 = fields.Binary('图片', related='product_template_id.image_1920')
     categ_type = fields.Char(string='功能刀具类型')
     diameter = fields.Char('直径')
@@ -900,4 +909,3 @@ class SfMaintenanceEquipmentTool(models.Model):
     alarm_value = fields.Char('报警值')
     used_value = fields.Char('已使用值')
     code = fields.Char('机床刀位号')
-
diff --git a/sf_mrs_connect/models/res_config_setting.py b/sf_mrs_connect/models/res_config_setting.py
index 02836d13..aa97ce4b 100644
--- a/sf_mrs_connect/models/res_config_setting.py
+++ b/sf_mrs_connect/models/res_config_setting.py
@@ -60,12 +60,11 @@ class ResConfigSettings(models.TransientModel):
             _logger.info("同步夹具型号")
             self.env['sf.fixture.model'].sync_all_fixture_model()
             _logger.info("同步功能夹具类型")
-            # self.env['sf.functional.fixture'].sync_all_functional_fixture()
-
             self.env['sf.functional.fixture.type'].sync_all_functional_fixture_type()
-
             self.env['sf.machine_tool.type'].sync_all_machine_tool_type()
             _logger.info("同步资源库机床型号完成")
+            self.env['sf.cutting_tool.standard.library'].sync_all_cutting_tool_standard_library()
+            _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 ebfacfbe..14b3d9be 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -56,6 +56,8 @@ class MrStaticResourceDataSync(models.Model):
             logging.info("刀具物料已每日同步成功")
             self.env['sf.cutting.tool.type'].sync_tool_type_yesterday()
             logging.info("刀具类型已每日同步成功")
+            self.env['sf.cutting_tool.standard.library'].sync_cutting_tool_standard_library_yesterday()
+            logging.info("刀具标准库已每日同步成功")
             self.env['sf.functional.cutting.tool.model'].sync_functional_cutting_tool_model_yesterday()
             logging.info("功能刀具类型已每日同步成功")
             self.env['maintenance.equipment.image'].sync_maintenance_equipment_image_yesterday()
@@ -378,7 +380,6 @@ class sfProductionProcess(models.Model):
             raise ValidationError("表面工艺认证未通过")
 
 
-
 class sfProcessingTechnology(models.Model):
     _inherit = 'sf.processing.technology'
     _description = '加工工艺'
@@ -1708,6 +1709,7 @@ class SfMaintenanceEquipmentImage(models.Model):
         else:
             raise ValidationError("认证未通过")
 
+
 class MaterialApply(models.Model):
     _inherit = 'material.apply'
     _description = '材料应用'
@@ -1726,19 +1728,17 @@ class MaterialApply(models.Model):
         result = json.loads(r['result'])
         if result['status'] == 1:
             for item in result['material_apply_yesterday_list']:
-                brand = self.env['material.apply'].search(
-                    [("name", '=', item['name'])])
-                if brand:
-                    brand.name = item['name'],
-                    brand.active = item['active']
+                material_apply = self.search([("name", '=', item['name'])])
+                if material_apply:
+                    material_apply.name = item['name']
+                    material_apply.active = item['active']
                 else:
-                    self.env['material.apply'].create({
+                    self.create({
                         "name": item['name'],
                         "active": item['active'],
-
                     })
         else:
-            raise ValidationError("认证未通过")
+            raise ValidationError("材料应用认证未通过")
 
     # 同步所有材料应用
     def sync_all_material_apply(self):
@@ -1753,15 +1753,18 @@ class MaterialApply(models.Model):
         result = json.loads(r['result'])
         if result['status'] == 1:
             for item in result['material_apply_all_list']:
-                brand = self.env['material.apply'].search(
-                    [("name", '=', item['name'])])
-                if not brand:
-                    self.env['material.apply'].create({
+                material_apply = self.search([("name", '=', item['name'])])
+                if not material_apply:
+                    self.create({
                         "name": item['name'],
                         "active": item['active'],
                     })
+                else:
+                    material_apply.name = item['name']
+                    material_apply.active = item['active']
         else:
-            raise ValidationError("认证未通过")
+            raise ValidationError("材料应用认证未通过")
+
 
 class ModelInternationalStandards(models.Model):
     _inherit = 'sf.international.standards'
@@ -1781,19 +1784,17 @@ class ModelInternationalStandards(models.Model):
         result = json.loads(r['result'])
         if result['status'] == 1:
             for item in result['mrs_international_standards_yesterday_list']:
-                brand = self.env['sf.international.standards'].search(
-                    [("name", '=', item['name'])])
-                if brand:
-                    brand.name = item['name'],
-                    brand.active = item['active']
+                international_standards = self.search([("name", '=', item['name'])])
+                if international_standards:
+                    international_standards.name = item['name']
+                    international_standards.active = item['active']
                 else:
-                    self.env['sf.international.standards'].create({
+                    self.create({
                         "name": item['name'],
                         "active": item['active'],
-
                     })
         else:
-            raise ValidationError("认证未通过")
+            raise ValidationError("制造标准认证未通过")
 
     # 同步所有制造标准
     def sync_all_mrs_international_standards(self):
@@ -1808,12 +1809,106 @@ class ModelInternationalStandards(models.Model):
         result = json.loads(r['result'])
         if result['status'] == 1:
             for item in result['mrs_international_standards_all_list']:
-                brand = self.env['sf.international.standards'].search(
-                    [("name", '=', item['name'])])
-                if not brand:
-                    self.env['sf.international.standards'].create({
+                international_standards = self.search([("name", '=', item['name'])])
+                if not international_standards:
+                    self.create({
+                        "name": item['name'],
+                        "active": item['active'],
+                    })
+                else:
+                    international_standards.name = item['name']
+                    international_standards.active = item['active']
+        else:
+            raise ValidationError("制造标准认证未通过")
+
+
+class Cutting_tool_standard_library(models.Model):
+    _inherit = 'sf.cutting_tool.standard.library'
+    _description = '刀具标准库'
+    url = '/api/cutting_tool_standard_library/list'
+
+    # 定时同步刀具标准库
+    def sync_cutting_tool_standard_library_yesterday(self):
+        sf_sync_config = self.env['res.config.settings'].get_values()
+        token = sf_sync_config['token']
+        sf_secret_key = sf_sync_config['sf_secret_key']
+        headers = Common.get_headers(self, token, sf_secret_key)
+
+        strUrl = sf_sync_config['sf_url'] + self.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_tool_standard_library_yesterday_list']:
+                cutting_tool_standard_library = self.search(
+                    [("code", '=', item['code'])])
+                if cutting_tool_standard_library:
+                    cutting_tool_standard_library.write(
+                        {"name": item['name'],
+                         "active": item['active']}
+                    )
+                else:
+                    self.create({
                         "name": item['name'],
                         "active": item['active'],
                     })
         else:
-            raise ValidationError("能力特征库认证未通过")
+            raise ValidationError("刀具标准库认证未通过")
+
+    # 同步所有刀具标准库
+    def sync_all_cutting_tool_standard_library(self):
+        sf_sync_config = self.env['res.config.settings'].get_values()
+        token = sf_sync_config['token']
+        sf_secret_key = sf_sync_config['sf_secret_key']
+        headers = Common.get_headers(self, token, sf_secret_key)
+
+        strUrl = sf_sync_config['sf_url'] + self.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_tool_standard_library_all_list']:
+                cutting_tool_standard_library = self.search([("code", '=', item['code'])])
+                cutting_tool_type = self.env['sf.cutting.tool.type'].search(
+                    [("code", '=', item['cutting_tool_type_code'])])
+                cutting_tool_material = self.env['sf.cutting.tool.material'].search(
+                    [("code", '=', item['cutting_tool_material_code'])])
+                materials_model = self.env['sf.materials.model'].search(
+                    [("code", '=', item['materials_model_code'])])
+                brand = self.env['sf.machine.brand'].search([("code", '=', item['brand_code'])])
+                if not cutting_tool_standard_library:
+                    self.create({
+                        "name": item['name'],
+                        "cutting_tool_material_id": cutting_tool_material.id,
+                        "cutting_tool_type_id": cutting_tool_type.id,
+                        "brand_id": brand.id,
+                        "material_model_id": materials_model.id,
+                        "tool_hardness": item['tool_hardness'],
+                        "coating_material": item['coating_material'],
+                        "blade_type": item['blade_type'],
+                        "blade_diameter": item['blade_diameter'],
+                        "working_hardness": item['working_hardness'],
+                        "integral_coarse_medium_fine": item['integral_coarse_medium_fine'],
+                        "integral_run_out_accuracy_max": item['integral_run_out_accuracy_max'],
+                        "integral_run_out_accuracy_min": item['integral_run_out_accuracy_min'],
+                        "active": item['active'],
+                    })
+                else:
+                    cutting_tool_standard_library.write(
+                        {"name": item['name'],
+                         "cutting_tool_material_id": cutting_tool_material.id,
+                         "cutting_tool_type_id": cutting_tool_type.id,
+                         "brand_id": brand.id,
+                         "material_model_id": materials_model.id,
+                         "tool_hardness": item['tool_hardness'],
+                         "coating_material": item['coating_material'],
+                         "blade_type": item['blade_type'],
+                         "blade_diameter": item['blade_diameter'],
+                         "working_hardness": item['working_hardness'],
+                         "integral_coarse_medium_fine": item['integral_coarse_medium_fine'],
+                         "integral_run_out_accuracy_max": item['integral_run_out_accuracy_max'],
+                         "integral_run_out_accuracy_min": item['integral_run_out_accuracy_min'],
+                         "active": item['active'], }
+                    )
+        else:
+            raise ValidationError("刀具标准库认证未通过")

From e7df6c14b1c7d84930d1b1edb52e78a022a59a04 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Thu, 19 Oct 2023 10:49:54 +0800
Subject: [PATCH 03/21] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/__manifest__.py                       |   2 +-
 sf_base/models/__init__.py                    |   1 +
 sf_base/models/tool_base_new.py               |  53 ++-
 sf_base/models/tool_other_features.py         | 282 +++++++++++
 sf_base/security/ir.model.access.csv          |   6 +-
 sf_base/views/tool_menu.xml                   |   7 +
 sf_base/views/tool_views.xml                  |  39 ++
 sf_dlm/__manifest__.py                        |   7 +-
 sf_dlm/views/product_template_view.xml        |   6 +-
 sf_maintenance/models/sf_maintenance.py       |  44 --
 sf_maintenance/security/ir.model.access.csv   |   1 -
 sf_maintenance/views/maintenance_views.xml    |  42 --
 sf_manufacturing/models/__init__.py           |   1 -
 sf_manufacturing/models/product_template.py   |  20 +-
 .../models/tool_other_features.py             | 441 ++++++++++--------
 sf_manufacturing/security/ir.model.access.csv |   9 -
 .../views/tool_other_features_view.xml        | 175 +------
 sf_mrs_connect/models/sync_common.py          |  24 +-
 18 files changed, 661 insertions(+), 499 deletions(-)
 create mode 100644 sf_base/models/tool_other_features.py

diff --git a/sf_base/__manifest__.py b/sf_base/__manifest__.py
index 0aa2daa0..60077453 100644
--- a/sf_base/__manifest__.py
+++ b/sf_base/__manifest__.py
@@ -10,7 +10,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['account', 'base', 'mrp_workorder', 'sale', 'sf_maintenance'],
+    'depends': ['account', 'base', 'mrp_workorder', 'sale'],
     'data': [
         'security/group_security.xml',
         'security/ir.model.access.csv',
diff --git a/sf_base/models/__init__.py b/sf_base/models/__init__.py
index 483787eb..93961162 100644
--- a/sf_base/models/__init__.py
+++ b/sf_base/models/__init__.py
@@ -3,6 +3,7 @@ from . import common
 from . import tool_base_new
 from . import fixture
 from . import functional_fixture
+from . import tool_other_features
 
 
 
diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py
index 5ed37a94..c0f84ed9 100644
--- a/sf_base/models/tool_base_new.py
+++ b/sf_base/models/tool_base_new.py
@@ -148,10 +148,10 @@ class CuttingToolModel(models.Model):
                                             '适合冷却液', domain=[('type', '=', '冷却液')])
     compaction_way_ids = fields.Many2many('maintenance.equipment.image', 'compaction_way_library_rel',
                                           '压紧方式', domain=[('type', '=', '压紧方式')])
-    # tool_materials_basic_parameters_ids = fields.One2many('mrs.tool.materials.basic.parameters',
-    #                                                       'cutting_tool_model_id', string='基本参数')
-    # cutting_speed_ids = fields.One2many('mrs.cutting.speed', 'cutting_tool_model_id', string='切削速度Vc')
-    # feed_per_tooth_ids = fields.One2many('mrs.feed.per.tooth', 'cutting_tool_model_id', '每齿走刀量fz')
+    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')
 
     material_model_id = fields.Many2one('sf.materials.model', '材料型号')
     nut = fields.Float('配对螺母(mm)')
@@ -204,3 +204,48 @@ class CuttingToolModel(models.Model):
 
     def get_cutter_bar_ids(self):
         return self.cutter_bar_ids
+
+
+class MaintenanceStandardImage(models.Model):
+    _name = 'maintenance.equipment.image'
+    _description = '能力特征库'
+
+    active = fields.Boolean('有效', default=True)
+    name = fields.Char('名称')
+    image = fields.Binary(string='图文')
+    type = fields.Selection(
+        [('加工能力', '加工能力'), ('刀尖特征', '刀尖特征'), ('柄部类型', '柄部类型'), ('走刀方向', '走刀方向'),
+         ('冷却液', '冷却液'), ('压紧方式', '压紧方式'), ('刀片形状', '刀片形状')],
+        string='特征')
+    equipment_id = fields.Many2many('maintenance.equipment', 'image_id', string='设备')
+
+    @api.model
+    def name_search(self, name='', args=None, operator='ilike', limit=100):
+        # 调用父类的name_search方法，获取原始的结果列表
+        res = super().name_search(name, args, operator, limit)
+        # 定义一个空字典用来存储id和name的映射关系
+        name_dict = {}
+        # 遍历结果列表，将id和name存入字典中
+        for item in res:
+            id = item[0]
+            name = item[1]
+            name_dict[id] = name
+        # 根据id列表搜索符合条件的记录
+        records = self.browse(name_dict.keys())
+        # 定义一个新的结果列表用来存储修改后的结果
+        new_res = []
+        # 遍历每条记录
+        for record in records:
+            # 获取记录的id，name和image属性
+            id = record.id
+            name = name_dict[id]
+            image = record.image
+            # 如果image不为空，将其转换为data URI scheme
+            if image:
+                data_uri = f"data:image/png;base64,{image.decode('utf-8')}"
+            else:
+                data_uri = ""
+            # 将这三个属性组成一个数组，并添加到结果列表中 result.append([id, name, data_uri]) # 返回结果列表 return result
+            new_res.append([id, name, data_uri])
+        # 返回新的结果列表
+        return new_res
diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py
new file mode 100644
index 00000000..97bb0645
--- /dev/null
+++ b/sf_base/models/tool_other_features.py
@@ -0,0 +1,282 @@
+from odoo import fields, models, api
+
+
+class ToolMaterialsBasicParameters(models.Model):
+    _name = 'sf.tool.materials.basic.parameters'
+    _description = '刀具物料基本参数'
+
+    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)
+    # cutting_tool_type_1 = fields.Char(related='cutting_tool_type', string='类型', store=True)
+
+    # 整体式刀具参数
+    code = fields.Char('物料号', size=50)
+    total_length = fields.Char('总长度(mm)', size=20)
+    blade_number = fields.Selection(
+        [('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8')],
+        string='刃数(个)')
+    neck_diameter = fields.Char('颈部直径(mm)', size=20)
+    neck_length = fields.Char('颈部长度(mm)', size=20)
+    handle_diameter = fields.Char('柄部直径(mm)', size=20)
+    handle_length = fields.Char('柄部长度(mm)', size=20)
+    blade_tip_diameter = fields.Char('刀尖直径(mm)', size=20)
+    blade_tip_working_size = fields.Char('刀尖处理尺寸(R半径mm/倒角)', size=20)
+    blade_tip_taper = fields.Integer('刀尖锥度(°)')
+    blade_diameter = fields.Char('刃部直径(mm)', size=20)
+    blade_length = fields.Char('刃部长度(mm)', size=20)
+    blade_helix_angle = fields.Integer('刃部螺旋角(°)')
+    blade_width = fields.Char('刃部宽度(mm)', size=20)
+    blade_depth = fields.Char('刃部深度(mm)', size=20)
+    pitch = fields.Char('牙距(mm)', size=20)
+    cutting_depth = fields.Char('切削深度(mm)', size=20)
+    # 刀片参数
+    length = fields.Char('长度(mm)', size=20)
+    thickness = fields.Char('厚度(mm)', size=20)
+    width = fields.Char('宽度(mm)', size=20)
+    cutting_blade_length = fields.Char('切削刃长(mm)', size=20)
+    relief_angle = fields.Integer('后角(°)')
+    blade_tip_circular_arc_radius = fields.Char('刀尖圆弧半径(mm)', size=20)
+    inscribed_circle_diameter = fields.Char('内接圆直径(mm)', size=20)
+    install_aperture_diameter = fields.Char('安装孔直径(mm)', size=20)
+    chip_breaker_groove = fields.Selection([('无', '无'), ('单面', '单面'), ('双面', '双面')],
+                                           string='有无断屑槽')
+    blade_teeth_model = fields.Selection(
+        [('V牙型', 'V牙型'), ('米制全牙型', '米制全牙型'), ('美制全牙型', '美制全牙型'),
+         ('惠氏全牙型', '惠氏全牙型'), ('BSPT全牙型', 'BSPT全牙型'), ('NPT全牙型', 'NPT全牙型'),
+         ('UNJ全牙型', 'UNJ全牙型'), ('DIN405圆牙型', 'DIN405圆牙型'), ('ACME梯形', 'ACME梯形'),
+         ('石油管螺纹刀片', '石油管螺纹刀片'), ('矮牙ACME梯形', '矮牙ACME梯形'),
+         ('Trapeze30° 103', 'Trapeze30° 103')], string='刀片牙型')
+    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='刀片的刃数(个)')
+    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='螺纹类型')
+    thread_num = fields.Char('每英寸螺纹数(TPI)', size=20)
+    blade_tip_height_tolerance = fields.Char('刀尖高度公差(mm)', size=20)
+    inscribed_circle_tolerance = fields.Char('内接圆公差(mm)', size=20)
+    thickness_tolerance = fields.Char('厚度公差(mm)', size=20)
+    # 刀杆参数
+    height = fields.Char('高度(mm)', size=20)
+    blade_height = fields.Char('刃部高度(mm)', size=20)
+    cutter_arbor_diameter = fields.Char('刀杆直径(mm)', size=20)
+    min_machining_aperture = fields.Char('最小加工孔径(mm)', size=20)
+    install_blade_tip_num = fields.Char('可装刀片数/齿数(个)', size=20)
+    cutting_blade_model = fields.Char('切削类型', size=20)
+    cooling_hole = fields.Selection([('有', '有'), ('无', '无')], string='有无冷却孔')
+    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',
+        domain="[('cutting_tool_material_id.name', '=', '刀片')]",
+        string='适配刀片型号'  # 使用空列表作为默认值
+    )
+    tool_shim = fields.Char('适配刀垫型号', size=50)
+    cotter_pin = fields.Char('适配销钉型号', size=50)
+    pressing_plate = fields.Char('适配压板型号', size=50)
+    screw = fields.Char('适配螺钉型号', size=50)
+    spanner = fields.Char('适配扳手型号', size=50)
+    # 刀盘参数
+    cutter_head_diameter = fields.Char('刀盘直径(mm)', size=20)
+    interface_diameter = fields.Char('接口直径(mm)', size=20)
+    # 刀柄参数
+    flange_shank_length = fields.Char('法兰柄长(mm)', size=20)
+    handle_external_diameter = fields.Char('柄部外径(mm)', size=20)
+    handle_inside_diameter = fields.Char('柄部内径(mm)', size=20)
+    min_clamping_diameter = fields.Char('最小夹持直径(mm)', size=20)
+    max_clamping_diameter = fields.Char('最大夹持直径(mm)', size=20)
+    clamping_mode = fields.Char('夹持方式', size=20)
+    max_load_capacity = fields.Char('最大负载能力(kg)', size=20)
+    taper = fields.Integer('锥度(°)')
+    tool_changing_time = fields.Integer('换刀时间(s)')
+    standard_rotate_speed = fields.Char('标准转速(n/min)', size=20)
+    max_rotate_speed = fields.Char('最大转速(n/min)', size=20)
+    diameter_slip_accuracy = fields.Char('径跳精度(mm)', size=20)
+    cooling_model = fields.Char('冷却类型', size=20)
+    is_rough_machining = fields.Selection([('是', '是'), ('否', '否')], string='是否可粗加工')
+    is_finish_machining = fields.Selection([('是', '是'), ('否', '否')], string='是否可精加工')
+    is_quick_cutting = fields.Selection([('是', '是'), ('否', '否')], string='是否可高速切削')
+    is_drill_hole = fields.Selection([('是', '是'), ('否', '否')], string='是否可钻孔')
+    is_safe_lock = fields.Selection([('是', '是'), ('否', '否')], string='有无安全锁')
+    # 夹头参数
+    er_size_model = fields.Char('ER尺寸型号', size=20)
+    outer_diameter = fields.Char('外径(mm)', size=20)
+    inner_diameter = fields.Char('内径(mm)', size=20)
+    run_out_accuracy = fields.Char('跳动精度(mm)', size=20)
+    top_diameter = fields.Char('顶部直径(mm)', size=20)
+    weight = fields.Char('重量(kg)', size=20)
+    clamping_length = fields.Char('夹持长度(mm)', size=20)
+    clamping_tolerance = fields.Char('夹持公差(mm)', size=20)
+    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_basic_param(self, obj):
+        basic_param_str = [0, '', {
+            'code': obj['code'],
+            'total_length': obj['total_length'],
+            'blade_number': obj['blade_number'],
+            'neck_diameter': obj['neck_diameter'],
+            'neck_length': obj['neck_length'],
+            '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_diameter': obj['blade_diameter'],
+            'blade_length': obj['blade_length'],
+            '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'],
+            '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'],
+            'chip_breaker_groove': obj['chip_breaker_groove'],
+            'blade_teeth_model': obj['bladed_teeth_model'],
+            'blade_blade_number': obj['blade_blade_number'],
+            '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': 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'],
+            'height': obj['height'],
+            'blade_height': obj['blade_height'],
+            'cutter_arbor_diameter': obj['cutter_arbor_diameter'],
+            'min_machining_aperture': obj['min_machining_aperture'],
+            'install_blade_tip_num': obj['install_blade_tip_num'],
+            'cutting_blade_model': obj['cutting_blade_model'],
+            'cooling_hole': obj['cooling_hole'],
+            'locating_slot_code': obj['locating_slot_code'],
+            'installing_structure': obj['installing_structure'],
+            'tool_shim': obj['tool_shim'],
+            'cotter_pin': obj['cotter_pin'],
+            'pressing_plate': obj['pressing_plate'],
+            'screw': obj['screw'],
+            'spanner': obj['spanner'],
+            'cutter_head_diameter': obj['cutter_head_diameter'],
+            'interface_diameter': obj['interface_diameter'],
+            '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'],
+            'er_size_model': obj['er_size_model'],
+            'outer_diameter': obj['outer_diameter'],
+            'inner_diameter': obj['inner_diameter'],
+            'run_out_accuracy': obj['run_out_accuracy'],
+            'top_diameter': obj['top_diameter'],
+            'weight': obj['weight'],
+            'clamping_length': obj['clamping_length'],
+            'clamping_tolerance': obj['clamping_tolerance'],
+            'handle_ids': obj['weight'],
+            'blade_ids': obj['clamping_length'],
+        }]
+        return basic_param_str
+
+
+class CuttingSpeed(models.Model):
+    _name = 'sf.cutting.speed'
+    _description = '切削速度Vc'
+
+    # product_template_id = fields.Many2one('product.template', string='产品')
+    standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='标准库')
+    execution_standard_id = fields.Char('执行标准')
+    material_code = fields.Char('材料代号')
+    material_name = fields.Char('材料名称')
+    material_grade = fields.Char('材料牌号')
+    tensile_strength = fields.Float('拉伸强度 (N/mm²)')
+    hardness = fields.Float('硬度(HRC)')
+    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)')
+    application = fields.Selection([('主应用', '主应用'), ('次应用', '次应用')], '主/次应用')
+
+    def _json_cutting_speed(self, obj):
+        cutting_speed_str = [0, '', {
+            'execution_standard_id': obj['execution_standard_id'],
+            'material_code': obj['material_code'],
+            'material_name': obj['material_name'],
+            '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
+
+
+class FeedPerTooth(models.Model):
+    _name = 'sf.feed.per.tooth'
+    _description = '每齿走刀量fz'
+
+    # product_template_id = fields.Many2one('product.template', string='产品')
+    standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='标准库')
+
+    cutting_speed = fields.Char('径向切宽 ae(mm)')
+    machining_method = fields.Selection([('直铣', '直铣'), ('坡铣', '坡铣')], string='加工方式')
+    materials_type_id = fields.Many2one('sf.materials.model', string='材料型号')
+    # blade_diameter = fields.Float('刃部直径D1(mm)', readonly=True,
+    #                               related='product_template_id.cutting_tool_blade_diameter')
+    feed_per_tooth = fields.Char('每齿走刀量 (mm/z)')
+    unit = fields.Char('单位', default='fz')
+
+    def _json_feed_per_tooth(self, obj):
+        feed_per_tooth_str = [0, '', {
+            'cutting_speed': obj['cutting_speed'],
+            'machining_method': obj['machining_method'],
+            'materials_type_id': obj['materials_type_id'],
+            # 'blade_diameter': obj['blade_diameter'],
+            'feed_per_tooth': obj['feed_per_tooth'],
+            'unit': obj['unit'],
+        }]
+        return feed_per_tooth_str
+
+    # @api.depends('product_template_id')
+    # def _compute_product_template_id(self):
+    #     if self.product_template_id is not None:
+    #         self.blade_diameter = self.product_template_id.cutting_tool_blade_diameter
diff --git a/sf_base/security/ir.model.access.csv b/sf_base/security/ir.model.access.csv
index 39ee21cf..37daa2b3 100644
--- a/sf_base/security/ir.model.access.csv
+++ b/sf_base/security/ir.model.access.csv
@@ -15,7 +15,6 @@ access_sf_production_process_category,sf_production_process_category,model_sf_pr
 access_sf_machine_tool_category,sf_machine_tool_category,model_sf_machine_tool_category,base.group_user,1,1,1,1
 access_sf_cutting_tool_material,sf_cutting_tool_material,model_sf_cutting_tool_material,base.group_user,1,1,1,1
 access_sf_cutting_tool_type,sf_cutting_tool_type,model_sf_cutting_tool_type,base.group_user,1,1,1,1
-access_sf_cutting_tool_model,sf_cutting_tool_model,model_sf_cutting_tool_model,base.group_user,1,1,1,1
 access_sf_functional_cutting_tool,sf_functional_cutting_tool,model_sf_functional_cutting_tool,base.group_user,1,1,1,1
 access_sf_functional_cutting_tool_model,sf_functional_cutting_tool_model,model_sf_functional_cutting_tool_model,base.group_user,1,1,1,1
 access_sf_fixture_material,sf_fixture_material,model_sf_fixture_material,base.group_user,1,1,1,1
@@ -27,6 +26,11 @@ access_sf_sync_common,sf_sync_common,model_sf_sync_common,base.group_user,1,1,1,
 access_sf_international_standards,sf_international_standards,model_sf_international_standards,base.group_user,1,1,1,1
 access_material_apply,material_apply,model_material_apply,base.group_user,1,1,1,1
 access_sf_cutting_tool_standard_library,sf_cutting_tool_standard_library,model_sf_cutting_tool_standard_library,base.group_user,1,1,1,1
+access_sf_tool_materials_basic_parameters,sf_tool_materials_basic_parameters,model_sf_tool_materials_basic_parameters,base.group_user,1,1,1,1
+access_sf_cutting_speed,sf_cutting_speed,model_sf_cutting_speed,base.group_user,1,1,1,1
+access_sf_feed_per_tooth,sf_feed_per_tooth,model_sf_feed_per_tooth,base.group_user,1,1,1,1
+access_maintenance_equipment_image,maintenance_equipment_image,model_maintenance_equipment_image,base.group_user,1,1,1,1
+
 
 
 
diff --git a/sf_base/views/tool_menu.xml b/sf_base/views/tool_menu.xml
index 378277e5..cddb7d90 100644
--- a/sf_base/views/tool_menu.xml
+++ b/sf_base/views/tool_menu.xml
@@ -85,5 +85,12 @@
                 action="action_sf_functional_cutting_tool_model_type"
         />
 
+        <menuitem
+            id="menu_sf_maintenance_equipment_image"
+            name="能力特征库"
+            parent="menu_sf_cutting_tool"
+            action="action_maintenance_equipment_image"
+            sequence="5"/>
+
     </data>
 </odoo>
diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index 8d837dc7..ed561325 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -359,4 +359,43 @@
             </field>
         </record>
     </data>
+
+       <!-- ================================================能力特征库================================================ -->
+     <record id="view_maintenance_equipment_image_tree" model="ir.ui.view">
+        <field name="name">maintenance.equipment.image.tree</field>
+        <field name="model">maintenance.equipment.image</field>
+        <field name="arch" type="xml">
+            <tree string="能力特征库" editable="bottom" delete="0" create="0" >
+                <field name="name" readonly="1"/>
+                <field name="type" readonly="1"/>
+                <field name="image" widget="image" readonly="1"/>
+                <field name="equipment_id" />
+                <field name="active" invisible="1"/>
+            </tree>
+        </field>
+    </record>
+
+
+    <record model="ir.ui.view" id="view_maintenance_equipment_image_search">
+        <field name="name">maintenance.equipment.image.search</field>
+        <field name="model">maintenance.equipment.image</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="name"/>
+                <searchpanel class="account_root">
+                    <field name="type" icon="fa-filter" enable_counters="1"/>
+                </searchpanel>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_maintenance_equipment_image" model="ir.actions.act_window">
+        <field name="name">能力特征库</field>
+        <field name="res_model">maintenance.equipment.image</field>
+        <field name="view_mode">tree</field>
+        <field name="domain">[]</field>
+    </record>
+
+
+
 </odoo>
diff --git a/sf_dlm/__manifest__.py b/sf_dlm/__manifest__.py
index ed717647..42c4598a 100644
--- a/sf_dlm/__manifest__.py
+++ b/sf_dlm/__manifest__.py
@@ -10,12 +10,13 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['mrp', 'base', 'sale', 'sf_manufacturing', 'web_widget_model_viewer', 'mrp_subcontracting', 'purchase_stock',
-                'uom','jikimo_frontend'],
+    'depends': ['mrp', 'base', 'sale', 'sf_manufacturing', 'web_widget_model_viewer', 'mrp_subcontracting',
+                'purchase_stock',
+                'uom', 'jikimo_frontend', 'product'],
     'data': [
         'data/product_data.xml',
         'data/uom_data.xml',
-        'views/product_template_view.xml',
+        # 'views/product_template_view.xml',
         'views/product_workorder.xml'
     ],
     'demo': [
diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index ce888b90..055898f5 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -296,9 +296,9 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
                                 <field name="cutting_tool_er_size_model"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
-                                <field name="cutting_tool_handle_ids" widget="many2many_tags"
-                                       options="{'no_create': True}"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
+<!--                                <field name="cutting_tool_handle_ids" widget="many2many_tags"-->
+<!--                                       options="{'no_create': True}"-->
+<!--                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>-->
                                 <field name="cooling_suit_type_ids"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
 
diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py
index 156ab83f..e47c8097 100644
--- a/sf_maintenance/models/sf_maintenance.py
+++ b/sf_maintenance/models/sf_maintenance.py
@@ -567,50 +567,6 @@ class SfMaintenanceEquipment(models.Model):
     image_id = fields.Many2many('maintenance.equipment.image', 'equipment_id', string='设备图文')
 
 
-class MaintenanceStandardImage(models.Model):
-    _name = 'maintenance.equipment.image'
-    _description = '能力特征库'
-
-    active = fields.Boolean('有效', default=True)
-    name = fields.Char('名称')
-    image = fields.Binary(string='图文')
-    type = fields.Selection(
-        [('加工能力', '加工能力'), ('刀尖特征', '刀尖特征'), ('柄部类型', '柄部类型'), ('走刀方向', '走刀方向'),
-         ('冷却液', '冷却液'), ('压紧方式', '压紧方式'), ('刀片形状', '刀片形状')],
-        string='特征')
-    equipment_id = fields.Many2many('maintenance.equipment', 'image_id', string='设备')
-
-    @api.model
-    def name_search(self, name='', args=None, operator='ilike', limit=100):
-        # 调用父类的name_search方法，获取原始的结果列表
-        res = super().name_search(name, args, operator, limit)
-        # 定义一个空字典用来存储id和name的映射关系
-        name_dict = {}
-        # 遍历结果列表，将id和name存入字典中
-        for item in res:
-            id = item[0]
-            name = item[1]
-            name_dict[id] = name
-        # 根据id列表搜索符合条件的记录
-        records = self.browse(name_dict.keys())
-        # 定义一个新的结果列表用来存储修改后的结果
-        new_res = []
-        # 遍历每条记录
-        for record in records:
-            # 获取记录的id，name和image属性
-            id = record.id
-            name = name_dict[id]
-            image = record.image
-            # 如果image不为空，将其转换为data URI scheme
-            if image:
-                data_uri = f"data:image/png;base64,{image.decode('utf-8')}"
-            else:
-                data_uri = ""
-            # 将这三个属性组成一个数组，并添加到结果列表中 result.append([id, name, data_uri]) # 返回结果列表 return result
-            new_res.append([id, name, data_uri])
-        # 返回新的结果列表
-        return new_res
-
 class SfRobotAxisNum(models.Model):
     _name = 'sf.robot.axis.num'
     _description = '机器人轴参数'
diff --git a/sf_maintenance/security/ir.model.access.csv b/sf_maintenance/security/ir.model.access.csv
index 65e93d7a..5a022f14 100644
--- a/sf_maintenance/security/ir.model.access.csv
+++ b/sf_maintenance/security/ir.model.access.csv
@@ -4,7 +4,6 @@ access_sf_maintenance_logs,sf_maintenance_logs,model_sf_maintenance_logs,base.gr
 access_maintenance_equipment,maintenance_equipment,model_maintenance_equipment,base.group_user,1,1,1,1
 access_maintenance_standards,maintenance_standards,model_maintenance_standards,base.group_user,1,1,1,1
 access_maintenance_standard_image,maintenance_standard_image,model_maintenance_standard_image,base.group_user,1,1,1,1
-access_maintenance_equipment_image,maintenance_equipment_image,model_maintenance_equipment_image,base.group_user,1,1,1,1
 access_sf_robot_axis_num,sf_robot_axis_num,model_sf_robot_axis_num,base.group_user,1,1,1,1
 
 
diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml
index 45955147..be106b33 100644
--- a/sf_maintenance/views/maintenance_views.xml
+++ b/sf_maintenance/views/maintenance_views.xml
@@ -949,48 +949,6 @@
     <!--    groups="maintenance.group_equipment_manager,base.group_user"-->
     <!--    sequence="1"/-->
     <!--    设备图文展示-->
-    <record id="view_maintenance_equipment_image_tree" model="ir.ui.view">
-        <field name="name">maintenance.equipment.image.tree</field>
-        <field name="model">maintenance.equipment.image</field>
-        <field name="arch" type="xml">
-            <tree string="能力特征库" editable="bottom" delete="0" create="0" >
-                <field name="name" readonly="1"/>
-                <field name="type" readonly="1"/>
-                <field name="image" widget="image" readonly="1"/>
-                <field name="equipment_id" />
-                <field name="active" invisible="1"/>
-            </tree>
-        </field>
-    </record>
-
-
-    <record model="ir.ui.view" id="view_maintenance_equipment_image_search">
-        <field name="name">maintenance.equipment.image.search</field>
-        <field name="model">maintenance.equipment.image</field>
-        <field name="arch" type="xml">
-            <search>
-                <field name="name"/>
-                <searchpanel class="account_root">
-                    <field name="type" icon="fa-filter" enable_counters="1"/>
-                </searchpanel>
-            </search>
-        </field>
-    </record>
-
-    <record id="action_maintenance_equipment_image" model="ir.actions.act_window">
-        <field name="name">能力特征库</field>
-        <field name="res_model">maintenance.equipment.image</field>
-        <field name="view_mode">tree</field>
-        <field name="domain">[]</field>
-    </record>
-
-    <menuitem
-            id="maintenance_equipment_image_form"
-            name="能力特征库"
-            parent="maintenance.menu_m_request"
-            action="action_maintenance_equipment_image"
-            groups="maintenance.group_equipment_manager,base.group_user"
-            sequence="2"/>
 
 
 </odoo>
\ No newline at end of file
diff --git a/sf_manufacturing/models/__init__.py b/sf_manufacturing/models/__init__.py
index 25b91f15..cb14176c 100644
--- a/sf_manufacturing/models/__init__.py
+++ b/sf_manufacturing/models/__init__.py
@@ -8,7 +8,6 @@ from . import mrp_routing_workcenter
 from . import stock
 from . import res_user
 from . import production_line_base
-from . import tool_other_features
 
 
 
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 493da9fd..61b92c81 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -178,8 +178,8 @@ class ResProductMo(models.Model):
     #     if self.integral_run_out_accuracy_min <= 0 and self.cutting_tool_type == '整体式刀具':
     #         raise ValidationError("端跳精度最小(min)不能为0")
 
-    cutting_speed_ids = fields.One2many('sf.cutting.speed', 'product_template_id', string='切削速度Vc')
-    feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'product_template_id', string='每齿走刀量fz')
+    # cutting_speed_ids = fields.One2many('sf.cutting.speed', 'product_template_id', string='切削速度Vc')
+    # feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'product_template_id', string='每齿走刀量fz')
 
     # @api.constrains('suitable_machining_method_ids')
     # def _check_suitable_machining_method_ids(self):
@@ -272,14 +272,14 @@ class ResProductMo(models.Model):
     cooling_suit_type_ids = fields.Char('适用冷却套型号')
     # cooling_suit_type_ids = fields.Many2many('冷却类型')
     cutting_tool_er_size_model = fields.Char('ER尺寸型号')
-    cutting_tool_handle_ids = fields.Many2many(
-        'sf.cutting.tool.model',
-        relation='product_cutting_tool_model_chuck_handle_rel',
-        column1='model_id_1',
-        column2='model_id_2',
-        domain="[('cutting_tool_type', '=', '刀柄')]",
-        string='适用刀柄型号'
-    )
+    # cutting_tool_handle_ids = fields.Many2many(
+    #     'sf.cutting.tool.model',
+    #     relation='product_cutting_tool_model_chuck_handle_rel',
+    #     column1='model_id_1',
+    #     column2='model_id_2',
+    #     domain="[('cutting_tool_type', '=', '刀柄')]",
+    #     string='适用刀柄型号'
+    # )
     # 夹具参数
     fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料")
     fixture_model_id = fields.Many2one('sf.fixture.model', string="夹具型号")
diff --git a/sf_manufacturing/models/tool_other_features.py b/sf_manufacturing/models/tool_other_features.py
index 03a954f9..569b7f9f 100644
--- a/sf_manufacturing/models/tool_other_features.py
+++ b/sf_manufacturing/models/tool_other_features.py
@@ -1,225 +1,226 @@
 from odoo import fields, models, api
 
 
-class SuitableMachiningMethod(models.Model):
-    _name = 'sf.suitable.machining.method'
-    _description = '适合加工方式'
+class ToolMaterialsBasicParameters(models.Model):
+    _name = 'sf.tool.materials.basic.parameters'
+    _description = '刀具物料基本参数'
 
-    name = fields.Char('名称')
-    image = fields.Image('图片')
+    standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀具标准库')
+    cutting_tool_type = fields.Char(related='cutting_tool_model_id.cutting_tool_type', string='刀具物料类型',
+                                    store=True)
+    # cutting_tool_type_1 = fields.Char(related='cutting_tool_type', string='类型', store=True)
 
-    @api.model
-    def name_search(self, name='', args=None, operator='ilike', limit=100):
-        # 调用父类的name_search方法，获取原始的结果列表
-        res = super().name_search(name, args, operator, limit)
-        # 定义一个空字典用来存储id和name的映射关系
-        name_dict = {}
-        # 遍历结果列表，将id和name存入字典中
-        for item in res:
-            id = item[0]
-            name = item[1]
-            name_dict[id] = name
-        # 根据id列表搜索符合条件的记录
-        records = self.browse(name_dict.keys())
-        # 定义一个新的结果列表用来存储修改后的结果
-        new_res = []
-        # 遍历每条记录
-        for record in records:
-            # 获取记录的id，name和image属性
-            id = record.id
-            name = name_dict[id]
-            image = record.image
-            # 如果image不为空，将其转换为data URI scheme
-            if image:
-                data_uri = f"data:image/png;base64,{image.decode('utf-8')}"
-            else:
-                data_uri = ""
-            # 将这三个属性组成一个数组，并添加到结果列表中 result.append([id, name, data_uri]) # 返回结果列表 return result
-            new_res.append([id, name, data_uri])
-        # 返回新的结果列表
-        return new_res
+    # 整体式刀具参数
+    code = fields.Char('物料号', size=50)
+    total_length = fields.Char('总长度(mm)', size=20)
+    blade_number = fields.Selection(
+        [('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8')],
+        string='刃数(个)')
+    neck_diameter = fields.Char('颈部直径(mm)', size=20)
+    neck_length = fields.Char('颈部长度(mm)', size=20)
+    handle_diameter = fields.Char('柄部直径(mm)', size=20)
+    handle_length = fields.Char('柄部长度(mm)', size=20)
+    blade_tip_diameter = fields.Char('刀尖直径(mm)', size=20)
+    blade_tip_working_size = fields.Char('刀尖处理尺寸(R半径mm/倒角)', size=20)
+    blade_tip_taper = fields.Integer('刀尖锥度(°)')
+    blade_diameter = fields.Char('刃部直径(mm)', size=20)
+    blade_length = fields.Char('刃部长度(mm)', size=20)
+    blade_helix_angle = fields.Integer('刃部螺旋角(°)')
+    blade_width = fields.Char('刃部宽度(mm)', size=20)
+    blade_depth = fields.Char('刃部深度(mm)', size=20)
+    pitch = fields.Char('牙距(mm)', size=20)
+    cutting_depth = fields.Char('切削深度(mm)', size=20)
+    # 刀片参数
+    length = fields.Char('长度(mm)', size=20)
+    thickness = fields.Char('厚度(mm)', size=20)
+    width = fields.Char('宽度(mm)', size=20)
+    cutting_blade_length = fields.Char('切削刃长(mm)', size=20)
+    relief_angle = fields.Integer('后角(°)')
+    blade_tip_circular_arc_radius = fields.Char('刀尖圆弧半径(mm)', size=20)
+    inscribed_circle_diameter = fields.Char('内接圆直径(mm)', size=20)
+    install_aperture_diameter = fields.Char('安装孔直径(mm)', size=20)
+    chip_breaker_groove = fields.Selection([('无', '无'), ('单面', '单面'), ('双面', '双面')],
+                                           string='有无断屑槽')
+    blade_teeth_model = fields.Selection(
+        [('V牙型', 'V牙型'), ('米制全牙型', '米制全牙型'), ('美制全牙型', '美制全牙型'),
+         ('惠氏全牙型', '惠氏全牙型'), ('BSPT全牙型', 'BSPT全牙型'), ('NPT全牙型', 'NPT全牙型'),
+         ('UNJ全牙型', 'UNJ全牙型'), ('DIN405圆牙型', 'DIN405圆牙型'), ('ACME梯形', 'ACME梯形'),
+         ('石油管螺纹刀片', '石油管螺纹刀片'), ('矮牙ACME梯形', '矮牙ACME梯形'),
+         ('Trapeze30° 103', 'Trapeze30° 103')], string='刀片牙型')
+    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='刀片的刃数(个)')
+    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='螺纹类型')
+    thread_num = fields.Char('每英寸螺纹数(TPI)', size=20)
+    blade_tip_height_tolerance = fields.Char('刀尖高度公差(mm)', size=20)
+    inscribed_circle_tolerance = fields.Char('内接圆公差(mm)', size=20)
+    thickness_tolerance = fields.Char('厚度公差(mm)', size=20)
+    # 刀杆参数
+    height = fields.Char('高度(mm)', size=20)
+    blade_height = fields.Char('刃部高度(mm)', size=20)
+    cutter_arbor_diameter = fields.Char('刀杆直径(mm)', size=20)
+    min_machining_aperture = fields.Char('最小加工孔径(mm)', size=20)
+    install_blade_tip_num = fields.Char('可装刀片数/齿数(个)', size=20)
+    cutting_blade_model = fields.Char('切削类型', size=20)
+    cooling_hole = fields.Selection([('有', '有'), ('无', '无')], string='有无冷却孔')
+    locating_slot_code = fields.Char('定位槽代号', size=20)
+    installing_structure = fields.Char('安装结构', size=20)
+    blade_ids = fields.Many2many(
+        'sf.cutting.tool.type',
+        relation='cutting_tool_type_library_pad_blade_rel',
+        column1='model_id_1',
+        column2='model_id_2',
+        domain="[('cutting_tool_material_id.name', '=', '刀片')]",
+        string='适配刀片型号'  # 使用空列表作为默认值
+    )
+    tool_shim = fields.Char('适配刀垫型号', size=50)
+    cotter_pin = fields.Char('适配销钉型号', size=50)
+    pressing_plate = fields.Char('适配压板型号', size=50)
+    screw = fields.Char('适配螺钉型号', size=50)
+    spanner = fields.Char('适配扳手型号', size=50)
+    # 刀盘参数
+    cutter_head_diameter = fields.Char('刀盘直径(mm)', size=20)
+    interface_diameter = fields.Char('接口直径(mm)', size=20)
+    # 刀柄参数
+    flange_shank_length = fields.Char('法兰柄长(mm)', size=20)
+    handle_external_diameter = fields.Char('柄部外径(mm)', size=20)
+    handle_inside_diameter = fields.Char('柄部内径(mm)', size=20)
+    min_clamping_diameter = fields.Char('最小夹持直径(mm)', size=20)
+    max_clamping_diameter = fields.Char('最大夹持直径(mm)', size=20)
+    clamping_mode = fields.Char('夹持方式', size=20)
+    max_load_capacity = fields.Char('最大负载能力(kg)', size=20)
+    taper = fields.Integer('锥度(°)')
+    tool_changing_time = fields.Integer('换刀时间(s)')
+    standard_rotate_speed = fields.Char('标准转速(n/min)', size=20)
+    max_rotate_speed = fields.Char('最大转速(n/min)', size=20)
+    diameter_slip_accuracy = fields.Char('径跳精度(mm)', size=20)
+    cooling_model = fields.Char('冷却类型', size=20)
+    is_rough_machining = fields.Selection([('是', '是'), ('否', '否')], string='是否可粗加工')
+    is_finish_machining = fields.Selection([('是', '是'), ('否', '否')], string='是否可精加工')
+    is_quick_cutting = fields.Selection([('是', '是'), ('否', '否')], string='是否可高速切削')
+    is_drill_hole = fields.Selection([('是', '是'), ('否', '否')], string='是否可钻孔')
+    is_safe_lock = fields.Selection([('是', '是'), ('否', '否')], string='有无安全锁')
+    # 夹头参数
+    er_size_model = fields.Char('ER尺寸型号', size=20)
+    outer_diameter = fields.Char('外径(mm)', size=20)
+    inner_diameter = fields.Char('内径(mm)', size=20)
+    run_out_accuracy = fields.Char('跳动精度(mm)', size=20)
+    top_diameter = fields.Char('顶部直径(mm)', size=20)
+    weight = fields.Char('重量(kg)', size=20)
+    clamping_length = fields.Char('夹持长度(mm)', size=20)
+    clamping_tolerance = fields.Char('夹持公差(mm)', size=20)
+    handle_ids = fields.Many2many(
+        'sf.cutting.tool.type',
+        relation='cutting_tool_type_library_chuck_handle_rel',
+        column1='model_id_1',
+        column2='model_id_2',
+        domain="[('cutting_tool_material_id.name', '=', '刀柄')]",
+        string='适用刀柄型号'
+    )
 
-
-class BladeTipCharacteristics(models.Model):
-    _name = 'sf.blade.tip.characteristics'
-    _description = '刀尖特征'
-
-    name = fields.Char('名称')
-    image = fields.Image('图片')
-
-    @api.model
-    def name_search(self, name='', args=None, operator='ilike', limit=100):
-        # 调用父类的name_search方法，获取原始的结果列表
-        res = super().name_search(name, args, operator, limit)
-        # 定义一个空字典用来存储id和name的映射关系
-        name_dict = {}
-        # 遍历结果列表，将id和name存入字典中
-        for item in res:
-            id = item[0]
-            name = item[1]
-            name_dict[id] = name
-        # 根据id列表搜索符合条件的记录
-        records = self.browse(name_dict.keys())
-        # 定义一个新的结果列表用来存储修改后的结果
-        new_res = []
-        # 遍历每条记录
-        for record in records:
-            # 获取记录的id，name和image属性
-            id = record.id
-            name = name_dict[id]
-            image = record.image
-            # 如果image不为空，将其转换为data URI scheme
-            if image:
-                data_uri = f"data:image/png;base64,{image.decode('utf-8')}"
-            else:
-                data_uri = ""
-            # 将这三个属性组成一个数组，并添加到结果列表中 result.append([id, name, data_uri]) # 返回结果列表 return result
-            new_res.append([id, name, data_uri])
-        # 返回新的结果列表
-        return new_res
-
-
-class HandleType(models.Model):
-    _name = 'sf.handle.type'
-    _description = '柄部类型'
-
-    name = fields.Char('名称')
-    image = fields.Image('图片')
-
-    @api.model
-    def name_search(self, name='', args=None, operator='ilike', limit=100):
-        # 调用父类的name_search方法，获取原始的结果列表
-        res = super().name_search(name, args, operator, limit)
-        # 定义一个空字典用来存储id和name的映射关系
-        name_dict = {}
-        # 遍历结果列表，将id和name存入字典中
-        for item in res:
-            id = item[0]
-            name = item[1]
-            name_dict[id] = name
-        # 根据id列表搜索符合条件的记录
-        records = self.browse(name_dict.keys())
-        # 定义一个新的结果列表用来存储修改后的结果
-        new_res = []
-        # 遍历每条记录
-        for record in records:
-            # 获取记录的id，name和image属性
-            id = record.id
-            name = name_dict[id]
-            image = record.image
-            # 如果image不为空，将其转换为data URI scheme
-            if image:
-                data_uri = f"data:image/png;base64,{image.decode('utf-8')}"
-            else:
-                data_uri = ""
-            # 将这三个属性组成一个数组，并添加到结果列表中 result.append([id, name, data_uri]) # 返回结果列表 return result
-            new_res.append([id, name, data_uri])
-        # 返回新的结果列表
-        return new_res
-
-
-class CuttingDirection(models.Model):
-    _name = 'sf.cutting.direction'
-    _description = '走刀方向'
-
-    name = fields.Char('名称')
-    image = fields.Image('图片')
-
-    @api.model
-    def name_search(self, name='', args=None, operator='ilike', limit=100):
-        # 调用父类的name_search方法，获取原始的结果列表
-        res = super().name_search(name, args, operator, limit)
-        # 定义一个空字典用来存储id和name的映射关系
-        name_dict = {}
-        # 遍历结果列表，将id和name存入字典中
-        for item in res:
-            id = item[0]
-            name = item[1]
-            name_dict[id] = name
-        # 根据id列表搜索符合条件的记录
-        records = self.browse(name_dict.keys())
-        # 定义一个新的结果列表用来存储修改后的结果
-        new_res = []
-        # 遍历每条记录
-        for record in records:
-            # 获取记录的id，name和image属性
-            id = record.id
-            name = name_dict[id]
-            image = record.image
-            # 如果image不为空，将其转换为data URI scheme
-            if image:
-                data_uri = f"data:image/png;base64,{image.decode('utf-8')}"
-            else:
-                data_uri = ""
-            # 将这三个属性组成一个数组，并添加到结果列表中 result.append([id, name, data_uri]) # 返回结果列表 return result
-            new_res.append([id, name, data_uri])
-        # 返回新的结果列表
-        return new_res
-
-
-class SuitableCoolant(models.Model):
-    _name = 'sf.suitable.coolant'
-    _description = '适合冷却液'
-
-    name = fields.Char('名称')
-    image = fields.Image('图片')
-
-    @api.model
-    def name_search(self, name='', args=None, operator='ilike', limit=100):
-        # 调用父类的name_search方法，获取原始的结果列表
-        res = super().name_search(name, args, operator, limit)
-        # 定义一个空字典用来存储id和name的映射关系
-        name_dict = {}
-        # 遍历结果列表，将id和name存入字典中
-        for item in res:
-            id = item[0]
-            name = item[1]
-            name_dict[id] = name
-        # 根据id列表搜索符合条件的记录
-        records = self.browse(name_dict.keys())
-        # 定义一个新的结果列表用来存储修改后的结果
-        new_res = []
-        # 遍历每条记录
-        for record in records:
-            # 获取记录的id，name和image属性
-            id = record.id
-            name = name_dict[id]
-            image = record.image
-            # 如果image不为空，将其转换为data URI scheme
-            if image:
-                data_uri = f"data:image/png;base64,{image.decode('utf-8')}"
-            else:
-                data_uri = ""
-            # 将这三个属性组成一个数组，并添加到结果列表中 result.append([id, name, data_uri]) # 返回结果列表 return result
-            new_res.append([id, name, data_uri])
-        # 返回新的结果列表
-        return new_res
+    def _json_basic_param(self, obj):
+        basic_param_str = [0, '', {
+            'code': obj['code'],
+            'total_length': obj['total_length'],
+            'blade_number': obj['blade_number'],
+            'neck_diameter': obj['neck_diameter'],
+            'neck_length': obj['neck_length'],
+            '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_diameter': obj['blade_diameter'],
+            'blade_length': obj['blade_length'],
+            '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'],
+            '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'],
+            'chip_breaker_groove': obj['chip_breaker_groove'],
+            'blade_teeth_model': obj['bladed_teeth_model'],
+            'blade_blade_number': obj['blade_blade_number'],
+            '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': 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'],
+            'height': obj['height'],
+            'blade_height': obj['blade_height'],
+            'cutter_arbor_diameter': obj['cutter_arbor_diameter'],
+            'min_machining_aperture': obj['min_machining_aperture'],
+            'install_blade_tip_num': obj['install_blade_tip_num'],
+            'cutting_blade_model': obj['cutting_blade_model'],
+            'cooling_hole': obj['cooling_hole'],
+            'locating_slot_code': obj['locating_slot_code'],
+            'installing_structure': obj['installing_structure'],
+            'tool_shim': obj['tool_shim'],
+            'cotter_pin': obj['cotter_pin'],
+            'pressing_plate': obj['pressing_plate'],
+            'screw': obj['screw'],
+            'spanner': obj['spanner'],
+            'cutter_head_diameter': obj['cutter_head_diameter'],
+            'interface_diameter': obj['interface_diameter'],
+            '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'],
+            'er_size_model': obj['er_size_model'],
+            'outer_diameter': obj['outer_diameter'],
+            'inner_diameter': obj['inner_diameter'],
+            'run_out_accuracy': obj['run_out_accuracy'],
+            'top_diameter': obj['top_diameter'],
+            'weight': obj['weight'],
+            'clamping_length': obj['clamping_length'],
+            'clamping_tolerance': obj['clamping_tolerance'],
+            'handle_ids': obj['weight'],
+            'blade_ids': obj['clamping_length'],
+        }]
+        return basic_param_str
 
 
 class CuttingSpeed(models.Model):
     _name = 'sf.cutting.speed'
     _description = '切削速度Vc'
 
-    # def _get_order(self):
-    #     last_tool = self.search([], order='id desc', limit=1)
-    #     if last_tool:
-    #         last_order = int(last_tool.order)
-    #         new_order = last_order + 1
-    #     else:
-    #         new_order = '1'
-    #     return new_order
-    #
-    # order = fields.Char('序', default=_get_order, readonly=True)
-
     product_template_id = fields.Many2one('product.template', string='产品')
-
+    standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='标准库')
     execution_standard_id = fields.Char('执行标准')
     material_code = fields.Char('材料代号')
     material_name = fields.Char('材料名称')
     material_grade = fields.Char('材料牌号')
     tensile_strength = fields.Float('拉伸强度 (N/mm²)')
     hardness = fields.Float('硬度(HRC)')
-
     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')
@@ -229,20 +230,52 @@ class CuttingSpeed(models.Model):
     precision_machining = fields.Char('精加工 Vc(m/min)')
     application = fields.Selection([('主应用', '主应用'), ('次应用', '次应用')], '主/次应用')
 
+    def _json_cutting_speed(self, obj):
+        cutting_speed_str = [0, '', {
+            'execution_standard_id': obj['execution_standard_id'],
+            'material_code': obj['material_code'],
+            'material_name': obj['material_name'],
+            '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
+
 
 class FeedPerTooth(models.Model):
     _name = 'sf.feed.per.tooth'
     _description = '每齿走刀量fz'
 
     product_template_id = fields.Many2one('product.template', string='产品')
+    standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='标准库')
 
     cutting_speed = fields.Char('径向切宽 ae(mm)')
     machining_method = fields.Selection([('直铣', '直铣'), ('坡铣', '坡铣')], string='加工方式')
     materials_type_id = fields.Many2one('sf.materials.model', string='材料型号')
-    blade_diameter = fields.Float('刃部直径D1(mm)', readonly=True, related='product_template_id.cutting_tool_blade_diameter')
+    blade_diameter = fields.Float('刃部直径D1(mm)', readonly=True,
+                                  related='product_template_id.cutting_tool_blade_diameter')
     feed_per_tooth = fields.Char('每齿走刀量 (mm/z)')
     unit = fields.Char('单位', default='fz')
 
+    def _json_feed_per_tooth(self, obj):
+        feed_per_tooth_str = [0, '', {
+            'cutting_speed': obj['cutting_speed'],
+            'machining_method': obj['machining_method'],
+            'materials_type_id': obj['materials_type_id'],
+            'blade_diameter': obj['blade_diameter'],
+            'feed_per_tooth': obj['feed_per_tooth'],
+            'unit': obj['unit'],
+        }]
+        return feed_per_tooth_str
+
     # @api.depends('product_template_id')
     # def _compute_product_template_id(self):
     #     if self.product_template_id is not None:
diff --git a/sf_manufacturing/security/ir.model.access.csv b/sf_manufacturing/security/ir.model.access.csv
index 66de9496..dd7077d7 100644
--- a/sf_manufacturing/security/ir.model.access.csv
+++ b/sf_manufacturing/security/ir.model.access.csv
@@ -4,16 +4,7 @@ access_sf_model_type,sf_model_type,model_sf_model_type,base.group_user,1,1,1,1
 access_sf_product_model_type_routing_sort,sf_product_model_type_routing_sort,model_sf_product_model_type_routing_sort,base.group_user,1,1,1,1
 access_sf_embryo_model_type_routing_sort,sf_embryo_model_type_routing_sort,model_sf_embryo_model_type_routing_sort,base.group_user,1,1,1,1
 access_sf_surface_technics_model_type_routing_sort,sf_surface_technics_model_type_routing_sort,model_sf_surface_technics_model_type_routing_sort,base.group_user,1,1,1,1
-
 access_sf_production_line,sf.production.line,model_sf_production_line,base.group_user,1,1,1,1
-
-access_sf_suitable_machining_method,sf_suitable_machining_method,model_sf_suitable_machining_method,base.group_user,1,1,1,1
-access_sf_blade_tip_characteristics,sf_blade_tip_characteristics,model_sf_blade_tip_characteristics,base.group_user,1,1,1,1
-access_sf_handle_type,sf_handle_type,model_sf_handle_type,base.group_user,1,1,1,1
-access_sf_cutting_direction,sf_cutting_direction,model_sf_cutting_direction,base.group_user,1,1,1,1
-access_sf_suitable_coolant,sf_suitable_coolant,model_sf_suitable_coolant,base.group_user,1,1,1,1
-access_sf_cutting_speed,sf_cutting_speed,model_sf_cutting_speed,base.group_user,1,1,1,1
-access_sf_feed_per_tooth,sf_feed_per_tooth,model_sf_feed_per_tooth,base.group_user,1,1,1,1
 access_maintenance_equipment_tool,maintenance_equipment_tool,model_maintenance_equipment_tool,base.group_user,1,1,1,1
 
 
diff --git a/sf_manufacturing/views/tool_other_features_view.xml b/sf_manufacturing/views/tool_other_features_view.xml
index 952f7bc8..63eafb44 100644
--- a/sf_manufacturing/views/tool_other_features_view.xml
+++ b/sf_manufacturing/views/tool_other_features_view.xml
@@ -1,178 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <!--  ======================================== 适合加工方式========================================-->
-    <record model="ir.ui.view" id="sf_suitable_machining_method_tree">
-        <field name="name">适合加工方式</field>
-        <field name="model">sf.suitable.machining.method</field>
-        <field name="arch" type="xml">
-            <tree>
-                <field name="name"/>
-                <field name="image" widget="image"/>
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="sf_suitable_machining_method_form">
-        <field name="name">适合加工方式</field>
-        <field name="model">sf.suitable.machining.method</field>
-        <field name="arch" type="xml">
-            <form>
-                <sheet>
-                    <group>
-                        <field name="name"/>
-                        <field name="image" widget="image"/>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="sf_suitable_machining_method_act" model="ir.actions.act_window">
-        <field name="name">适合加工方式</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.suitable.machining.method</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-
-    <!--  ======================================== 刀尖特征========================================-->
-    <record model="ir.ui.view" id="sf_blade_tip_characteristics_tree">
-        <field name="name">刀尖特征</field>
-        <field name="model">sf.blade.tip.characteristics</field>
-        <field name="arch" type="xml">
-            <tree>
-                <field name="name"/>
-                <field name="image" widget="image"/>
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="sf_blade_tip_characteristics_form">
-        <field name="name">刀尖特征</field>
-        <field name="model">sf.blade.tip.characteristics</field>
-        <field name="arch" type="xml">
-            <form>
-                <sheet>
-                    <group>
-                        <field name="name"/>
-                        <field name="image" widget="image"/>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="sf_blade_tip_characteristics_act" model="ir.actions.act_window">
-        <field name="name">刀尖特征</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.blade.tip.characteristics</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-
-    <!--  ======================================== 柄部类型========================================-->
-    <record model="ir.ui.view" id="sf_handle_type_tree">
-        <field name="name">柄部类型</field>
-        <field name="model">sf.handle.type</field>
-        <field name="arch" type="xml">
-            <tree>
-                <field name="name"/>
-                <field name="image" widget="image"/>
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="sf_handle_type_forme">
-        <field name="name">柄部类型</field>
-        <field name="model">sf.handle.type</field>
-        <field name="arch" type="xml">
-            <form>
-                <sheet>
-                    <group>
-                        <field name="name"/>
-                        <field name="image" widget="image"/>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="sf_handle_type_act" model="ir.actions.act_window">
-        <field name="name">柄部类型</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.handle.type</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-
-    <!--  ======================================== 走刀方向========================================-->
-    <record model="ir.ui.view" id="sf_cutting_direction_tree">
-        <field name="name">走刀方向</field>
-        <field name="model">sf.cutting.direction</field>
-        <field name="arch" type="xml">
-            <tree>
-                <field name="name"/>
-                <field name="image" widget="image"/>
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="sf_cutting_direction_form">
-        <field name="name">走刀方向</field>
-        <field name="model">sf.cutting.direction</field>
-        <field name="arch" type="xml">
-            <form>
-                <sheet>
-                    <group>
-                        <field name="name"/>
-                        <field name="image" widget="image"/>
-                    </group>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="sf_cutting_direction_act" model="ir.actions.act_window">
-        <field name="name">走刀方向</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.cutting.direction</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-
-    <!--  ======================================== 适合冷却液========================================-->
-    <record model="ir.ui.view" id="sf_suitable_coolant_tree">
-        <field name="name">适合冷却液</field>
-        <field name="model">sf.suitable.coolant</field>
-        <field name="arch" type="xml">
-            <tree>
-                <field name="name"/>
-                <field name="image" widget="image"/>
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="sf_suitable_coolant_form">
-        <field name="name">适合冷却液</field>
-        <field name="model">sf.suitable.coolant</field>
-        <field name="arch" type="xml">
-            <form>
-                <sheet>
-                    <field name="name"/>
-                    <field name="image" widget="image"/>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="sf_suitable_coolant_act" model="ir.actions.act_window">
-        <field name="name">适合冷却液</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.suitable.coolant</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-
     <!--  ======================================== 切削速度Vc========================================-->
     <record id="sf_cutting_speed_tree" model="ir.ui.view">
         <field name="name">切削速度Vc</field>
@@ -215,7 +42,7 @@
                 <field name="cutting_speed" attrs="{'readonly': [('materials_type_id','!=',False)]}"/>
                 <field name="machining_method" attrs="{'readonly': [('cutting_speed','!=',False)]}"/>
                 <field name="materials_type_id" attrs="{'readonly': [('cutting_speed','!=',False)]}"/>
-                <field name="blade_diameter"/>
+<!--                <field name="blade_diameter"/>-->
                 <field name="feed_per_tooth"/>
                 <field name="unit"/>
             </tree>
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index 14b3d9be..8aaefa83 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -1868,16 +1868,30 @@ class Cutting_tool_standard_library(models.Model):
         result = json.loads(r['result'])
         if result['status'] == 1:
             for item in result['cutting_tool_standard_library_all_list']:
-                cutting_tool_standard_library = self.search([("code", '=', item['code'])])
+                cutting_tool_standard_library = self.search(
+                    [("code", '=', item['code'].replace("JKM", result['factory_short_name']))])
                 cutting_tool_type = self.env['sf.cutting.tool.type'].search(
                     [("code", '=', item['cutting_tool_type_code'])])
                 cutting_tool_material = self.env['sf.cutting.tool.material'].search(
                     [("code", '=', item['cutting_tool_material_code'])])
                 materials_model = self.env['sf.materials.model'].search(
-                    [("code", '=', item['materials_model_code'])])
+                    [("materials_no", '=', item['material_model_code'])])
                 brand = self.env['sf.machine.brand'].search([("code", '=', item['brand_code'])])
+                basic_param_list = []
+                for basic_param_item in item['basic_parameter']:
+                    basic_param_list.append(
+                        self.env['sf.tool.materials.basic.parameters']._json_basic_param(basic_param_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['basic_parameter']:
+                    feed_per_tooth_list.append(
+                        self.env['sf.feed.per.tooth']._json_feed_per_tooth(feed_per_tooth_item))
                 if not cutting_tool_standard_library:
                     self.create({
+                        "code": item['code'].replace("JKM", result['factory_short_name']),
                         "name": item['name'],
                         "cutting_tool_material_id": cutting_tool_material.id,
                         "cutting_tool_type_id": cutting_tool_type.id,
@@ -1891,6 +1905,9 @@ class Cutting_tool_standard_library(models.Model):
                         "integral_coarse_medium_fine": item['integral_coarse_medium_fine'],
                         "integral_run_out_accuracy_max": item['integral_run_out_accuracy_max'],
                         "integral_run_out_accuracy_min": item['integral_run_out_accuracy_min'],
+                        "basic_parameters_ids": basic_param_list,
+                        "cutting_speed_ids": cutting_speed_list,
+                        "feed_per_tooth_ids": feed_per_tooth_list,
                         "active": item['active'],
                     })
                 else:
@@ -1908,6 +1925,9 @@ class Cutting_tool_standard_library(models.Model):
                          "integral_coarse_medium_fine": item['integral_coarse_medium_fine'],
                          "integral_run_out_accuracy_max": item['integral_run_out_accuracy_max'],
                          "integral_run_out_accuracy_min": item['integral_run_out_accuracy_min'],
+                         "basic_parameters_ids": basic_param_list,
+                         "cutting_speed_ids": cutting_speed_list,
+                         "feed_per_tooth_ids": feed_per_tooth_list,
                          "active": item['active'], }
                     )
         else:

From d83255cc67f44153ff236c875ad3ef5f0a019f24 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Thu, 19 Oct 2023 17:23:53 +0800
Subject: [PATCH 04/21] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E6=A0=87=E5=87=86=E5=BA=93=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=88=E5=8C=85=E5=90=AB=E5=85=A8=E9=83=A8=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E6=AF=8F=E6=97=A5=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/__manifest__.py                       |   4 +-
 sf_base/models/tool_base.py                   | 304 ---------
 sf_base/models/tool_base_new.py               |  48 +-
 sf_base/models/tool_other_features.py         | 161 ++++-
 sf_base/views/tool_views.xml                  | 289 ++++++--
 sf_maintenance/views/maintenance_views.xml    |  46 --
 sf_manufacturing/__manifest__.py              |   1 -
 .../models/tool_other_features.py             | 282 --------
 .../views/tool_other_features_view.xml        |  58 --
 sf_mrs_connect/models/res_config_setting.py   |  33 +-
 sf_mrs_connect/models/sync_common.py          | 645 +++++++++++-------
 11 files changed, 796 insertions(+), 1075 deletions(-)
 delete mode 100644 sf_base/models/tool_base.py
 delete mode 100644 sf_manufacturing/models/tool_other_features.py
 delete mode 100644 sf_manufacturing/views/tool_other_features_view.xml

diff --git a/sf_base/__manifest__.py b/sf_base/__manifest__.py
index 60077453..71af29bc 100644
--- a/sf_base/__manifest__.py
+++ b/sf_base/__manifest__.py
@@ -19,8 +19,8 @@
         'views/fixture_view.xml',
         'views/functional_fixture_view.xml',
         'views/menu_view.xml',
-        "views/tool_views.xml",
-        "views/tool_menu.xml",
+        'views/tool_views.xml',
+        'views/tool_menu.xml',
         'views/menu_fixture_view.xml',
 
     ],
diff --git a/sf_base/models/tool_base.py b/sf_base/models/tool_base.py
deleted file mode 100644
index 24a39ecc..00000000
--- a/sf_base/models/tool_base.py
+++ /dev/null
@@ -1,304 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging
-
-from odoo import fields, models, api
-# from odoo.exceptions import UserError
-# # from odoo.addons import sf_base, sf_common
-# from datetime import datetime
-
-
-# 功能刀具物料
-class CuttingToolMaterial(models.Model):
-    _name = 'sf.cutting.tool.material'
-    _description = '刀具物料'
-
-    code = fields.Char('编码')
-    name = fields.Char('名称')
-    remark = fields.Char('备注')
-    active = fields.Boolean('有效', default=True)
-
-
-# 功能刀具
-class FunctionalCuttingTool(models.Model):
-    _name = 'sf.functional.cutting.tool'
-    _description = '功能刀具'
-
-    code = fields.Char('编码')
-    name = fields.Char('名称')
-    functional_model_number = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型')
-    integral_model_number = fields.Many2one('sf.integral.cutting.tool', string='整体式刀具型号')
-    blade_model_number = fields.Many2one('sf.blade', string='刀片型号')
-    cutterbar_model_number = fields.Many2one('sf.cutter.bar', string='刀杆型号')
-    cutterpad_model_number = fields.Many2one('sf.cutter.pad', string='刀盘型号')
-    handle_model_number = fields.Many2one('sf.handle', string='刀柄型号')
-    chuck_model_number = fields.Many2one('sf.chuck', string='夹头型号')
-    diameter = fields.Float('直径(mm)')
-    tool_grade = fields.Selection([('1', 'P1'), ('2', 'P2'), ('3', 'P3'), ('4', 'P4'), ('5', 'P5'), ('6', 'P6')],
-                                  string='刀具等级')
-    machining_accuracy = fields.Float('加工精度(mm)')
-    tool_length = fields.Float('装刀长')
-    blade_number = fields.Integer('刃数')
-    integral_blade_length = fields.Float('整体刃长(mm)')
-    effective_blade_length = fields.Float('有效刃长(mm)')
-    max_life = fields.Float('最大寿命值')
-    is_standard = fields.Boolean('是否标准刀')
-    applicable_range = fields.Char('适用范围')
-    image = fields.Binary('图片')
-    active = fields.Boolean('有效', default=True)
-
-
-# 功能刀具类型
-class FunctionalCuttingToolModel(models.Model):
-    _name = 'sf.functional.cutting.tool.model'
-    _description = '功能刀具类型'
-
-    name = fields.Char('名称')
-    code = fields.Char('编码')
-    remark = fields.Char('备注')
-    active = fields.Boolean('有效', default=True)
-
-
-# 整体式刀具
-class IntegralCuttingTool(models.Model):
-    _name = 'sf.integral.cutting.tool'
-    _description = '整体式刀具'
-
-    code = fields.Char('编码')
-    name = fields.Char('型号名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    # 整体式刀具类型字段，关联整体式刀具类型对象
-    integral_model_number = fields.Many2one('sf.integral.cutting.tool.model', '整体式刀具类型')
-    # 增加品牌、总长度(mm)、柄部长度(mm)、刃部长度(mm)、直径(mm)、刃数、前角(°)、后角(°)、主偏角(°)、材料型号、配对螺母(mm)、适用夹头型号、适用范围、图片、创建人、创建时间等字段
-    brand = fields.Many2one('sf.machine.brand', '品牌', domain="[('tag_ids.name', 'ilike', '刀具')]")
-    total_length = fields.Float('总长度(mm)')
-    shank_length = fields.Float('柄部长度(mm)')
-    blade_length = fields.Float('刃部长度(mm)')
-    diameter = fields.Float('直径(mm)')
-    blade_number = fields.Integer('刃数')
-    front_angle = fields.Float('前角(°)')
-    rear_angle = fields.Float('后角(°)')
-    main_included_angle = fields.Float('主偏角(°)')
-    material_model = fields.Many2one('sf.materials.model', '材料型号')
-    nut = fields.Float('配对螺母(mm)')
-    # 适用夹头型号可以多选
-    chuck_model = fields.Many2many('sf.chuck', string='适用夹头型号')
-    scope = fields.Char('适用范围')
-    image = fields.Binary('图片')
-    active = fields.Boolean('有效', default=True)
-
-
-# 整体式刀具类型
-class IntegralCuttingToolModel(models.Model):
-    _name = 'sf.integral.cutting.tool.model'
-    _description = '整体式刀具类型'
-
-    code = fields.Char('编码')
-    name = fields.Char('名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    remark = fields.Char('备注')
-
-
-# 刀片
-class Blade(models.Model):
-    _name = 'sf.blade'
-    _description = '刀片'
-
-    code = fields.Char('编码')
-    name = fields.Char('型号名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    # 刀片类型字段，关联刀片类型对象
-    blade_model_number = fields.Many2one('sf.blade.model', '刀片类型')
-    # 编码、型号名称、刀片类型、品牌、长度L(mm)、宽度D(mm)、高度T(mm)、顶角(°)、前角(°)、后角(°)、主偏角(°)、R角(°)、材料型号、加工硬度、配对螺母(mm)、适用刀杆/刀盘型号、刀尖半径(mm)、图片、创建人、创建时间字段
-    brand = fields.Many2one('sf.machine.brand', '品牌', )
-    length = fields.Float('长度L(mm)')
-    width = fields.Float('宽度D(mm)')
-    height = fields.Float('高度T(mm)')
-    top_angle = fields.Float('顶角(°)')
-    front_angle = fields.Float('前角(°)')
-    rear_angle = fields.Float('后角(°)')
-    main_included_angle = fields.Float('主偏角(°)')
-    r_angle = fields.Float('R角(°)')
-    material_model = fields.Many2one('sf.materials.model', '材料型号')
-    hardness = fields.Char('加工硬度')
-    nut = fields.Float('配对螺母(mm)')
-    # 适用刀杆型号可以多选
-    cutter_bar = fields.Many2many('sf.cutter.bar', string='适用刀杆型号')
-    # 适用刀盘型号可以多选
-    cutter_pad = fields.Many2many('sf.cutter.pad', string='适用刀盘型号')
-    radius = fields.Float('刀尖半径(mm)')
-    image = fields.Binary('图片')
-
-
-# 刀片类型
-class BladeModel(models.Model):
-    _name = 'sf.blade.model'
-    _description = '刀片类型'
-
-    code = fields.Char('编码')
-    name = fields.Char('名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    # 刀片类型字段，关联刀片对象
-    blade_ids = fields.One2many('sf.blade', 'blade_model_number', '刀片类型')
-    remark = fields.Char('备注')
-
-
-# 刀杆
-class CutterBar(models.Model):
-    _name = 'sf.cutter.bar'
-    _description = '刀杆'
-
-    code = fields.Char('编码')
-    name = fields.Char('型号名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    # 刀杆类型字段，关联刀杆类型对象
-    cutter_bar_model_number = fields.Many2one('sf.cutter.bar.model', '刀杆类型')
-    # 品牌、C柄径(mm)、L总长(mm)、材料型号、刃数、D刃径(mm)、适用刀片型号、配对扳手(mm)、配备螺丝(mm)、刀尖圆角半径、精度等级、硬度(°)、适用范围、图片、创建人、创建时间
-    brand = fields.Many2one('sf.machine.brand', '品牌')
-    c_diameter = fields.Float('C柄径(mm)')
-    total_length = fields.Float('L总长(mm)')
-    material_model = fields.Many2one('sf.materials.model', '材料型号')
-    blade_number = fields.Integer('刃数')
-    d_diameter = fields.Float('D刃径(mm)')
-    blade = fields.Many2many('sf.blade', string='适用刀片型号')
-    wrench = fields.Float('配对扳手(mm)')
-    screw = fields.Float('配备螺丝(mm)')
-    radius = fields.Float('刀尖圆角半径')
-    accuracy = fields.Char('精度等级')
-    hardness = fields.Char('硬度(°)')
-    scope = fields.Char('适用范围')
-    image = fields.Binary('图片')
-
-
-# 刀杆类型
-class CutterBarModel(models.Model):
-    _name = 'sf.cutter.bar.model'
-    _description = '刀杆类型'
-
-    code = fields.Char('编码')
-    name = fields.Char('名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    remark = fields.Char('备注')
-
-
-# 刀盘
-class CutterPad(models.Model):
-    _name = 'sf.cutter.pad'
-    _description = '刀盘'
-
-    code = fields.Char('编码')
-    name = fields.Char('型号名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    # 刀盘类型字段，关联刀盘类型对象
-    cutter_pad_model_number = fields.Many2one('sf.cutter.pad.model', '刀盘类型')
-    # 增加品牌、C柄径(mm)、L总长(mm)、材料型号、刃数、D刃径(mm)、适用刀片型号、配对扳手(mm)、配备螺丝(mm)、刀尖圆角半径、精度等级、硬度(°)、适用范围、图片、创建人、创建时间
-    brand = fields.Many2one('sf.machine.brand', '品牌')
-    c_diameter = fields.Float('C柄径(mm)')
-    total_length = fields.Float('L总长(mm)')
-    material_model = fields.Many2one('sf.materials.model', '材料型号')
-    blade_number = fields.Integer('刃数')
-    d_diameter = fields.Float('D刃径(mm)')
-    blade = fields.Many2many('sf.blade', string='适用刀片型号')
-    wrench = fields.Float('配对扳手(mm)')
-    screw = fields.Float('配备螺丝(mm)')
-    radius = fields.Float('刀尖圆角半径')
-    accuracy = fields.Char('精度等级')
-    hardness = fields.Char('硬度(°)')
-    scope = fields.Char('适用范围')
-    image = fields.Binary('图片')
-
-
-# 刀盘类型
-class CutterPadModel(models.Model):
-    _name = 'sf.cutter.pad.model'
-    _description = '刀盘类型'
-
-    code = fields.Char('编码')
-    name = fields.Char('名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    remark = fields.Char('备注')
-
-
-# 刀柄
-class Handle(models.Model):
-    _name = 'sf.handle'
-    _description = '刀柄'
-
-    code = fields.Char('编码')
-    name = fields.Char('型号名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    # 刀柄类型字段，关联刀柄类型对象
-    handle_model_number = fields.Many2one('sf.handle.model', '刀柄类型')
-    # 增加、刀柄类型、品牌、L(mm)、L1(mm)、D1(mm)、重量(kg)、材料型号、本体精度(mm)、配对螺母(mm)、适用夹头型号、夹持范围(mm)、检测精度、检测硬度、标准转速、图片、创建人、创建时间
-    brand = fields.Many2one('sf.machine.brand', '品牌')
-    length = fields.Float('L(mm)')
-    length1 = fields.Float('L1(mm)')
-    diameter1 = fields.Float('D1(mm)')
-    weight = fields.Float('重量(kg)')
-    material_model = fields.Many2one('sf.materials.model', '材料型号')
-    body_accuracy = fields.Float('本体精度(mm)')
-    nut = fields.Float('配对螺母(mm)')
-    chuck_model = fields.Many2many('sf.chuck.model', string='适用夹头型号')
-    clamping_range = fields.Float('夹持范围(mm)')
-    detection_accuracy = fields.Float('检测精度')
-    detection_hardness = fields.Char('检测硬度')
-    standard_speed = fields.Float('标准转速')
-    image = fields.Binary('图片')
-
-
-# 刀柄类型
-class HandleModel(models.Model):
-    _name = 'sf.handle.model'
-    _description = '刀柄类型'
-
-    code = fields.Char('编码')
-    name = fields.Char('名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    remark = fields.Char('备注')
-
-
-# 夹头对象（夹头型号对象）
-class Chuck(models.Model):
-    _name = 'sf.chuck'
-    _description = '夹头'
-    _rec_name = 'code'
-
-    code = fields.Char('编码')
-    name = fields.Char('型号名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    # 夹头类型字段，关联夹头类型对象
-    chuck_model_number = fields.Many2one('sf.chuck.model', '夹头类型')
-    # 增加品牌、精度(mm)、外径(mm)、内径(mm)、高度(mm)、材料型号、配对螺母(mm)、适用刀柄型号、夹持范围(mm)、特性、图片、创建人、创建时间
-    brand = fields.Many2one('sf.machine.brand', '品牌')
-    accuracy = fields.Float('精度(mm)')
-    diameter = fields.Float('外径(mm)')
-    inner_diameter = fields.Float('内径(mm)')
-    height = fields.Float('高度(mm)')
-    material_model = fields.Many2one('sf.materials.model', '材料型号')
-    nut = fields.Float('配对螺母(mm)')
-    handle_model = fields.Many2many('sf.handle.model', string='适用刀柄型号')
-    clamping_range = fields.Float('夹持范围(mm)')
-    feature = fields.Char('特性')
-    image = fields.Binary('图片')
-
-
-# 夹头类型
-class ChuckModel(models.Model):
-    _name = 'sf.chuck.model'
-    _description = '夹头类型'
-
-    code = fields.Char('编码')
-    name = fields.Char('名称')
-    # 关联刀具物料
-    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    remark = fields.Char('备注')
diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py
index c0f84ed9..b4660948 100644
--- a/sf_base/models/tool_base_new.py
+++ b/sf_base/models/tool_base_new.py
@@ -103,6 +103,14 @@ class CuttingToolType(models.Model):
     remark = fields.Char('备注')
     active = fields.Boolean('有效', default=True)
 
+    def _get_ids(self, cutting_tool_type_code):
+        cutting_tool_type_ids = []
+        for item in cutting_tool_type_code:
+            cutting_tool_type = self.search([('code', '=', item)])
+            if cutting_tool_type:
+                cutting_tool_type_ids.append(cutting_tool_type.id)
+        return [(6, 0, cutting_tool_type_ids)]
+
 
 # 刀具标准库
 class CuttingToolModel(models.Model):
@@ -148,13 +156,28 @@ class CuttingToolModel(models.Model):
                                             '适合冷却液', domain=[('type', '=', '冷却液')])
     compaction_way_ids = fields.Many2many('maintenance.equipment.image', 'compaction_way_library_rel',
                                           '压紧方式', domain=[('type', '=', '压紧方式')])
-    basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
-                                                          'standard_library_id', string='基本参数')
+    integral_tool_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
+                                                          'standard_library_id', string='整体式刀具基本参数')
+    blade_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
+                                                           'standard_library_id', string='刀片基本参数')
+    cutter_bar_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
+                                                                  'standard_library_id', string='刀杆基本参数')
+    cutter_head_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
+                                                                 'standard_library_id', string='刀盘基本参数')
+    knife_handle_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
+                                                                  'standard_library_id', string='刀柄基本参数')
+    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')
-
+    feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz',
+                                         domain=[('cutting_speed', '!=', False)])
+    feed_per_tooth_ids_2 = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz',
+                                           domain=[('machining_method', '!=', False)])
+    feed_per_tooth_ids_3 = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz',
+                                           domain=[('cutting_speed', '!=', False)])
+    feed_per_tooth_ids_4 = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz',
+                                           domain=[('machining_method', '!=', False)])
     material_model_id = fields.Many2one('sf.materials.model', '材料型号')
-    nut = fields.Float('配对螺母(mm)')
     # 适用夹头型号可以多选
     chuck_ids = fields.Many2many(
         'sf.cutting.tool.type',
@@ -163,8 +186,6 @@ class CuttingToolModel(models.Model):
         column2='model_id_2',
         domain="[('cutting_tool_material_id.name', '=', '夹头')]",
         string='适用夹头型号')
-
-    working_hardness = fields.Char('加工硬度(hrc)')
     cutter_bar_ids = fields.Many2many(
         'sf.cutting.tool.type',
         relation='cutting_tool_type_library_cutter_bar_rel',
@@ -182,7 +203,6 @@ class CuttingToolModel(models.Model):
         string='适用刀盘型号'  # 使用空列表作为默认值
     )
     # 刀杆/参数
-    blade_diameter = fields.Float('刃径(mm)')
     blade_ids = fields.Many2many(
         'sf.cutting.tool.type',
         relation='cutting_tool_type_library_pad_blade_rel',
@@ -202,8 +222,8 @@ class CuttingToolModel(models.Model):
     active = fields.Boolean('有效', default=True)
     is_cloud = fields.Boolean('云端数据', default=False)
 
-    def get_cutter_bar_ids(self):
-        return self.cutter_bar_ids
+    # def get_cutter_bar_ids(self):
+    #     return self.cutter_bar_ids
 
 
 class MaintenanceStandardImage(models.Model):
@@ -219,6 +239,14 @@ class MaintenanceStandardImage(models.Model):
         string='特征')
     equipment_id = fields.Many2many('maintenance.equipment', 'image_id', string='设备')
 
+    def _get_ids(self, name_arr):
+        ability_feature_ids = []
+        for item in name_arr:
+            ability_feature = self.search([('name', '=', item)])
+            if ability_feature:
+                ability_feature_ids.append(ability_feature.id)
+        return [(6, 0, ability_feature_ids)]
+
     @api.model
     def name_search(self, name='', args=None, operator='ilike', limit=100):
         # 调用父类的name_search方法，获取原始的结果列表
diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py
index 97bb0645..b4f8b191 100644
--- a/sf_base/models/tool_other_features.py
+++ b/sf_base/models/tool_other_features.py
@@ -113,6 +113,7 @@ class ToolMaterialsBasicParameters(models.Model):
     weight = fields.Char('重量(kg)', size=20)
     clamping_length = fields.Char('夹持长度(mm)', size=20)
     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',
@@ -122,25 +123,33 @@ class ToolMaterialsBasicParameters(models.Model):
         string='适用刀柄型号'
     )
 
-    def _json_basic_param(self, obj):
-        basic_param_str = [0, '', {
+    def _json_integral_tool_basic_param(self, obj):
+        integral_tool_basic_param_str = (0, '', {
             'code': obj['code'],
+            '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_diameter': obj['neck_diameter'],
             '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_diameter': obj['blade_diameter'],
-            'blade_length': obj['blade_length'],
             '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, '', {
+            'code': obj['code'],
+            'cutting_tool_type': obj['cutting_tool_type'],
             'length': obj['length'],
             'thickness': obj['thickness'],
             'width': obj['width'],
@@ -149,9 +158,12 @@ class ToolMaterialsBasicParameters(models.Model):
             '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': 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'],
@@ -161,22 +173,68 @@ class ToolMaterialsBasicParameters(models.Model):
             '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, '', {
+            'code': obj['code'],
+            'cutting_tool_type': obj['cutting_tool_type'],
             'height': obj['height'],
+            'width': obj['width'],
+            'blade_height': obj['blade_height'],
+            'total_length': obj['total_length'],
+            'blade_width': obj['blade_width'],
+            'blade_length': obj['blade_length'],
             'blade_height': obj['blade_height'],
             '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'],
             'cooling_hole': obj['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.type']._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, '', {
+            'code': obj['code'],
+            '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.type']._get_ids(
+                obj['blade_codes']),
+            'screw': obj['screw'],
+            'spanner': obj['spanner'],
+            'cutting_blade_model': obj['cutting_blade_model'],
+            'cooling_hole': obj['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, '', {
+            'code': obj['code'],
+            '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'],
@@ -190,23 +248,40 @@ class ToolMaterialsBasicParameters(models.Model):
             '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'],
+            'is_rough_machining': obj['whether_rough_machining'],
+            'is_finish_machining': obj['whether_finish_machining'],
+            'is_quick_cutting': obj['whether_quick_cutting'],
+            'is_drill_hole': obj['whether_drill_hole'],
+            'is_safe_lock': obj['whether_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, '', {
+            'code': obj['code'],
+            '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'],
-            'handle_ids': obj['weight'],
-            'blade_ids': obj['clamping_length'],
-        }]
-        return basic_param_str
+            'max_load_capacity': obj['max_load_capacity'],
+            'handle_ids': [(6, 0, [])] if not obj.get(
+                'handle_codes') else self.evn['sf.cutting.tool.type']._get_ids(obj['handle_codes']),
+            'cooling_jacket': obj['cooling_jacket'],
+        })
+        return chuck_basic_param_str
 
 
 class CuttingSpeed(models.Model):
@@ -215,11 +290,13 @@ class CuttingSpeed(models.Model):
 
     # product_template_id = fields.Many2one('product.template', string='产品')
     standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='标准库')
-    execution_standard_id = fields.Char('执行标准')
+    execution_standard_id = fields.Many2one('sf.international.standards', string='执行标准', store=True)
     material_code = fields.Char('材料代号')
-    material_name = fields.Char('材料名称')
+    material_id = fields.Many2one('sf.materials.model', '材料名称',
+                                  domain="[('standards_id', '=', execution_standard_id)]")
+    slope_milling_angle = fields.Integer('坡铣角度(°)')
     material_grade = fields.Char('材料牌号')
-    tensile_strength = fields.Float('拉伸强度 (N/mm²)')
+    tensile_strength = fields.Char('拉伸强度 (N/mm²)')
     hardness = fields.Float('硬度(HRC)')
     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')
@@ -231,10 +308,11 @@ class CuttingSpeed(models.Model):
     application = fields.Selection([('主应用', '主应用'), ('次应用', '次应用')], '主/次应用')
 
     def _json_cutting_speed(self, obj):
-        cutting_speed_str = [0, '', {
-            'execution_standard_id': obj['execution_standard_id'],
+        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_name': obj['material_name'],
+            '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'],
@@ -246,36 +324,57 @@ class CuttingSpeed(models.Model):
             'rough_machining': obj['rough_machining'],
             'precision_machining': obj['precision_machining'],
             'application': obj['application'],
-        }]
+        })
         return cutting_speed_str
 
 
 class FeedPerTooth(models.Model):
     _name = 'sf.feed.per.tooth'
     _description = '每齿走刀量fz'
+    _order = 'machining_method desc, blade_diameter, materials_type_id'
 
     # product_template_id = fields.Many2one('product.template', string='产品')
     standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='标准库')
-
     cutting_speed = fields.Char('径向切宽 ae(mm)')
     machining_method = fields.Selection([('直铣', '直铣'), ('坡铣', '坡铣')], string='加工方式')
     materials_type_id = fields.Many2one('sf.materials.model', string='材料型号')
-    # blade_diameter = fields.Float('刃部直径D1(mm)', readonly=True,
-    #                               related='product_template_id.cutting_tool_blade_diameter')
+    blade_diameter = fields.Char('刃部直径(mm)', readonly=True)
     feed_per_tooth = fields.Char('每齿走刀量 (mm/z)')
-    unit = fields.Char('单位', default='fz')
 
     def _json_feed_per_tooth(self, obj):
-        feed_per_tooth_str = [0, '', {
+        feed_per_tooth_str = (0, '', {
             'cutting_speed': obj['cutting_speed'],
-            'machining_method': obj['machining_method'],
-            'materials_type_id': obj['materials_type_id'],
-            # 'blade_diameter': obj['blade_diameter'],
+            'blade_diameter': obj['blade_diameter'],
             'feed_per_tooth': obj['feed_per_tooth'],
-            'unit': obj['unit'],
-        }]
+        })
         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):
     #     if self.product_template_id is not None:
diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index ed561325..bc1c9605 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -249,65 +249,227 @@
                                 <field name="suitable_coolant_ids" string="" widget="custom_many2many_checkboxes"/>
                             </group>
                         </group>
-                        <!--                        <notebook>-->
-                        <!--                            <page string="基本参数">-->
-                        <!--                                <field name="tool_materials_basic_parameters_ids">-->
-                        <!--                                    <tree editable="bottom" class="center">-->
-                        <!--                                        <field name="code"/>-->
-                        <!--                                        <field name="total_length"/>-->
-                        <!--                                        <field name="blade_diameter"/>-->
-                        <!--                                        <field name="blade_length"/>-->
-                        <!--                                        <field name="blade_number"/>-->
-                        <!--                                        <field name="neck_length"/>-->
-                        <!--                                        <field name="neck_diameter"/>-->
-                        <!--                                        <field name="handle_length"/>-->
-                        <!--                                        <field name="handle_diameter"/>-->
-                        <!--                                        <field name="blade_tip_diameter"/>-->
-                        <!--                                        <field name="blade_tip_working_size"/>-->
-                        <!--                                        <field name="blade_tip_taper"/>-->
-                        <!--                                        <field name="blade_helix_angle"/>-->
-                        <!--                                        <field name="blade_width"/>-->
-                        <!--                                        <field name="blade_depth"/>-->
-                        <!--                                        <field name="pitch"/>-->
-                        <!--                                        <field name="cutting_depth"/>-->
-                        <!--                                    </tree>-->
-                        <!--                                </field>-->
-                        <!--                            </page>-->
-                        <!--                            <page string="切削速度Vc"-->
-                        <!--                                  attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}">-->
-                        <!--                                <field name="cutting_speed_ids">-->
-                        <!--                                    <tree editable="bottom" class="center">-->
-                        <!--                                        <field name="execution_standard_id"/>-->
-                        <!--                                        <field name="material_code"/>-->
-                        <!--                                        <field name="material_name_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>-->
-                        <!--                            </page>-->
-                        <!--                            <page string="每齿走刀量fz"-->
-                        <!--                                  attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}">-->
-                        <!--                                <field name="feed_per_tooth_ids">-->
-                        <!--                                    <tree editable="bottom" class="center">-->
-                        <!--                                        <field name="cutting_speed"/>-->
-                        <!--                                        <field name="machining_method"/>-->
-                        <!--                                        <field name="materials_type_id"/>-->
-                        <!--                                        <field name="blade_diameter"/>-->
-                        <!--                                        <field name="feed_per_tooth"/>-->
-                        <!--                                        <field name="unit"/>-->
-                        <!--                                    </tree>-->
-                        <!--                                </field>-->
-                        <!--                            </page>-->
-                        <!--                        </notebook>-->
+                        <notebook>
+                            <page string="基本参数">
+                                <field name="integral_tool_basic_parameters_ids" import_button="true"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
+                                    <tree editable="bottom" class="center" delete="1">
+                                        <field name="cutting_tool_type" invisible="1"/>
+                                        <field name="code"/>
+                                        <field name="total_length"/>
+                                        <field name="blade_diameter" class="diameter"/>
+                                        <field name="blade_length"/>
+                                        <field name="blade_number" placeholder="请选择"/>
+                                        <field name="neck_length"/>
+                                        <field name="neck_diameter" class="diameter"/>
+                                        <field name="handle_diameter" class="diameter"/>
+                                        <field name="handle_length"/>
+                                        <field name="blade_tip_working_size" class="du"/>
+                                        <field name="blade_tip_diameter" class="diameter"/>
+                                        <field name="blade_tip_taper" class="du"/>
+                                        <field name="blade_helix_angle" class="du"/>
+                                        <field name="pitch"/>
+                                        <field name="blade_width"/>
+                                        <field name="blade_depth"/>
+                                        <field name="cutting_depth"/>
+                                    </tree>
+                                </field>
+
+                                <field name="blade_basic_parameters_ids"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}">
+                                    <tree editable="bottom" class="center" delete="1">
+                                        <field name="cutting_tool_type" invisible="1"/>
+                                        <field name="code"/>
+                                        <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="chip_breaker_groove" placeholder="请选择"/>
+                                        <field name="blade_teeth_model" placeholder="请选择"/>
+                                        <field name="cutting_depth" string="最大切削深度(mm)"/>
+                                        <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"/>
+                                    </tree>
+                                </field>
+                                <field name="cutter_bar_basic_parameters_ids"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}">
+                                    <tree editable="bottom" class="center" delete="1">
+                                        <field name="cutting_tool_type" invisible="1"/>
+                                        <field name="code"/>
+                                        <field name="height"/>
+                                        <field name="width"/>
+                                        <field name="total_length"/>
+                                        <field name="blade_height"/>
+                                        <field name="blade_width"/>
+                                        <field name="blade_length"/>
+                                        <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="min_machining_aperture" class="diameter"/>
+                                        <field name="install_blade_tip_num"/>
+                                        <field name="cutting_blade_model"/>
+                                        <field name="cooling_hole" placeholder="请选择"/>
+                                        <field name="locating_slot_code"/>
+                                        <field name="installing_structure"/>
+                                        <field name="blade_ids" widget="many2many_tags" placeholder="请选择"/>
+                                        <field name="tool_shim"/>
+                                        <field name="cotter_pin"/>
+                                        <field name="pressing_plate"/>
+                                        <field name="screw"/>
+                                        <field name="spanner"/>
+                                    </tree>
+                                </field>
+
+                                <field name="cutter_head_basic_parameters_ids"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}">
+                                    <tree editable="bottom" class="center" delete="1">
+                                        <field name="cutting_tool_type" invisible="1"/>
+                                        <field name="code"/>
+                                        <field name="install_blade_tip_num"/>
+                                        <field name="blade_diameter" class="diameter"/>
+                                        <field name="cutter_head_diameter" class="diameter"/>
+                                        <field name="interface_diameter" class="diameter"/>
+                                        <field name="total_length"/>
+                                        <field name="blade_length"/>
+                                        <field name="cutting_depth" string="最大切削深度(mm)"/>
+                                        <field name="main_included_angle" class="du"/>
+                                        <field name="installing_structure"/>
+                                        <field name="blade_ids" widget="many2many_tags" placeholder="请选择"/>
+                                        <field name="screw"/>
+                                        <field name="spanner"/>
+                                        <field name="cutting_blade_model"/>
+                                        <field name="cooling_hole" placeholder="请选择"/>
+                                        <field name="locating_slot_code"/>
+                                    </tree>
+                                </field>
+
+                                <field name="knife_handle_basic_parameters_ids"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}">
+                                    <tree editable="bottom" class="center" delete="1">
+                                        <field name="cutting_tool_type" invisible="1"/>
+                                        <field name="code"/>
+                                        <field name="total_length"/>
+                                        <field name="flange_shank_length"/>
+                                        <field name="handle_external_diameter" class="diameter"/>
+                                        <field name="handle_inside_diameter" class="diameter"/>
+                                        <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="cooling_model"/>
+                                        <field name="is_rough_machining" placeholder="请选择"/>
+                                        <field name="is_finish_machining" placeholder="请选择"/>
+                                        <field name="is_quick_cutting" placeholder="请选择"/>
+                                        <field name="is_drill_hole" placeholder="请选择"/>
+                                        <field name="is_safe_lock" placeholder="请选择"/>
+                                        <field name="screw"/>
+                                        <field name="spanner"/>
+                                    </tree>
+                                </field>
+                                <field name="chuck_basic_parameters_ids"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}">
+                                    <tree editable="bottom" class="center" delete="1">
+                                        <field name="cutting_tool_type" invisible="1"/>
+                                        <field name="code"/>
+                                        <field name="er_size_model"/>
+                                        <field name="min_clamping_diameter" class="diameter" required="1"/>
+                                        <field name="max_clamping_diameter" class="diameter"/>
+                                        <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>
+                            </page>
+                            <page string="切削速度Vc"
+                                  attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}">
+                                <field name="cutting_speed_ids">
+                                    <tree editable="bottom" class="center" delete="1">
+                                        <field name="execution_standard_id" placeholder="请选择" required="1"/>
+                                        <field name="material_code" readonly="1"/>
+                                        <field name="material_id" placeholder="请选择"
+                                               attrs="{'readonly': [('execution_standard_id', '=', False)], 'required': [('execution_standard_id', '!=', False)]}"/>
+                                        <field name="material_grade" readonly="1"/>
+                                        <field name="tensile_strength" readonly="1"/>
+                                        <field name="hardness" readonly="1"/>
+                                        <field name="slope_milling_angle" widget="du"/>
+                                        <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" placeholder="请选择" required="1"/>
+                                    </tree>
+                                </field>
+                            </page>
+                            <page string="每齿走刀量fz"
+                                  attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}">
+                                <field name="feed_per_tooth_ids"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具'))]}">
+                                    <tree editable="bottom" class="center" create="0" delete="0">
+                                        <field name="cutting_speed"/>
+                                        <field name="blade_diameter"/>
+                                        <field name="feed_per_tooth" required="1"/>
+                                    </tree>
+                                </field>
+                                <field name="feed_per_tooth_ids_2"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具'))]}">
+                                    <tree editable="bottom" class="center" create="0" delete="0">
+                                        <field name="machining_method"/>
+                                        <field name="materials_type_id"/>
+                                        <field name="blade_diameter"/>
+                                        <field name="feed_per_tooth" required="1"/>
+                                    </tree>
+                                </field>
+                                <field name="feed_per_tooth_ids_3"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}">
+                                    <tree editable="bottom" class="center" create="0" delete="0">
+                                        <field name="cutting_speed"/>
+                                        <field name="feed_per_tooth" required="1"/>
+                                    </tree>
+                                </field>
+                                <field name="feed_per_tooth_ids_4"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}">
+                                    <tree editable="bottom" class="center" create="0" delete="0">
+                                        <field name="machining_method"/>
+                                        <field name="materials_type_id"/>
+                                        <field name="feed_per_tooth" required="1"/>
+                                    </tree>
+                                </field>
+                            </page>
+                        </notebook>
                     </sheet>
                 </form>
             </field>
@@ -360,16 +522,16 @@
         </record>
     </data>
 
-       <!-- ================================================能力特征库================================================ -->
-     <record id="view_maintenance_equipment_image_tree" model="ir.ui.view">
+    <!-- ================================================能力特征库================================================ -->
+    <record id="view_maintenance_equipment_image_tree" model="ir.ui.view">
         <field name="name">maintenance.equipment.image.tree</field>
         <field name="model">maintenance.equipment.image</field>
         <field name="arch" type="xml">
-            <tree string="能力特征库" editable="bottom" delete="0" create="0" >
+            <tree string="能力特征库" editable="bottom" delete="0" create="0">
                 <field name="name" readonly="1"/>
                 <field name="type" readonly="1"/>
                 <field name="image" widget="image" readonly="1"/>
-                <field name="equipment_id" />
+                <field name="equipment_id"/>
                 <field name="active" invisible="1"/>
             </tree>
         </field>
@@ -397,5 +559,4 @@
     </record>
 
 
-
 </odoo>
diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml
index 9ab34c2f..ac3775e0 100644
--- a/sf_maintenance/views/maintenance_views.xml
+++ b/sf_maintenance/views/maintenance_views.xml
@@ -1135,51 +1135,5 @@
     <!--    groups="maintenance.group_equipment_manager,base.group_user"-->
     <!--    sequence="1"/-->
     <!--    设备图文展示-->
-<<<<<<< HEAD
-=======
-    <record id="view_maintenance_equipment_image_tree" model="ir.ui.view">
-        <field name="name">maintenance.equipment.image.tree</field>
-        <field name="model">maintenance.equipment.image</field>
-        <field name="arch" type="xml">
-            <tree string="能力特征库" editable="bottom" delete="0" create="0">
-                <field name="name" readonly="1"/>
-                <field name="type" readonly="1"/>
-                <field name="image" widget="image" readonly="1"/>
-                <field name="equipment_id"/>
-                <field name="active" invisible="1"/>
-            </tree>
-        </field>
-    </record>
-
-
-    <record model="ir.ui.view" id="view_maintenance_equipment_image_search">
-        <field name="name">maintenance.equipment.image.search</field>
-        <field name="model">maintenance.equipment.image</field>
-        <field name="arch" type="xml">
-            <search>
-                <field name="name"/>
-                <searchpanel class="account_root">
-                    <field name="type" icon="fa-filter" enable_counters="1"/>
-                </searchpanel>
-            </search>
-        </field>
-    </record>
-
-    <record id="action_maintenance_equipment_image" model="ir.actions.act_window">
-        <field name="name">能力特征库</field>
-        <field name="res_model">maintenance.equipment.image</field>
-        <field name="view_mode">tree</field>
-        <field name="domain">[]</field>
-    </record>
-
-    <menuitem
-            id="maintenance_equipment_image_form"
-            name="能力特征库"
-            parent="maintenance.menu_m_request"
-            action="action_maintenance_equipment_image"
-            groups="maintenance.group_equipment_manager,base.group_user"
-            sequence="2"/>
->>>>>>> 9b5a0162ff1f972a9e99e09624b98c13150b64d9
-
 
 </odoo>
\ No newline at end of file
diff --git a/sf_manufacturing/__manifest__.py b/sf_manufacturing/__manifest__.py
index e2be4958..9800bf5d 100644
--- a/sf_manufacturing/__manifest__.py
+++ b/sf_manufacturing/__manifest__.py
@@ -21,7 +21,6 @@
         'views/production_line_view.xml',
         'views/mrp_workcenter_views.xml',
         'views/mrp_workorder_view.xml',
-        'views/tool_other_features_view.xml',
         'views/model_type_view.xml',
         'views/sf_maintenance_equipment.xml',
         # 'views/kanban_change.xml'
diff --git a/sf_manufacturing/models/tool_other_features.py b/sf_manufacturing/models/tool_other_features.py
deleted file mode 100644
index 569b7f9f..00000000
--- a/sf_manufacturing/models/tool_other_features.py
+++ /dev/null
@@ -1,282 +0,0 @@
-from odoo import fields, models, api
-
-
-class ToolMaterialsBasicParameters(models.Model):
-    _name = 'sf.tool.materials.basic.parameters'
-    _description = '刀具物料基本参数'
-
-    standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀具标准库')
-    cutting_tool_type = fields.Char(related='cutting_tool_model_id.cutting_tool_type', string='刀具物料类型',
-                                    store=True)
-    # cutting_tool_type_1 = fields.Char(related='cutting_tool_type', string='类型', store=True)
-
-    # 整体式刀具参数
-    code = fields.Char('物料号', size=50)
-    total_length = fields.Char('总长度(mm)', size=20)
-    blade_number = fields.Selection(
-        [('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8')],
-        string='刃数(个)')
-    neck_diameter = fields.Char('颈部直径(mm)', size=20)
-    neck_length = fields.Char('颈部长度(mm)', size=20)
-    handle_diameter = fields.Char('柄部直径(mm)', size=20)
-    handle_length = fields.Char('柄部长度(mm)', size=20)
-    blade_tip_diameter = fields.Char('刀尖直径(mm)', size=20)
-    blade_tip_working_size = fields.Char('刀尖处理尺寸(R半径mm/倒角)', size=20)
-    blade_tip_taper = fields.Integer('刀尖锥度(°)')
-    blade_diameter = fields.Char('刃部直径(mm)', size=20)
-    blade_length = fields.Char('刃部长度(mm)', size=20)
-    blade_helix_angle = fields.Integer('刃部螺旋角(°)')
-    blade_width = fields.Char('刃部宽度(mm)', size=20)
-    blade_depth = fields.Char('刃部深度(mm)', size=20)
-    pitch = fields.Char('牙距(mm)', size=20)
-    cutting_depth = fields.Char('切削深度(mm)', size=20)
-    # 刀片参数
-    length = fields.Char('长度(mm)', size=20)
-    thickness = fields.Char('厚度(mm)', size=20)
-    width = fields.Char('宽度(mm)', size=20)
-    cutting_blade_length = fields.Char('切削刃长(mm)', size=20)
-    relief_angle = fields.Integer('后角(°)')
-    blade_tip_circular_arc_radius = fields.Char('刀尖圆弧半径(mm)', size=20)
-    inscribed_circle_diameter = fields.Char('内接圆直径(mm)', size=20)
-    install_aperture_diameter = fields.Char('安装孔直径(mm)', size=20)
-    chip_breaker_groove = fields.Selection([('无', '无'), ('单面', '单面'), ('双面', '双面')],
-                                           string='有无断屑槽')
-    blade_teeth_model = fields.Selection(
-        [('V牙型', 'V牙型'), ('米制全牙型', '米制全牙型'), ('美制全牙型', '美制全牙型'),
-         ('惠氏全牙型', '惠氏全牙型'), ('BSPT全牙型', 'BSPT全牙型'), ('NPT全牙型', 'NPT全牙型'),
-         ('UNJ全牙型', 'UNJ全牙型'), ('DIN405圆牙型', 'DIN405圆牙型'), ('ACME梯形', 'ACME梯形'),
-         ('石油管螺纹刀片', '石油管螺纹刀片'), ('矮牙ACME梯形', '矮牙ACME梯形'),
-         ('Trapeze30° 103', 'Trapeze30° 103')], string='刀片牙型')
-    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='刀片的刃数(个)')
-    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='螺纹类型')
-    thread_num = fields.Char('每英寸螺纹数(TPI)', size=20)
-    blade_tip_height_tolerance = fields.Char('刀尖高度公差(mm)', size=20)
-    inscribed_circle_tolerance = fields.Char('内接圆公差(mm)', size=20)
-    thickness_tolerance = fields.Char('厚度公差(mm)', size=20)
-    # 刀杆参数
-    height = fields.Char('高度(mm)', size=20)
-    blade_height = fields.Char('刃部高度(mm)', size=20)
-    cutter_arbor_diameter = fields.Char('刀杆直径(mm)', size=20)
-    min_machining_aperture = fields.Char('最小加工孔径(mm)', size=20)
-    install_blade_tip_num = fields.Char('可装刀片数/齿数(个)', size=20)
-    cutting_blade_model = fields.Char('切削类型', size=20)
-    cooling_hole = fields.Selection([('有', '有'), ('无', '无')], string='有无冷却孔')
-    locating_slot_code = fields.Char('定位槽代号', size=20)
-    installing_structure = fields.Char('安装结构', size=20)
-    blade_ids = fields.Many2many(
-        'sf.cutting.tool.type',
-        relation='cutting_tool_type_library_pad_blade_rel',
-        column1='model_id_1',
-        column2='model_id_2',
-        domain="[('cutting_tool_material_id.name', '=', '刀片')]",
-        string='适配刀片型号'  # 使用空列表作为默认值
-    )
-    tool_shim = fields.Char('适配刀垫型号', size=50)
-    cotter_pin = fields.Char('适配销钉型号', size=50)
-    pressing_plate = fields.Char('适配压板型号', size=50)
-    screw = fields.Char('适配螺钉型号', size=50)
-    spanner = fields.Char('适配扳手型号', size=50)
-    # 刀盘参数
-    cutter_head_diameter = fields.Char('刀盘直径(mm)', size=20)
-    interface_diameter = fields.Char('接口直径(mm)', size=20)
-    # 刀柄参数
-    flange_shank_length = fields.Char('法兰柄长(mm)', size=20)
-    handle_external_diameter = fields.Char('柄部外径(mm)', size=20)
-    handle_inside_diameter = fields.Char('柄部内径(mm)', size=20)
-    min_clamping_diameter = fields.Char('最小夹持直径(mm)', size=20)
-    max_clamping_diameter = fields.Char('最大夹持直径(mm)', size=20)
-    clamping_mode = fields.Char('夹持方式', size=20)
-    max_load_capacity = fields.Char('最大负载能力(kg)', size=20)
-    taper = fields.Integer('锥度(°)')
-    tool_changing_time = fields.Integer('换刀时间(s)')
-    standard_rotate_speed = fields.Char('标准转速(n/min)', size=20)
-    max_rotate_speed = fields.Char('最大转速(n/min)', size=20)
-    diameter_slip_accuracy = fields.Char('径跳精度(mm)', size=20)
-    cooling_model = fields.Char('冷却类型', size=20)
-    is_rough_machining = fields.Selection([('是', '是'), ('否', '否')], string='是否可粗加工')
-    is_finish_machining = fields.Selection([('是', '是'), ('否', '否')], string='是否可精加工')
-    is_quick_cutting = fields.Selection([('是', '是'), ('否', '否')], string='是否可高速切削')
-    is_drill_hole = fields.Selection([('是', '是'), ('否', '否')], string='是否可钻孔')
-    is_safe_lock = fields.Selection([('是', '是'), ('否', '否')], string='有无安全锁')
-    # 夹头参数
-    er_size_model = fields.Char('ER尺寸型号', size=20)
-    outer_diameter = fields.Char('外径(mm)', size=20)
-    inner_diameter = fields.Char('内径(mm)', size=20)
-    run_out_accuracy = fields.Char('跳动精度(mm)', size=20)
-    top_diameter = fields.Char('顶部直径(mm)', size=20)
-    weight = fields.Char('重量(kg)', size=20)
-    clamping_length = fields.Char('夹持长度(mm)', size=20)
-    clamping_tolerance = fields.Char('夹持公差(mm)', size=20)
-    handle_ids = fields.Many2many(
-        'sf.cutting.tool.type',
-        relation='cutting_tool_type_library_chuck_handle_rel',
-        column1='model_id_1',
-        column2='model_id_2',
-        domain="[('cutting_tool_material_id.name', '=', '刀柄')]",
-        string='适用刀柄型号'
-    )
-
-    def _json_basic_param(self, obj):
-        basic_param_str = [0, '', {
-            'code': obj['code'],
-            'total_length': obj['total_length'],
-            'blade_number': obj['blade_number'],
-            'neck_diameter': obj['neck_diameter'],
-            'neck_length': obj['neck_length'],
-            '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_diameter': obj['blade_diameter'],
-            'blade_length': obj['blade_length'],
-            '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'],
-            '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'],
-            'chip_breaker_groove': obj['chip_breaker_groove'],
-            'blade_teeth_model': obj['bladed_teeth_model'],
-            'blade_blade_number': obj['blade_blade_number'],
-            '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': 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'],
-            'height': obj['height'],
-            'blade_height': obj['blade_height'],
-            'cutter_arbor_diameter': obj['cutter_arbor_diameter'],
-            'min_machining_aperture': obj['min_machining_aperture'],
-            'install_blade_tip_num': obj['install_blade_tip_num'],
-            'cutting_blade_model': obj['cutting_blade_model'],
-            'cooling_hole': obj['cooling_hole'],
-            'locating_slot_code': obj['locating_slot_code'],
-            'installing_structure': obj['installing_structure'],
-            'tool_shim': obj['tool_shim'],
-            'cotter_pin': obj['cotter_pin'],
-            'pressing_plate': obj['pressing_plate'],
-            'screw': obj['screw'],
-            'spanner': obj['spanner'],
-            'cutter_head_diameter': obj['cutter_head_diameter'],
-            'interface_diameter': obj['interface_diameter'],
-            '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'],
-            'er_size_model': obj['er_size_model'],
-            'outer_diameter': obj['outer_diameter'],
-            'inner_diameter': obj['inner_diameter'],
-            'run_out_accuracy': obj['run_out_accuracy'],
-            'top_diameter': obj['top_diameter'],
-            'weight': obj['weight'],
-            'clamping_length': obj['clamping_length'],
-            'clamping_tolerance': obj['clamping_tolerance'],
-            'handle_ids': obj['weight'],
-            'blade_ids': obj['clamping_length'],
-        }]
-        return basic_param_str
-
-
-class CuttingSpeed(models.Model):
-    _name = 'sf.cutting.speed'
-    _description = '切削速度Vc'
-
-    product_template_id = fields.Many2one('product.template', string='产品')
-    standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='标准库')
-    execution_standard_id = fields.Char('执行标准')
-    material_code = fields.Char('材料代号')
-    material_name = fields.Char('材料名称')
-    material_grade = fields.Char('材料牌号')
-    tensile_strength = fields.Float('拉伸强度 (N/mm²)')
-    hardness = fields.Float('硬度(HRC)')
-    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)')
-    application = fields.Selection([('主应用', '主应用'), ('次应用', '次应用')], '主/次应用')
-
-    def _json_cutting_speed(self, obj):
-        cutting_speed_str = [0, '', {
-            'execution_standard_id': obj['execution_standard_id'],
-            'material_code': obj['material_code'],
-            'material_name': obj['material_name'],
-            '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
-
-
-class FeedPerTooth(models.Model):
-    _name = 'sf.feed.per.tooth'
-    _description = '每齿走刀量fz'
-
-    product_template_id = fields.Many2one('product.template', string='产品')
-    standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='标准库')
-
-    cutting_speed = fields.Char('径向切宽 ae(mm)')
-    machining_method = fields.Selection([('直铣', '直铣'), ('坡铣', '坡铣')], string='加工方式')
-    materials_type_id = fields.Many2one('sf.materials.model', string='材料型号')
-    blade_diameter = fields.Float('刃部直径D1(mm)', readonly=True,
-                                  related='product_template_id.cutting_tool_blade_diameter')
-    feed_per_tooth = fields.Char('每齿走刀量 (mm/z)')
-    unit = fields.Char('单位', default='fz')
-
-    def _json_feed_per_tooth(self, obj):
-        feed_per_tooth_str = [0, '', {
-            'cutting_speed': obj['cutting_speed'],
-            'machining_method': obj['machining_method'],
-            'materials_type_id': obj['materials_type_id'],
-            'blade_diameter': obj['blade_diameter'],
-            'feed_per_tooth': obj['feed_per_tooth'],
-            'unit': obj['unit'],
-        }]
-        return feed_per_tooth_str
-
-    # @api.depends('product_template_id')
-    # def _compute_product_template_id(self):
-    #     if self.product_template_id is not None:
-    #         self.blade_diameter = self.product_template_id.cutting_tool_blade_diameter
diff --git a/sf_manufacturing/views/tool_other_features_view.xml b/sf_manufacturing/views/tool_other_features_view.xml
deleted file mode 100644
index 63eafb44..00000000
--- a/sf_manufacturing/views/tool_other_features_view.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-    <!--  ======================================== 切削速度Vc========================================-->
-    <record id="sf_cutting_speed_tree" model="ir.ui.view">
-        <field name="name">切削速度Vc</field>
-        <field name="model">sf.cutting.speed</field>
-        <field name="arch" type="xml">
-            <tree string="切削速度Vc" create="1">
-<!--                <field name="order"/>-->
-                <field name="execution_standard_id"/>
-                <field name="material_code"/>
-                <field name="material_name"/>
-                <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>
-    </record>
-
-    <record id="sf_cutting_speed_act" model="ir.actions.act_window">
-        <field name="name">切削速度Vc</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.cutting.speed</field>
-        <field name="view_mode">tree</field>
-    </record>
-
-
-    <!--  ======================================== 每齿走刀量fz========================================-->
-    <record model="ir.ui.view" id="sf_feed_per_tooth_tree">
-        <field name="name">每齿走刀量fz</field>
-        <field name="model">sf.feed.per.tooth</field>
-        <field name="arch" type="xml">
-            <tree>
-                <field name="cutting_speed" attrs="{'readonly': [('materials_type_id','!=',False)]}"/>
-                <field name="machining_method" attrs="{'readonly': [('cutting_speed','!=',False)]}"/>
-                <field name="materials_type_id" attrs="{'readonly': [('cutting_speed','!=',False)]}"/>
-<!--                <field name="blade_diameter"/>-->
-                <field name="feed_per_tooth"/>
-                <field name="unit"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="sf_feed_per_tooth_act" model="ir.actions.act_window">
-        <field name="name">每齿走刀量fz</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.feed.per.tooth</field>
-        <field name="view_mode">tree</field>
-    </record>
-</odoo>
\ No newline at end of file
diff --git a/sf_mrs_connect/models/res_config_setting.py b/sf_mrs_connect/models/res_config_setting.py
index 4b306a4b..549e3ce1 100644
--- a/sf_mrs_connect/models/res_config_setting.py
+++ b/sf_mrs_connect/models/res_config_setting.py
@@ -22,48 +22,49 @@ class ResConfigSettings(models.TransientModel):
     def sf_all_sync(self):
         try:
             self.env['sf.production.materials'].sync_all_production_materials()
-            _logger.info("同步资源库材料")
+            _logger.info("同步资源库材料完成")
             self.env['sf.materials.model'].sync_all_materials_model()
-            _logger.info("同步资源库材料型号")
+            _logger.info("同步资源库材料型号完成")
             self.env['sf.international.standards'].sync_all_mrs_international_standards()
             _logger.info("同步资源库国际标准完成")
             self.env['material.apply'].sync_all_material_apply()
             _logger.info("同步资源库材料应用完成")
             self.env['sf.production.process.category'].sync_all_production_process_category()
-            _logger.info("同步资源库表面工艺类别")
+            _logger.info("同步资源库表面工艺类别完成")
             self.env['sf.production.process'].sync_all_production_process()
-            _logger.info("同步资源库表面工艺")
+            _logger.info("同步资源库表面工艺完成")
             # self.env['sf.processing.technology'].sync_all_processing_technology()
             # _logger.info("同步资源库加工工艺")
             self.env['sf.machine.brand.tags'].sync_all_machine_brand_tags()
-            _logger.info("同步资源库品牌类别")
+            _logger.info("同步资源库品牌类别完成")
             self.env['sf.machine.brand'].sync_all_machine_brand()
-            _logger.info("同步资源库品牌")
+            _logger.info("同步资源库品牌完成")
             self.env['sf.machine.control_system'].sync_all_machine_control_system()
-            _logger.info("同步资源库控制系统")
+            _logger.info("同步资源库控制系统完成")
             self.env['sf.machine_tool.category'].sync_all_machine_tool_category()
-            _logger.info("同步资源库机床类型")
+            _logger.info("同步资源库机床类型完成")
             self.env['sf.production.process.parameter'].sync_all_production_process_parameter()
-            _logger.info("同步刀具物料")
+            _logger.info("同步刀具物料完成")
             self.env['sf.cutting.tool.material'].sync_all_cutting_tool_material()
-            _logger.info("同步刀具类型")
+            _logger.info("同步刀具类型完成")
             self.env['sf.cutting.tool.type'].sync_all_tool_type()
             _logger.info("同步所有刀具型号完成")
             self.env['sf.functional.cutting.tool.model'].sync_all_functional_cutting_tool_model()
-            _logger.info("同步夹具物料")
+            _logger.info("同步夹具物料完成")
             self.env['sf.fixture.material'].sync_all_fixture_material()
-            _logger.info("同步联装类型")
+            _logger.info("同步联装类型完成")
             self.env['sf.multi_mounting.type'].sync_all_multi_mounting_type()
-            _logger.info("同步夹具型号")
+            _logger.info("同步夹具型号完成")
             self.env['sf.fixture.model'].sync_all_fixture_model()
-            _logger.info("同步功能夹具类型")
+            _logger.info("同步功能夹具类型完成")
             self.env['sf.functional.fixture.type'].sync_all_functional_fixture_type()
+            _logger.info("同步功能夹具类型完成")
             self.env['sf.machine_tool.type'].sync_all_machine_tool_type()
             _logger.info("同步资源库机床型号完成")
+            self.env['maintenance.equipment.image'].sync_all_maintenance_equipment_image()
+            _logger.info("同步能力特征库完成")
             self.env['sf.cutting_tool.standard.library'].sync_all_cutting_tool_standard_library()
             _logger.info("同步刀具标准库完成")
-            self.env['maintenance.equipment.image'].sync_all_maintenance_equipment_image()
-            _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 8aaefa83..6a9b0964 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -56,12 +56,12 @@ class MrStaticResourceDataSync(models.Model):
             logging.info("刀具物料已每日同步成功")
             self.env['sf.cutting.tool.type'].sync_tool_type_yesterday()
             logging.info("刀具类型已每日同步成功")
-            self.env['sf.cutting_tool.standard.library'].sync_cutting_tool_standard_library_yesterday()
-            logging.info("刀具标准库已每日同步成功")
             self.env['sf.functional.cutting.tool.model'].sync_functional_cutting_tool_model_yesterday()
             logging.info("功能刀具类型已每日同步成功")
             self.env['maintenance.equipment.image'].sync_maintenance_equipment_image_yesterday()
             logging.info("能力特征库已每日同步成功")
+            self.env['sf.cutting_tool.standard.library'].sync_cutting_tool_standard_library_yesterday()
+            logging.info("刀具标准库已每日同步成功")
         except Exception as e:
             logging.info("捕获错误信息:%s" % e)
             raise ValidationError("数据错误导致同步失败,请联系管理员")
@@ -75,11 +75,9 @@ class sfProductionMaterials(models.Model):
     # 定时同步每日材料
     def sync_production_materials_yesterday(self):
         # 配置中获取token
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -103,11 +101,9 @@ class sfProductionMaterials(models.Model):
 
     # 同步所有材料
     def sync_all_production_materials(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -137,11 +133,9 @@ class sfMaterialModel(models.Model):
 
     # 定时同步每日材料型号
     def sync_materials_model_yesterday(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -185,11 +179,9 @@ class sfMaterialModel(models.Model):
 
     # 同步所有材料型号
     def sync_all_materials_model(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -247,11 +239,9 @@ class sfProductionProcessCategory(models.Model):
 
     # 定时同步每日表面工艺类别
     def sync_production_process_category_yesterday(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -274,11 +264,9 @@ class sfProductionProcessCategory(models.Model):
 
     # 同步所有表面工艺类别
     def sync_all_production_process_category(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -306,11 +294,9 @@ class sfProductionProcess(models.Model):
 
     # 定时同步每日表面工艺
     def sync_production_process_yesterday(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -349,11 +335,9 @@ class sfProductionProcess(models.Model):
 
     # 同步所有表面工艺
     def sync_all_production_process(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -387,11 +371,9 @@ class sfProcessingTechnology(models.Model):
 
     # 定时同步加工工艺
     def sync_processing_technology_yesterday(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -415,11 +397,9 @@ class sfProcessingTechnology(models.Model):
 
     # 同步所有加工工艺
     def sync_all_processing_technology(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -449,11 +429,9 @@ class MachineBrandTags(models.Model):
 
     # 定时同步品牌类别
     def sync_machine_brand_tags_yesterday(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -473,12 +451,9 @@ class MachineBrandTags(models.Model):
 
     # 同步所有品牌类别
     def sync_all_machine_brand_tags(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -504,11 +479,9 @@ class MachineControlSystem(models.Model):
 
     # 定时同步控制系统
     def sync_machine_control_system_yesterday(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -535,11 +508,9 @@ class MachineControlSystem(models.Model):
 
     # 同步所有控制系统
     def sync_all_machine_control_system(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -572,11 +543,9 @@ class MachineBrand(models.Model):
 
     # 定时同步品牌
     def sync_machine_brand_yesterday(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -603,11 +572,9 @@ class MachineBrand(models.Model):
 
     # 同步所有品牌
     def sync_all_machine_brand(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -640,11 +607,9 @@ class MachineToolType(models.Model):
 
     # 定时同步机床型号
     def sync_machine_tool_type_yesterday(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -745,11 +710,9 @@ class MachineToolType(models.Model):
 
     # 同步所有机床型号
     def sync_all_machine_tool_type(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -858,11 +821,9 @@ class sfProcessingOrder(models.Model):
 
     # 定时同步工序
     def sync_processing_order_yesterday(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -880,11 +841,9 @@ class sfProcessingOrder(models.Model):
 
     # 同步所有工序
     def sync_all_processing_order(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -908,11 +867,9 @@ class sfProductionProcessParameter(models.Model):
 
     # 定时同步每日表面工艺可选参数
     def sync_production_process_parameter_yesterday(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -942,11 +899,9 @@ class sfProductionProcessParameter(models.Model):
 
     # 同步所有表面工艺可选参数
     def sync_all_production_process_parameter(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -983,11 +938,9 @@ class MachineToolCategory(models.Model):
 
     # 定时同步机床类型
     def sync_machine_tool_category_yesterday(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1012,11 +965,9 @@ class MachineToolCategory(models.Model):
 
     # 同步所有机床类型
     def sync_all_machine_tool_category(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1049,11 +1000,9 @@ class sfSyncCutting_tool_Material(models.Model):
 
     # 定时同步每日刀具物料
     def sync_cutting_tool_material_yesterday(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1081,11 +1030,9 @@ class sfSyncCutting_tool_Material(models.Model):
 
     # 同步所有刀具物料
     def sync_all_cutting_tool_material(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1120,11 +1067,9 @@ class SyncFunctionalCuttingToolModel(models.Model):
 
     # 定时同步每日功能刀具类型列表
     def sync_functional_cutting_tool_model_yesterday(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1152,12 +1097,9 @@ class SyncFunctionalCuttingToolModel(models.Model):
 
     # 同步所有功能刀具类型列表
     def sync_all_functional_cutting_tool_model(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1192,11 +1134,9 @@ class SyncFixtureMaterial(models.Model):
 
     # 定时同步夹具物料列表
     def sync_fixture_material_yesterday(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1226,12 +1166,9 @@ class SyncFixtureMaterial(models.Model):
 
     # 定时同步所有夹具物料列表
     def sync_all_fixture_material(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1268,11 +1205,9 @@ class SyncMulti_Mounting_Type(models.Model):
 
     # 定时同步联装类型列表
     def sync_multi_mounting_type_yesterday(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1299,11 +1234,9 @@ class SyncMulti_Mounting_Type(models.Model):
 
     # 定时同步所有联装类型列表
     def sync_all_multi_mounting_type(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1338,11 +1271,9 @@ class SyncFixtureModel(models.Model):
 
     # 定时同步夹具型号列表
     def sync_fixture_model_yesterday(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1417,11 +1348,9 @@ class SyncFixtureModel(models.Model):
 
     # 定时同步所有夹具型号列表
     def sync_all_fixture_model(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1504,11 +1433,9 @@ class SyncFunctionalFixtureType(models.Model):
 
     # 定时同步功能夹具类型列表
     def sync_functional_fixture_type_yesterday(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1536,11 +1463,9 @@ class SyncFunctionalFixtureType(models.Model):
 
     # 定时同步所有功能夹具类型列表
     def sync_all_functional_fixture_type(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1575,11 +1500,9 @@ class SfToolType(models.Model):
 
     # 定时同步每日刀具类型
     def sync_tool_type_yesterday(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1609,11 +1532,9 @@ class SfToolType(models.Model):
 
     # 同步所有刀具类型列表
     def sync_all_tool_type(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1651,11 +1572,9 @@ class SfMaintenanceEquipmentImage(models.Model):
 
     # 定时同步每日能力特征库
     def sync_maintenance_equipment_image_yesterday(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1681,11 +1600,9 @@ class SfMaintenanceEquipmentImage(models.Model):
 
     # 同步所有能力特征库
     def sync_all_maintenance_equipment_image(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1717,12 +1634,9 @@ class MaterialApply(models.Model):
 
     # 定时同步材料应用
     def sync_material_apply(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1742,12 +1656,9 @@ class MaterialApply(models.Model):
 
     # 同步所有材料应用
     def sync_all_material_apply(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1773,12 +1684,9 @@ class ModelInternationalStandards(models.Model):
 
     # 定时同步制造标准
     def sync_mrs_international_standards(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1791,6 +1699,7 @@ class ModelInternationalStandards(models.Model):
                 else:
                     self.create({
                         "name": item['name'],
+                        "code": item['code'],
                         "active": item['active'],
                     })
         else:
@@ -1798,12 +1707,9 @@ class ModelInternationalStandards(models.Model):
 
     # 同步所有制造标准
     def sync_all_mrs_international_standards(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1813,6 +1719,7 @@ class ModelInternationalStandards(models.Model):
                 if not international_standards:
                     self.create({
                         "name": item['name'],
+                        "code": item['code'],
                         "active": item['active'],
                     })
                 else:
@@ -1829,40 +1736,170 @@ class Cutting_tool_standard_library(models.Model):
 
     # 定时同步刀具标准库
     def sync_cutting_tool_standard_library_yesterday(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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_tool_standard_library_yesterday_list']:
                 cutting_tool_standard_library = self.search(
-                    [("code", '=', item['code'])])
-                if cutting_tool_standard_library:
-                    cutting_tool_standard_library.write(
-                        {"name": item['name'],
-                         "active": item['active']}
-                    )
-                else:
+                    [("code", '=', item['code'].replace("JKM", result['factory_short_name']))])
+                cutting_tool_type = self.env['sf.cutting.tool.type'].search(
+                    [("code", '=', item['cutting_tool_type_code'])])
+                cutting_tool_material = self.env['sf.cutting.tool.material'].search(
+                    [("code", '=', item['cutting_tool_material_code'])])
+                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']),
                         "name": item['name'],
+                        "cutting_tool_material_id": cutting_tool_material.id,
+                        "cutting_tool_type_id": cutting_tool_type.id,
+                        "brand_id": brand.id,
+                        "material_model_id": materials_model.id,
+                        "tool_hardness": item['tool_hardness'],
+                        "coating_material": item['coating_material'],
+                        "blade_type": item['blade_type'],
+                        "integral_coarse_medium_fine": item['integral_coarse_medium_fine'],
+                        "integral_run_out_accuracy_max": item['integral_run_out_accuracy_max'],
+                        "integral_run_out_accuracy_min": item['integral_run_out_accuracy_min'],
+                        "cutter_bar_ids": [(6, 0, [])] if not item.get('cutter_bar_codes') else self.env[
+                            'sf.cutting.tool.type']._get_ids(item['cutter_bar_codes']),
+                        "cutter_pad_ids": [(6, 0, [])] if not item.get('cutter_pad_codes') else self.env[
+                            'sf.cutting.tool.type']._get_ids(item['cutter_pad_codes']),
+                        "fit_blade_shape_ids": [(6, 0, [])] if not item.get('fit_blade_shape') else self.env[
+                            'maintenance.equipment.image']._get_ids(item['fit_blade_shape']),
+                        "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']),
+                        "blade_tip_characteristics_ids": [(6, 0, [])] if not item.get('blade_tip_characteristics') else
+                        self.env['maintenance.equipment.image']._get_ids(item['blade_tip_characteristics']),
+                        "handle_type_ids": [(6, 0, [])] if not item.get('handle_type') else self.env[
+                            'maintenance.equipment.image']._get_ids(item['handle_type']),
+                        "cutting_direction_ids": [(6, 0, [])] if not item.get('cutting_direction') else self.env[
+                            'maintenance.equipment.image']._get_ids(item['cutting_direction']),
+                        "suitable_coolant_ids": [(6, 0, [])] if not item.get('suitable_coolant') else self.env[
+                            'maintenance.equipment.image']._get_ids(item['suitable_coolant']),
+                        "compaction_way_ids": [(6, 0, [])] if not item.get('compaction_way') else self.env[
+                            'maintenance.equipment.image']._get_ids(item['compaction_way']),
+                        "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'],
                     })
+                else:
+                    cutting_tool_standard_library.write(
+                        {"name": item['name'],
+                         "cutting_tool_material_id": cutting_tool_material.id,
+                         "cutting_tool_type_id": cutting_tool_type.id,
+                         "brand_id": brand.id,
+                         "material_model_id": materials_model.id,
+                         "tool_hardness": item['tool_hardness'],
+                         "coating_material": item['coating_material'],
+                         "blade_type": item['blade_type'],
+                         "integral_coarse_medium_fine": item['integral_coarse_medium_fine'],
+                         "integral_run_out_accuracy_max": item['integral_run_out_accuracy_max'],
+                         "integral_run_out_accuracy_min": item['integral_run_out_accuracy_min'],
+                         "cutter_bar_ids": [(6, 0, [])] if not item.get('cutter_bar_codes') else self.env[
+                             'sf.cutting.tool.type']._get_ids(item['cutter_bar_codes']),
+                         "cutter_pad_ids": [(6, 0, [])] if not item.get('cutter_pad_codes') else self.env[
+                             'sf.cutting.tool.type']._get_ids(item['cutter_pad_codes']),
+                         "fit_blade_shape_ids": [(6, 0, [])] if not item.get('fit_blade_shape') else self.env[
+                             'maintenance.equipment.image']._get_ids(item['fit_blade_shape']),
+                         "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']),
+                         "blade_tip_characteristics_ids": [(6, 0, [])] if not item.get('blade_tip_characteristics') else
+                         self.env['maintenance.equipment.image']._get_ids(item['blade_tip_characteristics']),
+                         "handle_type_ids": [(6, 0, [])] if not item.get('handle_type') else self.env[
+                             'maintenance.equipment.image']._get_ids(item['handle_type']),
+                         "cutting_direction_ids": [(6, 0, [])] if not item.get('cutting_direction') else self.env[
+                             'maintenance.equipment.image']._get_ids(item['cutting_direction']),
+                         "suitable_coolant_ids": [(6, 0, [])] if not item.get('suitable_coolant') else self.env[
+                             'maintenance.equipment.image']._get_ids(item['suitable_coolant']),
+                         "compaction_way_ids": [(6, 0, [])] if not item.get('compaction_way') else self.env[
+                             'maintenance.equipment.image']._get_ids(item['compaction_way']),
+                         "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("刀具标准库认证未通过")
 
     # 同步所有刀具标准库
     def sync_all_cutting_tool_standard_library(self):
-        sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
-
-        strUrl = sf_sync_config['sf_url'] + self.url
+        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'])
@@ -1877,18 +1914,53 @@ 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'])])
-                basic_param_list = []
-                for basic_param_item in item['basic_parameter']:
-                    basic_param_list.append(
-                        self.env['sf.tool.materials.basic.parameters']._json_basic_param(basic_param_item))
+                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['basic_parameter']:
+                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']),
@@ -1900,14 +1972,40 @@ class Cutting_tool_standard_library(models.Model):
                         "tool_hardness": item['tool_hardness'],
                         "coating_material": item['coating_material'],
                         "blade_type": item['blade_type'],
-                        "blade_diameter": item['blade_diameter'],
-                        "working_hardness": item['working_hardness'],
                         "integral_coarse_medium_fine": item['integral_coarse_medium_fine'],
                         "integral_run_out_accuracy_max": item['integral_run_out_accuracy_max'],
                         "integral_run_out_accuracy_min": item['integral_run_out_accuracy_min'],
-                        "basic_parameters_ids": basic_param_list,
+                        "cutter_bar_ids": [(6, 0, [])] if not item.get('cutter_bar_codes') else self.env[
+                            'sf.cutting.tool.type']._get_ids(item['cutter_bar_codes']),
+                        "cutter_pad_ids": [(6, 0, [])] if not item.get('cutter_pad_codes') else self.env[
+                            'sf.cutting.tool.type']._get_ids(item['cutter_pad_codes']),
+                        "fit_blade_shape_ids": [(6, 0, [])] if not item.get('fit_blade_shape') else self.env[
+                            'maintenance.equipment.image']._get_ids(item['fit_blade_shape']),
+                        "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']),
+                        "blade_tip_characteristics_ids": [(6, 0, [])] if not item.get('blade_tip_characteristics') else
+                        self.env['maintenance.equipment.image']._get_ids(item['blade_tip_characteristics']),
+                        "handle_type_ids": [(6, 0, [])] if not item.get('handle_type') else self.env[
+                            'maintenance.equipment.image']._get_ids(item['handle_type']),
+                        "cutting_direction_ids": [(6, 0, [])] if not item.get('cutting_direction') else self.env[
+                            'maintenance.equipment.image']._get_ids(item['cutting_direction']),
+                        "suitable_coolant_ids": [(6, 0, [])] if not item.get('suitable_coolant') else self.env[
+                            'maintenance.equipment.image']._get_ids(item['suitable_coolant']),
+                        "compaction_way_ids": [(6, 0, [])] if not item.get('compaction_way') else self.env[
+                            'maintenance.equipment.image']._get_ids(item['compaction_way']),
+                        "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'],
                     })
                 else:
@@ -1920,15 +2018,40 @@ class Cutting_tool_standard_library(models.Model):
                          "tool_hardness": item['tool_hardness'],
                          "coating_material": item['coating_material'],
                          "blade_type": item['blade_type'],
-                         "blade_diameter": item['blade_diameter'],
-                         "working_hardness": item['working_hardness'],
                          "integral_coarse_medium_fine": item['integral_coarse_medium_fine'],
                          "integral_run_out_accuracy_max": item['integral_run_out_accuracy_max'],
                          "integral_run_out_accuracy_min": item['integral_run_out_accuracy_min'],
-                         "basic_parameters_ids": basic_param_list,
+                         "cutter_bar_ids": [(6, 0, [])] if not item.get('cutter_bar_codes') else self.env[
+                             'sf.cutting.tool.type']._get_ids(item['cutter_bar_codes']),
+                         "cutter_pad_ids": [(6, 0, [])] if not item.get('cutter_pad_codes') else self.env[
+                             'sf.cutting.tool.type']._get_ids(item['cutter_pad_codes']),
+                         "fit_blade_shape_ids": [(6, 0, [])] if not item.get('fit_blade_shape') else self.env[
+                             'maintenance.equipment.image']._get_ids(item['fit_blade_shape']),
+                         "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']),
+                         "blade_tip_characteristics_ids": [(6, 0, [])] if not item.get('blade_tip_characteristics') else
+                         self.env['maintenance.equipment.image']._get_ids(item['blade_tip_characteristics']),
+                         "handle_type_ids": [(6, 0, [])] if not item.get('handle_type') else self.env[
+                             'maintenance.equipment.image']._get_ids(item['handle_type']),
+                         "cutting_direction_ids": [(6, 0, [])] if not item.get('cutting_direction') else self.env[
+                             'maintenance.equipment.image']._get_ids(item['cutting_direction']),
+                         "suitable_coolant_ids": [(6, 0, [])] if not item.get('suitable_coolant') else self.env[
+                             'maintenance.equipment.image']._get_ids(item['suitable_coolant']),
+                         "compaction_way_ids": [(6, 0, [])] if not item.get('compaction_way') else self.env[
+                             'maintenance.equipment.image']._get_ids(item['compaction_way']),
+                         "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,
-                         "active": item['active'], }
-                    )
+                         "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("刀具标准库认证未通过")

From dc8aecba9359a072d88b52dbcc14725af0a70c24 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Fri, 20 Oct 2023 18:41:58 +0800
Subject: [PATCH 05/21] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E8=A7=84=E6=A0=BC=E5=90=91=E5=AF=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/tool_other_features.py         |   7 +-
 sf_base/static/src/scss/test.scss             |  20 +-
 sf_dlm/__init__.py                            |   2 +-
 sf_dlm/__manifest__.py                        |   4 +-
 sf_dlm/security/group_security.xml            |   4 +
 sf_dlm/security/ir.model.access.csv           |  12 +
 sf_dlm/views/product_template_view.xml        |  45 +--
 sf_dlm/wizard/__init__.py                     |   3 +
 .../cutting_tool_specification_wizard.py      |  44 +++
 .../cutting_tool_specification_wizard.xml     | 266 ++++++++++++++++++
 sf_manufacturing/__init__.py                  |   1 +
 sf_manufacturing/models/product_template.py   |  61 ++--
 sf_manufacturing/security/ir.model.access.csv |   1 +
 sf_mrs_connect/models/sync_common.py          |   2 +-
 .../views/tool_material_search.xml            |   2 +-
 15 files changed, 411 insertions(+), 63 deletions(-)
 create mode 100644 sf_dlm/security/group_security.xml
 create mode 100644 sf_dlm/security/ir.model.access.csv
 create mode 100644 sf_dlm/wizard/__init__.py
 create mode 100644 sf_dlm/wizard/cutting_tool_specification_wizard.py
 create mode 100644 sf_dlm/wizard/cutting_tool_specification_wizard.xml

diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py
index b4f8b191..56c8c8a6 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 = '刀具物料基本参数'
 
     standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀具标准库')
+    specification_id = fields.Many2one('sf.cutting_tool.specification.wizard', string='刀具规格')
     cutting_tool_type = fields.Char(related='standard_library_id.cutting_tool_type', string='刀具物料类型',
                                     store=True)
     # cutting_tool_type_1 = fields.Char(related='cutting_tool_type', string='类型', store=True)
@@ -288,7 +289,8 @@ class CuttingSpeed(models.Model):
     _name = 'sf.cutting.speed'
     _description = '切削速度Vc'
 
-    # product_template_id = fields.Many2one('product.template', string='产品')
+    product_template_id = fields.Many2one('product.template')
+    specification_id = fields.Many2one('sf.cutting_tool.specification.wizard', string='刀具规格')
     standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='标准库')
     execution_standard_id = fields.Many2one('sf.international.standards', string='执行标准', store=True)
     material_code = fields.Char('材料代号')
@@ -333,8 +335,9 @@ class FeedPerTooth(models.Model):
     _description = '每齿走刀量fz'
     _order = 'machining_method desc, blade_diameter, materials_type_id'
 
-    # product_template_id = fields.Many2one('product.template', string='产品')
+    product_template_id = fields.Many2one('product.template')
     standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='标准库')
+    specification_id = fields.Many2one('sf.cutting_tool.specification.wizard', string='刀具规格')
     cutting_speed = fields.Char('径向切宽 ae(mm)')
     machining_method = fields.Selection([('直铣', '直铣'), ('坡铣', '坡铣')], string='加工方式')
     materials_type_id = fields.Many2one('sf.materials.model', string='材料型号')
diff --git a/sf_base/static/src/scss/test.scss b/sf_base/static/src/scss/test.scss
index a54eb808..d8761b94 100644
--- a/sf_base/static/src/scss/test.scss
+++ b/sf_base/static/src/scss/test.scss
@@ -161,4 +161,22 @@ td.o_required_modifier {
   display: flex !important;
   justify-content: flex-start !important;
   align-items: center !important;
-}
\ No newline at end of file
+}
+
+//用于label外的div
+.type_label {
+  display: flex;
+    align-items: center;
+}
+
+.button_width button {
+  width:11rem;
+  margin-top: -9px;
+  height: 2.5rem;
+  line-height: 1.5rem;
+}
+
+.button_width{
+  display: flex;
+}
+
diff --git a/sf_dlm/__init__.py b/sf_dlm/__init__.py
index 737b4772..40272379 100644
--- a/sf_dlm/__init__.py
+++ b/sf_dlm/__init__.py
@@ -1 +1 @@
-# from . import models
+from . import wizard
diff --git a/sf_dlm/__manifest__.py b/sf_dlm/__manifest__.py
index 42c4598a..85906b2b 100644
--- a/sf_dlm/__manifest__.py
+++ b/sf_dlm/__manifest__.py
@@ -16,7 +16,9 @@
     'data': [
         'data/product_data.xml',
         'data/uom_data.xml',
-        # 'views/product_template_view.xml',
+        'security/ir.model.access.csv',
+        'wizard/cutting_tool_specification_wizard.xml',
+        'views/product_template_view.xml',
         'views/product_workorder.xml'
     ],
     'demo': [
diff --git a/sf_dlm/security/group_security.xml b/sf_dlm/security/group_security.xml
new file mode 100644
index 00000000..b8668782
--- /dev/null
+++ b/sf_dlm/security/group_security.xml
@@ -0,0 +1,4 @@
+<odoo>
+    <data>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/sf_dlm/security/ir.model.access.csv b/sf_dlm/security/ir.model.access.csv
new file mode 100644
index 00000000..9039e2c1
--- /dev/null
+++ b/sf_dlm/security/ir.model.access.csv
@@ -0,0 +1,12 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_sf_cutting_tool_specification_wizard,sf_cutting_tool_specification_wizard,model_sf_cutting_tool_specification_wizard,base.group_user,1,1,1,1
+
+
+
+
+
+
+
+
+
+
diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index 055898f5..bcb0e894 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -51,6 +51,18 @@
                            attrs="{'invisible': ['|',('categ_type', '!=', '表面工艺'),('categ_type', '=', False)]}"/>
                     <field name="cutting_tool_material_id" attrs="{'invisible': [('categ_type', '!=', '刀具')]}"
                            placeholder="请选择"/>
+                    <label for="cutting_tool_model_id" string="型号" class="type_label"
+                           attrs="{'invisible': [('categ_type', '!=', '刀具')]}"/>
+                    <div attrs="{'invisible': [('categ_type', '!=', '刀具')]}" class="button_width">
+                        <field name="cutting_tool_model_id" placeholder="请选择"
+                               domain="[('cutting_tool_material_id','=',cutting_tool_material_id)]"/>
+                        <button string="选择刀具规格" type="action" name="%(action_cutting_tool_specification_wizard)d"
+                                class="oe_highlight"
+                                context="{'default_cutting_tool_material_id': cutting_tool_material_id,
+                                'default_cutting_tool_library_id': cutting_tool_model_id,
+                                'default_cutting_tool_type': cutting_tool_type}"
+                        />
+                    </div>
                     <field name="fixture_material_id" attrs="{'invisible': [('categ_type', '!=', '夹具')]}"
                            placeholder="请选择"/>
                     <field name="fixture_model_id" string="型号" placeholder="请选择"
@@ -296,9 +308,9 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
                                 <field name="cutting_tool_er_size_model"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
-<!--                                <field name="cutting_tool_handle_ids" widget="many2many_tags"-->
-<!--                                       options="{'no_create': True}"-->
-<!--                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>-->
+                                <!--                                <field name="cutting_tool_handle_ids" widget="many2many_tags"-->
+                                <!--                                       options="{'no_create': True}"-->
+                                <!--                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>-->
                                 <field name="cooling_suit_type_ids"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
 
@@ -309,19 +321,19 @@
                                 <field name="cutting_tool_nut"
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
 
-                                <field name="cutting_tool_cutter_bar_ids" widget="many2many_tags"
-                                       options="{'no_create': True}"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
-                                <field name="cutting_tool_cutter_pad_ids" widget="many2many_tags"
-                                       options="{'no_create': True}"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
-                                <field name="cutting_tool_blade_ids" widget="many2many_tags"
-                                       options="{'no_create': True}"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+                                <!--                                <field name="cutting_tool_cutter_bar_ids" widget="many2many_tags"-->
+                                <!--                                       options="{'no_create': True}"-->
+                                <!--                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>-->
+                                <!--                                <field name="cutting_tool_cutter_pad_ids" widget="many2many_tags"-->
+                                <!--                                       options="{'no_create': True}"-->
+                                <!--                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>-->
+                                <!--                                <field name="cutting_tool_blade_ids" widget="many2many_tags"-->
+                                <!--                                       options="{'no_create': True}"-->
+                                <!--                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>-->
 
-                                <field name="cutting_tool_chuck_ids" widget="many2many_tags"
-                                       options="{'no_create': True}"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘','刀柄'))]}"/>
+                                <!--                                <field name="cutting_tool_chuck_ids" widget="many2many_tags"-->
+                                <!--                                       options="{'no_create': True}"-->
+                                <!--                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘','刀柄'))]}"/>-->
                                 <field name="apply_lock_nut_model"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
                                 <field name="apply_lock_wrench_model"
@@ -359,7 +371,7 @@
                                             <!--                <field name="order"/>-->
                                             <field name="execution_standard_id"/>
                                             <field name="material_code"/>
-                                            <field name="material_name"/>
+                                            <field name="material_id"/>
                                             <field name="material_grade"/>
                                             <field name="tensile_strength"/>
                                             <field name="hardness"/>
@@ -385,7 +397,6 @@
                                                    attrs="{'readonly': [('cutting_speed','!=',False)]}"/>
                                             <field name="blade_diameter"/>
                                             <field name="feed_per_tooth"/>
-                                            <field name="unit"/>
                                         </tree>
                                     </field>
                                 </page>
diff --git a/sf_dlm/wizard/__init__.py b/sf_dlm/wizard/__init__.py
new file mode 100644
index 00000000..2e93b759
--- /dev/null
+++ b/sf_dlm/wizard/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import cutting_tool_specification_wizard
diff --git a/sf_dlm/wizard/cutting_tool_specification_wizard.py b/sf_dlm/wizard/cutting_tool_specification_wizard.py
new file mode 100644
index 00000000..2a79d27e
--- /dev/null
+++ b/sf_dlm/wizard/cutting_tool_specification_wizard.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError
+import logging
+
+_logger = logging.getLogger(__name__)
+
+
+class Cutting_toolSpecificationWizard(models.TransientModel):
+    _name = "sf.cutting_tool.specification.wizard"
+    _description = u'刀具规格'
+
+    cutting_tool_library_id = fields.Many2one('sf.cutting_tool.standard.library', '刀具标准库')
+    cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料')
+    cutting_tool_type = fields.Char(related=cutting_tool_material_id.name)
+    cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', '刀具类型')
+    brand_id = fields.Many2one('sf.machine.brand', '品牌')
+    integral_tool_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
+                                                         'specification_id', string='整体式刀具基本参数')
+    blade_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
+                                                 'specification_id', string='刀片基本参数')
+    cutter_bar_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
+                                                      'specification_id', string='刀杆基本参数')
+    cutter_head_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
+                                                       'specification_id', string='刀盘基本参数')
+    knife_handle_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
+                                                        'specification_id', string='刀柄基本参数')
+    chuck_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
+                                                 'specification_id', string='夹头基本参数')
+    cutting_speed_ids = fields.One2many('sf.cutting.speed', 'specification_id', string='切削速度Vc')
+    feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz',
+                                         domain=[('cutting_speed', '!=', False)])
+    feed_per_tooth_ids_2 = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz',
+                                           domain=[('machining_method', '!=', False)])
+    feed_per_tooth_ids_3 = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz',
+                                           domain=[('cutting_speed', '!=', False)])
+    feed_per_tooth_ids_4 = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz',
+                                           domain=[('machining_method', '!=', False)])
+
+    @api.depends('cutting_tool_library_id')
+    def set_specification(self):
+        for vals in self.cutting_tool_library_id.integral_tool_basic_parameters_ids:
+            vals.write({'specification_id': self.id})
diff --git a/sf_dlm/wizard/cutting_tool_specification_wizard.xml b/sf_dlm/wizard/cutting_tool_specification_wizard.xml
new file mode 100644
index 00000000..fee87e2d
--- /dev/null
+++ b/sf_dlm/wizard/cutting_tool_specification_wizard.xml
@@ -0,0 +1,266 @@
+<odoo>
+    <data>
+        <record model="ir.ui.view" id="cutting_tool_specification_wizard_form_view">
+            <field name="name">sf.cutting_tool.specification.wizard.form.view</field>
+            <field name="model">sf.cutting_tool.specification.wizard</field>
+            <field name="arch" type="xml">
+                <form string="刀具规格">
+                    <group>
+                        <field name="cutting_tool_material_id" readonly="1"/>
+                        <field name="cutting_tool_type_id" readonly="1" string="刀具类型"/>
+                        <field name="cutting_tool_library_id" readonly="1" string="型号"/>
+                        <field name="brand_id" readonly="1"/>
+                        <field name="cutting_tool_type" invisible="1"/>
+                    </group>
+                    <notebook>
+                        <page string="基本参数">
+                            <field name="integral_tool_basic_parameters_ids"
+                                   attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
+                                <tree class="center">
+                                    <field name="cutting_tool_type" invisible="1"/>
+                                    <field name="specification_id" invisible="1"/>
+                                    <field name="code"/>
+                                    <field name="total_length"/>
+                                    <field name="blade_diameter" class="diameter"/>
+                                    <field name="blade_length"/>
+                                    <field name="blade_number" placeholder="请选择"/>
+                                    <field name="neck_length"/>
+                                    <field name="neck_diameter" class="diameter"/>
+                                    <field name="handle_diameter" class="diameter"/>
+                                    <field name="handle_length"/>
+                                    <field name="blade_tip_working_size" class="du"/>
+                                    <field name="blade_tip_diameter" class="diameter"/>
+                                    <field name="blade_tip_taper" class="du"/>
+                                    <field name="blade_helix_angle" class="du"/>
+                                    <field name="pitch"/>
+                                    <field name="blade_width"/>
+                                    <field name="blade_depth"/>
+                                    <field name="cutting_depth"/>
+                                </tree>
+                            </field>
+
+                            <field name="blade_basic_parameters_ids"
+                                   attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}">
+                                <tree editable="bottom" class="center">
+                                    <field name="cutting_tool_type" invisible="1"/>
+                                    <field name="specification_id" invisible="1"/>
+                                    <field name="code"/>
+                                    <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="chip_breaker_groove" placeholder="请选择"/>
+                                    <field name="blade_teeth_model" placeholder="请选择"/>
+                                    <field name="cutting_depth" string="最大切削深度(mm)"/>
+                                    <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"/>
+                                </tree>
+                            </field>
+                            <field name="cutter_bar_basic_parameters_ids"
+                                   attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}">
+                                <tree editable="bottom" class="center">
+                                    <field name="cutting_tool_type" invisible="1"/>
+                                    <field name="specification_id" invisible="1"/>
+                                    <field name="code"/>
+                                    <field name="height"/>
+                                    <field name="width"/>
+                                    <field name="total_length"/>
+                                    <field name="blade_height"/>
+                                    <field name="blade_width"/>
+                                    <field name="blade_length"/>
+                                    <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="min_machining_aperture" class="diameter"/>
+                                    <field name="install_blade_tip_num"/>
+                                    <field name="cutting_blade_model"/>
+                                    <field name="cooling_hole" placeholder="请选择"/>
+                                    <field name="locating_slot_code"/>
+                                    <field name="installing_structure"/>
+                                    <field name="blade_ids" widget="many2many_tags" placeholder="请选择"/>
+                                    <field name="tool_shim"/>
+                                    <field name="cotter_pin"/>
+                                    <field name="pressing_plate"/>
+                                    <field name="screw"/>
+                                    <field name="spanner"/>
+                                </tree>
+                            </field>
+
+                            <field name="cutter_head_basic_parameters_ids"
+                                   attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}">
+                                <tree editable="bottom" class="center" delete="1">
+                                    <field name="cutting_tool_type" invisible="1"/>
+                                    <field name="specification_id" invisible="1"/>
+                                    <field name="code"/>
+                                    <field name="install_blade_tip_num"/>
+                                    <field name="blade_diameter" class="diameter"/>
+                                    <field name="cutter_head_diameter" class="diameter"/>
+                                    <field name="interface_diameter" class="diameter"/>
+                                    <field name="total_length"/>
+                                    <field name="blade_length"/>
+                                    <field name="cutting_depth" string="最大切削深度(mm)"/>
+                                    <field name="main_included_angle" class="du"/>
+                                    <field name="installing_structure"/>
+                                    <field name="blade_ids" widget="many2many_tags" placeholder="请选择"/>
+                                    <field name="screw"/>
+                                    <field name="spanner"/>
+                                    <field name="cutting_blade_model"/>
+                                    <field name="cooling_hole" placeholder="请选择"/>
+                                    <field name="locating_slot_code"/>
+                                </tree>
+                            </field>
+
+                            <field name="knife_handle_basic_parameters_ids"
+                                   attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}">
+                                <tree editable="bottom" class="center">
+                                    <field name="cutting_tool_type" invisible="1"/>
+                                    <field name="specification_id" invisible="1"/>
+                                    <field name="code"/>
+                                    <field name="total_length"/>
+                                    <field name="flange_shank_length"/>
+                                    <field name="handle_external_diameter" class="diameter"/>
+                                    <field name="handle_inside_diameter" class="diameter"/>
+                                    <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="cooling_model"/>
+                                    <field name="is_rough_machining" placeholder="请选择"/>
+                                    <field name="is_finish_machining" placeholder="请选择"/>
+                                    <field name="is_quick_cutting" placeholder="请选择"/>
+                                    <field name="is_drill_hole" placeholder="请选择"/>
+                                    <field name="is_safe_lock" placeholder="请选择"/>
+                                    <field name="screw"/>
+                                    <field name="spanner"/>
+                                </tree>
+                            </field>
+                            <field name="chuck_basic_parameters_ids"
+                                   attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}">
+                                <tree editable="bottom" class="center">
+                                    <field name="cutting_tool_type" invisible="1"/>
+                                    <field name="specification_id" invisible="1"/>
+                                    <field name="code"/>
+                                    <field name="er_size_model"/>
+                                    <field name="min_clamping_diameter" class="diameter" required="1"/>
+                                    <field name="max_clamping_diameter" class="diameter"/>
+                                    <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>
+                        </page>
+                        <page string="切削速度Vc"
+                              attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}">
+                            <field name="cutting_speed_ids">
+                                <tree editable="bottom" class="center">
+                                    <field name="execution_standard_id" placeholder="请选择" required="1"/>
+                                    <field name="specification_id" invisible="1"/>
+                                    <field name="material_code" readonly="1"/>
+                                    <field name="material_id" placeholder="请选择"
+                                           attrs="{'readonly': [('execution_standard_id', '=', False)], 'required': [('execution_standard_id', '!=', False)]}"/>
+                                    <field name="material_grade" readonly="1"/>
+                                    <field name="tensile_strength" readonly="1"/>
+                                    <field name="hardness" readonly="1"/>
+                                    <field name="slope_milling_angle" widget="du"/>
+                                    <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" placeholder="请选择" required="1"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="每齿走刀量fz"
+                              attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}">
+                            <field name="feed_per_tooth_ids"
+                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具'))]}">
+                                <tree editable="bottom" class="center">
+                                    <field name="specification_id" invisible="1"/>
+                                    <field name="cutting_speed"/>
+                                    <field name="blade_diameter"/>
+                                    <field name="feed_per_tooth" required="1"/>
+                                </tree>
+                            </field>
+                            <field name="feed_per_tooth_ids_2"
+                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具'))]}">
+                                <tree editable="bottom" class="center" create="0" delete="0">
+                                    <field name="specification_id" invisible="1"/>
+                                    <field name="machining_method"/>
+                                    <field name="materials_type_id"/>
+                                    <field name="blade_diameter"/>
+                                    <field name="feed_per_tooth" required="1"/>
+                                </tree>
+                            </field>
+                            <field name="feed_per_tooth_ids_3"
+                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}">
+                                <tree editable="bottom" class="center">
+                                    <field name="specification_id" invisible="1"/>
+                                    <field name="cutting_speed"/>
+                                    <field name="feed_per_tooth" required="1"/>
+                                </tree>
+                            </field>
+                            <field name="feed_per_tooth_ids_4"
+                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}">
+                                <tree editable="bottom" class="center">
+                                    <field name="specification_id" invisible="1"/>
+                                    <field name="machining_method"/>
+                                    <field name="materials_type_id"/>
+                                    <field name="feed_per_tooth" required="1"/>
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                    <footer>
+                        <!--                        <button string="确认" name="submit" type="object" class="oe_highlight"/>-->
+                        <!--                        <button string="取消" class="btn btn-secondary" special="cancel"/>-->
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_cutting_tool_specification_wizard" model="ir.actions.act_window">
+            <field name="name">刀具规格</field>
+            <field name="res_model">sf.cutting_tool.specification.wizard</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="cutting_tool_specification_wizard_form_view"/>
+            <field name="target">new</field>
+            <!--             <field name="context">{-->
+            <!--                'default_cutting_tool_model_id' : cutting_tool_model_id,-->
+            <!--            }</field>-->
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/sf_manufacturing/__init__.py b/sf_manufacturing/__init__.py
index 0650744f..899bcc97 100644
--- a/sf_manufacturing/__init__.py
+++ b/sf_manufacturing/__init__.py
@@ -1 +1,2 @@
 from . import models
+
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 61b92c81..7ee17fb2 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -63,10 +63,8 @@ class ResProductMo(models.Model):
     cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', string='刀具物料')
     cutting_tool_type = fields.Char(string="刀具物料类型", related='cutting_tool_material_id.name', store=True)
 
-    cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', string='型号',
-                                            )
+    cutting_tool_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='型号')
 
-    cutting_tool_model = fields.Char('型号')
     cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', string='类型',
                                            domain="[('cutting_tool_material_id.name', '=', cutting_tool_type)]")
 
@@ -178,8 +176,8 @@ class ResProductMo(models.Model):
     #     if self.integral_run_out_accuracy_min <= 0 and self.cutting_tool_type == '整体式刀具':
     #         raise ValidationError("端跳精度最小(min)不能为0")
 
-    # cutting_speed_ids = fields.One2many('sf.cutting.speed', 'product_template_id', string='切削速度Vc')
-    # feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'product_template_id', string='每齿走刀量fz')
+    cutting_speed_ids = fields.One2many('sf.cutting.speed', 'product_template_id', string='切削速度Vc')
+    feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'product_template_id', string='每齿走刀量fz')
 
     # @api.constrains('suitable_machining_method_ids')
     # def _check_suitable_machining_method_ids(self):
@@ -280,6 +278,21 @@ class ResProductMo(models.Model):
     #     domain="[('cutting_tool_type', '=', '刀柄')]",
     #     string='适用刀柄型号'
     # )
+
+    # @api.onchange('cutting_tool_model_id')
+    # def onchange_method(self):
+    #     if self.cutting_tool_model_id:
+    #         return {
+    #             'name': 'Import your first bill',
+    #             'view_mode': 'form',
+    #             'target': 'new',
+    #             'view_type': 'form',
+    #             'res_model': 'sf.cutting_tool.standard.library',
+    #             'context': {'default_res_id': self.cutting_tool_model_id.id},
+    #             'views': [[False, 'form']],
+    #             'res_id': self.cutting_tool_model_id.id,
+    #             'type': 'ir.actions.act_window',
+    #         }
     # 夹具参数
     fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料")
     fixture_model_id = fields.Many2one('sf.fixture.model', string="夹具型号")
@@ -408,41 +421,11 @@ class ResProductMo(models.Model):
             self.detailed_type = 'product'
             self.sale_ok = False
 
-    @api.onchange('cutting_tool_material_id')
-    def _onchange_cutting_tool_material_id(self):
-        if self.cutting_tool_material_id:
-            try:
-                config = self.env['res.config.settings'].get_values()
-                headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
-                url = config['sf_url'] + '/api/cutting_model/list'
-                res = {'token': config['token'], 'cutting_tool_material_code': self.cutting_tool_material_id.code}
-                result = requests.post(url, json={}, data=res, headers=headers)
-                result = result.json()
-                if result['status'] == 1:
-                    data = result['data']
-                    model_ids = []
-                    for item in data:
-                        model_ids.append((0, 0, {
-                            'name': item['name']
-                        }))
-                    self.cutting_tool_model = model_ids
-                return {}
-            except Exception as e:
-                logging.info("获取刀具标准库失败")
+    # @api.onchange('cutting_tool_material_id')
+    # def _onchange_cutting_tool_material_id(self):
+    #     if self.cutting_tool_material_id:
+
 
-    @api.depends('cutting_tool_material_id')
-    def _get_cutting_tool_model(self):
-        try:
-            config = self.env['res.config.settings'].get_values()
-            headers = Common.get_headers(self, config['token'], config['sf_secret_key'])
-            url = config['sf_url'] + '/api/cutting_model/list'
-            res = {'token': config['token'], 'cutting_tool_material_code': self.cutting_tool_material_id.code}
-            result = requests.post(url, json=res, data=None, headers=headers)
-            cutting_model_data = result.json()
-            if result['state'] == 1:
-                return {'cutting_model_data': cutting_model_data}
-        except Exception as e:
-            logging.info("获取刀具标准库失败")
 
     @api.onchange('fixture_material_id')
     def _onchange_fixture_material_id(self):
diff --git a/sf_manufacturing/security/ir.model.access.csv b/sf_manufacturing/security/ir.model.access.csv
index dd7077d7..b20d0985 100644
--- a/sf_manufacturing/security/ir.model.access.csv
+++ b/sf_manufacturing/security/ir.model.access.csv
@@ -8,3 +8,4 @@ access_sf_production_line,sf.production.line,model_sf_production_line,base.group
 access_maintenance_equipment_tool,maintenance_equipment_tool,model_maintenance_equipment_tool,base.group_user,1,1,1,1
 
 
+
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index 6a9b0964..f8febd9f 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -32,7 +32,7 @@ class MrStaticResourceDataSync(models.Model):
             # logging.info("材料型号已每日同步成功")
             # self.env['mrs.international.standards']._cron_mrs_international_standards_func()
             # logging.info("材料型号材料应用已每日同步成功")
-            # self.env['material.apply']._cron_material_apply_func()
+            self.env['material.apply']._cron_material_apply_func()
             logging.info("材料型号材料应用已每日同步成功")
             self.env['sf.production.process.category'].sync_production_process_category_yesterday()
             logging.info("表面工艺类别已每日同步成功")
diff --git a/sf_tool_management/views/tool_material_search.xml b/sf_tool_management/views/tool_material_search.xml
index d461efce..383fb0e5 100644
--- a/sf_tool_management/views/tool_material_search.xml
+++ b/sf_tool_management/views/tool_material_search.xml
@@ -175,7 +175,7 @@
                                         <field name="blade_hardness" string="加工硬度"/>
                                         <field name="blade_accuracy" string="精度等级"/>
                                         <field name="blade_coating_material_id" string="涂层材质"/>
-                                        <field name="mrs_cutting_tool_model_blade_cutter_bar_ids" widget="many2many_tags"/>
+<!--                                        <field name="mrs_cutting_tool_model_blade_cutter_bar_ids" widget="many2many_tags"/>-->
                                     </group>
                                     <group>
                                         <field name="blade_top_angle" string="顶角(°)"/>

From 919a20075044aa171fd20f90ef95a80be501e5d0 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 23 Oct 2023 17:36:15 +0800
Subject: [PATCH 06/21] Merge branch 'develop' of
 https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

---
 sf_base/models/tool_other_features.py         |   1 -
 sf_dlm/__init__.py                            |   2 +-
 sf_dlm/__manifest__.py                        |   2 +-
 sf_dlm/security/ir.model.access.csv           |   1 -
 sf_dlm/views/product_template_view.xml        |   7 +-
 .../cutting_tool_specification_wizard.py      |   7 +-
 sf_manufacturing/__init__.py                  |   1 +
 sf_manufacturing/__manifest__.py              |   1 +
 sf_manufacturing/security/ir.model.access.csv |   2 +
 sf_manufacturing/wizard/__init__.py           |   3 +
 .../cutting_tool_specification_wizard.py      |  88 ++++++
 .../cutting_tool_specification_wizard.xml     | 266 ++++++++++++++++++
 sf_sale/models/quick_easy_order.py            |   1 -
 13 files changed, 372 insertions(+), 10 deletions(-)
 create mode 100644 sf_manufacturing/wizard/__init__.py
 create mode 100644 sf_manufacturing/wizard/cutting_tool_specification_wizard.py
 create mode 100644 sf_manufacturing/wizard/cutting_tool_specification_wizard.xml

diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py
index 56c8c8a6..80410e3b 100644
--- a/sf_base/models/tool_other_features.py
+++ b/sf_base/models/tool_other_features.py
@@ -9,7 +9,6 @@ class ToolMaterialsBasicParameters(models.Model):
     specification_id = fields.Many2one('sf.cutting_tool.specification.wizard', string='刀具规格')
     cutting_tool_type = fields.Char(related='standard_library_id.cutting_tool_type', string='刀具物料类型',
                                     store=True)
-    # cutting_tool_type_1 = fields.Char(related='cutting_tool_type', string='类型', store=True)
 
     # 整体式刀具参数
     code = fields.Char('物料号', size=50)
diff --git a/sf_dlm/__init__.py b/sf_dlm/__init__.py
index 40272379..8b137891 100644
--- a/sf_dlm/__init__.py
+++ b/sf_dlm/__init__.py
@@ -1 +1 @@
-from . import wizard
+
diff --git a/sf_dlm/__manifest__.py b/sf_dlm/__manifest__.py
index 85906b2b..5f692988 100644
--- a/sf_dlm/__manifest__.py
+++ b/sf_dlm/__manifest__.py
@@ -17,7 +17,7 @@
         'data/product_data.xml',
         'data/uom_data.xml',
         'security/ir.model.access.csv',
-        'wizard/cutting_tool_specification_wizard.xml',
+        # 'wizard/cutting_tool_specification_wizard.xml',
         'views/product_template_view.xml',
         'views/product_workorder.xml'
     ],
diff --git a/sf_dlm/security/ir.model.access.csv b/sf_dlm/security/ir.model.access.csv
index 9039e2c1..fd6de5be 100644
--- a/sf_dlm/security/ir.model.access.csv
+++ b/sf_dlm/security/ir.model.access.csv
@@ -1,5 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_sf_cutting_tool_specification_wizard,sf_cutting_tool_specification_wizard,model_sf_cutting_tool_specification_wizard,base.group_user,1,1,1,1
 
 
 
diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index bcb0e894..44351c94 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -56,9 +56,10 @@
                     <div attrs="{'invisible': [('categ_type', '!=', '刀具')]}" class="button_width">
                         <field name="cutting_tool_model_id" placeholder="请选择"
                                domain="[('cutting_tool_material_id','=',cutting_tool_material_id)]"/>
-                        <button string="选择刀具规格" type="action" name="%(action_cutting_tool_specification_wizard)d"
-                                class="oe_highlight"
-                                context="{'default_cutting_tool_material_id': cutting_tool_material_id,
+                        <button string="选择刀具规格" type="action"
+                                name="%(sf_manufacturing.action_cutting_tool_specification_wizard)d"
+                                class="oe_highlight" context="{'default_product_id':active_id,
+                                'default_cutting_tool_material_id': cutting_tool_material_id,
                                 'default_cutting_tool_library_id': cutting_tool_model_id,
                                 'default_cutting_tool_type': cutting_tool_type}"
                         />
diff --git a/sf_dlm/wizard/cutting_tool_specification_wizard.py b/sf_dlm/wizard/cutting_tool_specification_wizard.py
index 2a79d27e..0f861bc6 100644
--- a/sf_dlm/wizard/cutting_tool_specification_wizard.py
+++ b/sf_dlm/wizard/cutting_tool_specification_wizard.py
@@ -11,11 +11,14 @@ class Cutting_toolSpecificationWizard(models.TransientModel):
     _name = "sf.cutting_tool.specification.wizard"
     _description = u'刀具规格'
 
-    cutting_tool_library_id = fields.Many2one('sf.cutting_tool.standard.library', '刀具标准库')
+    product_id = fields.Many2one('product.template', string='产品')
+    cutting_tool_library_id = fields.Many2one('sf.cutting_tool.standard.library', '刀具标准库',related='product_id.cutting_tool_library_id')
+
+    # cutting_tool_library_id = fields.Many2one('sf.cutting_tool.standard.library', '刀具标准库')
     cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料')
     cutting_tool_type = fields.Char(related=cutting_tool_material_id.name)
     cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', '刀具类型')
-    brand_id = fields.Many2one('sf.machine.brand', '品牌')
+    brand_id = fields.Many2one('sf.machine.brand', '品牌',related=cutting_tool_library_id.brand_id)
     integral_tool_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
                                                          'specification_id', string='整体式刀具基本参数')
     blade_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
diff --git a/sf_manufacturing/__init__.py b/sf_manufacturing/__init__.py
index 899bcc97..a22f9844 100644
--- a/sf_manufacturing/__init__.py
+++ b/sf_manufacturing/__init__.py
@@ -1,2 +1,3 @@
 from . import models
+from . import wizard
 
diff --git a/sf_manufacturing/__manifest__.py b/sf_manufacturing/__manifest__.py
index 9800bf5d..d88edf21 100644
--- a/sf_manufacturing/__manifest__.py
+++ b/sf_manufacturing/__manifest__.py
@@ -15,6 +15,7 @@
         'data/stock_data.xml',
         'security/group_security.xml',
         'security/ir.model.access.csv',
+        'wizard/cutting_tool_specification_wizard.xml',
         'views/mrp_production_addional_change.xml',
         # 'views/mrp_maintenance_views.xml',
         'views/mrp_routing_workcenter_view.xml',
diff --git a/sf_manufacturing/security/ir.model.access.csv b/sf_manufacturing/security/ir.model.access.csv
index b20d0985..6fe2804b 100644
--- a/sf_manufacturing/security/ir.model.access.csv
+++ b/sf_manufacturing/security/ir.model.access.csv
@@ -6,6 +6,8 @@ access_sf_embryo_model_type_routing_sort,sf_embryo_model_type_routing_sort,model
 access_sf_surface_technics_model_type_routing_sort,sf_surface_technics_model_type_routing_sort,model_sf_surface_technics_model_type_routing_sort,base.group_user,1,1,1,1
 access_sf_production_line,sf.production.line,model_sf_production_line,base.group_user,1,1,1,1
 access_maintenance_equipment_tool,maintenance_equipment_tool,model_maintenance_equipment_tool,base.group_user,1,1,1,1
+access_sf_cutting_tool_specification_wizard,sf_cutting_tool_specification_wizard,model_sf_cutting_tool_specification_wizard,base.group_user,1,1,1,1
+
 
 
 
diff --git a/sf_manufacturing/wizard/__init__.py b/sf_manufacturing/wizard/__init__.py
new file mode 100644
index 00000000..2e93b759
--- /dev/null
+++ b/sf_manufacturing/wizard/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import cutting_tool_specification_wizard
diff --git a/sf_manufacturing/wizard/cutting_tool_specification_wizard.py b/sf_manufacturing/wizard/cutting_tool_specification_wizard.py
new file mode 100644
index 00000000..8b37dd27
--- /dev/null
+++ b/sf_manufacturing/wizard/cutting_tool_specification_wizard.py
@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError
+import logging
+
+_logger = logging.getLogger(__name__)
+
+
+class Cutting_toolSpecificationWizard(models.TransientModel):
+    _name = "sf.cutting_tool.specification.wizard"
+    _description = u'刀具规格'
+
+    product_id = fields.Many2one('product.template', string='产品')
+    cutting_tool_library_id = fields.Many2one('sf.cutting_tool.standard.library', '刀具标准库')
+    cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料')
+    cutting_tool_type = fields.Char(related=cutting_tool_material_id.name)
+    cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', '刀具类型', compute='set_specification')
+    brand_id = fields.Many2one('sf.machine.brand', '品牌', compute='set_specification')
+    integral_tool_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
+                                                         'specification_id', string='整体式刀具基本参数',
+                                                         compute='set_specification')
+    blade_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
+                                                 'specification_id', string='刀片基本参数', compute='set_specification')
+    cutter_bar_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
+                                                      'specification_id', string='刀杆基本参数',
+                                                      compute='set_specification')
+    cutter_head_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
+                                                       'specification_id', string='刀盘基本参数',
+                                                       compute='set_specification')
+    knife_handle_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
+                                                        'specification_id', string='刀柄基本参数',
+                                                        compute='set_specification')
+    chuck_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
+                                                 'specification_id', string='夹头基本参数', compute='set_specification')
+    cutting_speed_ids = fields.One2many('sf.cutting.speed', 'specification_id', string='切削速度Vc')
+    feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz',
+                                         domain=[('cutting_speed', '!=', False)])
+    feed_per_tooth_ids_2 = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz',
+                                           domain=[('machining_method', '!=', False)])
+    feed_per_tooth_ids_3 = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz',
+                                           domain=[('cutting_speed', '!=', False)])
+    feed_per_tooth_ids_4 = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz',
+                                           domain=[('machining_method', '!=', False)])
+
+    @api.depends('cutting_tool_library_id')
+    def set_specification(self):
+        if self.cutting_tool_library_id:
+            for item in self:
+                item.cutting_tool_type_id = self.cutting_tool_library_id.cutting_tool_type_id.id
+                item.brand_id = self.cutting_tool_library_id.brand_id.id
+                if item.cutting_tool_type == '整体式刀具':
+                    integral_tool_basic_parameters = []
+                    for line in item.cutting_tool_library_id.integral_tool_basic_parameters_ids:
+                        integral_tool_basic_parameters.append(
+                            self.env['sf.tool.materials.basic.parameters']._json_integral_tool_basic_param(
+                                line))
+                    item.integral_tool_basic_parameters_ids = integral_tool_basic_parameters
+                elif item.cutting_tool_type == '刀片':
+                    blade_basic_parameters = []
+                    for line in item.cutting_tool_library_id.blade_basic_parameters_ids:
+                        blade_basic_parameters.append(
+                            self.env['sf.tool.materials.basic.parameters']._json_blade_basic_param(line))
+                    item.blade_basic_parameters_ids = blade_basic_parameters
+                elif item.cutting_tool_type == '刀杆':
+                    cutter_bar_basic_parameters = []
+                    for line in item.cutting_tool_library_id.cutter_bar_basic_parameters_ids:
+                        cutter_bar_basic_parameters.append(
+                            self.env['sf.tool.materials.basic.parameters']._json_cutter_bar_basic_param(line))
+                    item.cutter_bar_basic_parameters_ids = cutter_bar_basic_parameters
+                elif item.cutting_tool_type == '刀盘':
+                    cutter_head_basic_parameters = []
+                    for line in item.cutting_tool_library_id.cutter_head_basic_parameters_ids:
+                        cutter_head_basic_parameters.append(
+                            self.env['sf.tool.materials.basic.parameters']._json_cutter_head_basic_param(line))
+                    item.cutter_head_basic_parameters_ids = cutter_head_basic_parameters
+                elif item.cutting_tool_type == '刀柄':
+                    knife_handle_basic_parameters = []
+                    for line in item.cutting_tool_library_id.knife_handle_basic_parameters_ids:
+                        knife_handle_basic_parameters.append(
+                            self.env['sf.tool.materials.basic.parameters']._json_knife_handle_basic_param(line))
+                    item.knife_handle_basic_parameters_ids = knife_handle_basic_parameters
+                elif item.cutting_tool_type == '夹头':
+                    chuck_basic_parameters = []
+                    for line in item.cutting_tool_library_id.chuck_basic_parameters_ids:
+                        chuck_basic_parameters.append(
+                            self.env['sf.tool.materials.basic.parameters']._json_chuck_basic_param(line))
+                    item.chuck_basic_parameters_ids = chuck_basic_parameters
diff --git a/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml b/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml
new file mode 100644
index 00000000..fee87e2d
--- /dev/null
+++ b/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml
@@ -0,0 +1,266 @@
+<odoo>
+    <data>
+        <record model="ir.ui.view" id="cutting_tool_specification_wizard_form_view">
+            <field name="name">sf.cutting_tool.specification.wizard.form.view</field>
+            <field name="model">sf.cutting_tool.specification.wizard</field>
+            <field name="arch" type="xml">
+                <form string="刀具规格">
+                    <group>
+                        <field name="cutting_tool_material_id" readonly="1"/>
+                        <field name="cutting_tool_type_id" readonly="1" string="刀具类型"/>
+                        <field name="cutting_tool_library_id" readonly="1" string="型号"/>
+                        <field name="brand_id" readonly="1"/>
+                        <field name="cutting_tool_type" invisible="1"/>
+                    </group>
+                    <notebook>
+                        <page string="基本参数">
+                            <field name="integral_tool_basic_parameters_ids"
+                                   attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
+                                <tree class="center">
+                                    <field name="cutting_tool_type" invisible="1"/>
+                                    <field name="specification_id" invisible="1"/>
+                                    <field name="code"/>
+                                    <field name="total_length"/>
+                                    <field name="blade_diameter" class="diameter"/>
+                                    <field name="blade_length"/>
+                                    <field name="blade_number" placeholder="请选择"/>
+                                    <field name="neck_length"/>
+                                    <field name="neck_diameter" class="diameter"/>
+                                    <field name="handle_diameter" class="diameter"/>
+                                    <field name="handle_length"/>
+                                    <field name="blade_tip_working_size" class="du"/>
+                                    <field name="blade_tip_diameter" class="diameter"/>
+                                    <field name="blade_tip_taper" class="du"/>
+                                    <field name="blade_helix_angle" class="du"/>
+                                    <field name="pitch"/>
+                                    <field name="blade_width"/>
+                                    <field name="blade_depth"/>
+                                    <field name="cutting_depth"/>
+                                </tree>
+                            </field>
+
+                            <field name="blade_basic_parameters_ids"
+                                   attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}">
+                                <tree editable="bottom" class="center">
+                                    <field name="cutting_tool_type" invisible="1"/>
+                                    <field name="specification_id" invisible="1"/>
+                                    <field name="code"/>
+                                    <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="chip_breaker_groove" placeholder="请选择"/>
+                                    <field name="blade_teeth_model" placeholder="请选择"/>
+                                    <field name="cutting_depth" string="最大切削深度(mm)"/>
+                                    <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"/>
+                                </tree>
+                            </field>
+                            <field name="cutter_bar_basic_parameters_ids"
+                                   attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}">
+                                <tree editable="bottom" class="center">
+                                    <field name="cutting_tool_type" invisible="1"/>
+                                    <field name="specification_id" invisible="1"/>
+                                    <field name="code"/>
+                                    <field name="height"/>
+                                    <field name="width"/>
+                                    <field name="total_length"/>
+                                    <field name="blade_height"/>
+                                    <field name="blade_width"/>
+                                    <field name="blade_length"/>
+                                    <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="min_machining_aperture" class="diameter"/>
+                                    <field name="install_blade_tip_num"/>
+                                    <field name="cutting_blade_model"/>
+                                    <field name="cooling_hole" placeholder="请选择"/>
+                                    <field name="locating_slot_code"/>
+                                    <field name="installing_structure"/>
+                                    <field name="blade_ids" widget="many2many_tags" placeholder="请选择"/>
+                                    <field name="tool_shim"/>
+                                    <field name="cotter_pin"/>
+                                    <field name="pressing_plate"/>
+                                    <field name="screw"/>
+                                    <field name="spanner"/>
+                                </tree>
+                            </field>
+
+                            <field name="cutter_head_basic_parameters_ids"
+                                   attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}">
+                                <tree editable="bottom" class="center" delete="1">
+                                    <field name="cutting_tool_type" invisible="1"/>
+                                    <field name="specification_id" invisible="1"/>
+                                    <field name="code"/>
+                                    <field name="install_blade_tip_num"/>
+                                    <field name="blade_diameter" class="diameter"/>
+                                    <field name="cutter_head_diameter" class="diameter"/>
+                                    <field name="interface_diameter" class="diameter"/>
+                                    <field name="total_length"/>
+                                    <field name="blade_length"/>
+                                    <field name="cutting_depth" string="最大切削深度(mm)"/>
+                                    <field name="main_included_angle" class="du"/>
+                                    <field name="installing_structure"/>
+                                    <field name="blade_ids" widget="many2many_tags" placeholder="请选择"/>
+                                    <field name="screw"/>
+                                    <field name="spanner"/>
+                                    <field name="cutting_blade_model"/>
+                                    <field name="cooling_hole" placeholder="请选择"/>
+                                    <field name="locating_slot_code"/>
+                                </tree>
+                            </field>
+
+                            <field name="knife_handle_basic_parameters_ids"
+                                   attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}">
+                                <tree editable="bottom" class="center">
+                                    <field name="cutting_tool_type" invisible="1"/>
+                                    <field name="specification_id" invisible="1"/>
+                                    <field name="code"/>
+                                    <field name="total_length"/>
+                                    <field name="flange_shank_length"/>
+                                    <field name="handle_external_diameter" class="diameter"/>
+                                    <field name="handle_inside_diameter" class="diameter"/>
+                                    <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="cooling_model"/>
+                                    <field name="is_rough_machining" placeholder="请选择"/>
+                                    <field name="is_finish_machining" placeholder="请选择"/>
+                                    <field name="is_quick_cutting" placeholder="请选择"/>
+                                    <field name="is_drill_hole" placeholder="请选择"/>
+                                    <field name="is_safe_lock" placeholder="请选择"/>
+                                    <field name="screw"/>
+                                    <field name="spanner"/>
+                                </tree>
+                            </field>
+                            <field name="chuck_basic_parameters_ids"
+                                   attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}">
+                                <tree editable="bottom" class="center">
+                                    <field name="cutting_tool_type" invisible="1"/>
+                                    <field name="specification_id" invisible="1"/>
+                                    <field name="code"/>
+                                    <field name="er_size_model"/>
+                                    <field name="min_clamping_diameter" class="diameter" required="1"/>
+                                    <field name="max_clamping_diameter" class="diameter"/>
+                                    <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>
+                        </page>
+                        <page string="切削速度Vc"
+                              attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}">
+                            <field name="cutting_speed_ids">
+                                <tree editable="bottom" class="center">
+                                    <field name="execution_standard_id" placeholder="请选择" required="1"/>
+                                    <field name="specification_id" invisible="1"/>
+                                    <field name="material_code" readonly="1"/>
+                                    <field name="material_id" placeholder="请选择"
+                                           attrs="{'readonly': [('execution_standard_id', '=', False)], 'required': [('execution_standard_id', '!=', False)]}"/>
+                                    <field name="material_grade" readonly="1"/>
+                                    <field name="tensile_strength" readonly="1"/>
+                                    <field name="hardness" readonly="1"/>
+                                    <field name="slope_milling_angle" widget="du"/>
+                                    <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" placeholder="请选择" required="1"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="每齿走刀量fz"
+                              attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}">
+                            <field name="feed_per_tooth_ids"
+                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具'))]}">
+                                <tree editable="bottom" class="center">
+                                    <field name="specification_id" invisible="1"/>
+                                    <field name="cutting_speed"/>
+                                    <field name="blade_diameter"/>
+                                    <field name="feed_per_tooth" required="1"/>
+                                </tree>
+                            </field>
+                            <field name="feed_per_tooth_ids_2"
+                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具'))]}">
+                                <tree editable="bottom" class="center" create="0" delete="0">
+                                    <field name="specification_id" invisible="1"/>
+                                    <field name="machining_method"/>
+                                    <field name="materials_type_id"/>
+                                    <field name="blade_diameter"/>
+                                    <field name="feed_per_tooth" required="1"/>
+                                </tree>
+                            </field>
+                            <field name="feed_per_tooth_ids_3"
+                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}">
+                                <tree editable="bottom" class="center">
+                                    <field name="specification_id" invisible="1"/>
+                                    <field name="cutting_speed"/>
+                                    <field name="feed_per_tooth" required="1"/>
+                                </tree>
+                            </field>
+                            <field name="feed_per_tooth_ids_4"
+                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}">
+                                <tree editable="bottom" class="center">
+                                    <field name="specification_id" invisible="1"/>
+                                    <field name="machining_method"/>
+                                    <field name="materials_type_id"/>
+                                    <field name="feed_per_tooth" required="1"/>
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                    <footer>
+                        <!--                        <button string="确认" name="submit" type="object" class="oe_highlight"/>-->
+                        <!--                        <button string="取消" class="btn btn-secondary" special="cancel"/>-->
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_cutting_tool_specification_wizard" model="ir.actions.act_window">
+            <field name="name">刀具规格</field>
+            <field name="res_model">sf.cutting_tool.specification.wizard</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="cutting_tool_specification_wizard_form_view"/>
+            <field name="target">new</field>
+            <!--             <field name="context">{-->
+            <!--                'default_cutting_tool_model_id' : cutting_tool_model_id,-->
+            <!--            }</field>-->
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index 9ab4e5b8..91ddedc4 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -239,7 +239,6 @@ class QuickEasyOrder(models.Model):
                         product_bom_purchase.bom_create_line_has(purchase_embryo)
                 order_id.with_user(self.env.ref("base.user_admin")).sale_order_create_line(product, item)
         except Exception as e:
-            self.cr.rollback()
             return UserError('工厂创建销售订单和产品失败，请联系管理员')
 
 

From 2d32419a7db6655e87effa45a85082151a3c7423 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 24 Oct 2023 09:41:05 +0800
Subject: [PATCH 07/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wizard/cutting_tool_specification_wizard.py           | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sf_manufacturing/wizard/cutting_tool_specification_wizard.py b/sf_manufacturing/wizard/cutting_tool_specification_wizard.py
index 8b37dd27..31a43533 100644
--- a/sf_manufacturing/wizard/cutting_tool_specification_wizard.py
+++ b/sf_manufacturing/wizard/cutting_tool_specification_wizard.py
@@ -43,8 +43,14 @@ class Cutting_toolSpecificationWizard(models.TransientModel):
     feed_per_tooth_ids_4 = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz',
                                            domain=[('machining_method', '!=', False)])
 
-    @api.depends('cutting_tool_library_id')
+    @api.depends('cutting_tool_library_id', 'cutting_tool_type')
     def set_specification(self):
+        self.integral_tool_basic_parameters_ids = False
+        self.blade_basic_parameters_ids = False
+        self.cutter_bar_basic_parameters_ids = False
+        self.cutter_head_basic_parameters_ids = False
+        self.knife_handle_basic_parameters_ids = False
+        self.chuck_basic_parameters_ids = False
         if self.cutting_tool_library_id:
             for item in self:
                 item.cutting_tool_type_id = self.cutting_tool_library_id.cutting_tool_type_id.id

From 1bc3f756fef5a0800f5bd28ac020b66f18b4ab2e Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 24 Oct 2023 11:18:33 +0800
Subject: [PATCH 08/21] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_dlm/wizard/__init__.py                     |   3 -
 .../cutting_tool_specification_wizard.py      |  47 ----
 .../cutting_tool_specification_wizard.xml     | 266 ------------------
 .../cutting_tool_specification_wizard.py      |   2 +
 .../cutting_tool_specification_wizard.xml     |   4 +-
 5 files changed, 4 insertions(+), 318 deletions(-)
 delete mode 100644 sf_dlm/wizard/__init__.py
 delete mode 100644 sf_dlm/wizard/cutting_tool_specification_wizard.py
 delete mode 100644 sf_dlm/wizard/cutting_tool_specification_wizard.xml

diff --git a/sf_dlm/wizard/__init__.py b/sf_dlm/wizard/__init__.py
deleted file mode 100644
index 2e93b759..00000000
--- a/sf_dlm/wizard/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from . import cutting_tool_specification_wizard
diff --git a/sf_dlm/wizard/cutting_tool_specification_wizard.py b/sf_dlm/wizard/cutting_tool_specification_wizard.py
deleted file mode 100644
index 0f861bc6..00000000
--- a/sf_dlm/wizard/cutting_tool_specification_wizard.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from odoo import models, fields, api, _
-from odoo.exceptions import ValidationError
-import logging
-
-_logger = logging.getLogger(__name__)
-
-
-class Cutting_toolSpecificationWizard(models.TransientModel):
-    _name = "sf.cutting_tool.specification.wizard"
-    _description = u'刀具规格'
-
-    product_id = fields.Many2one('product.template', string='产品')
-    cutting_tool_library_id = fields.Many2one('sf.cutting_tool.standard.library', '刀具标准库',related='product_id.cutting_tool_library_id')
-
-    # cutting_tool_library_id = fields.Many2one('sf.cutting_tool.standard.library', '刀具标准库')
-    cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    cutting_tool_type = fields.Char(related=cutting_tool_material_id.name)
-    cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', '刀具类型')
-    brand_id = fields.Many2one('sf.machine.brand', '品牌',related=cutting_tool_library_id.brand_id)
-    integral_tool_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
-                                                         'specification_id', string='整体式刀具基本参数')
-    blade_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
-                                                 'specification_id', string='刀片基本参数')
-    cutter_bar_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
-                                                      'specification_id', string='刀杆基本参数')
-    cutter_head_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
-                                                       'specification_id', string='刀盘基本参数')
-    knife_handle_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
-                                                        'specification_id', string='刀柄基本参数')
-    chuck_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
-                                                 'specification_id', string='夹头基本参数')
-    cutting_speed_ids = fields.One2many('sf.cutting.speed', 'specification_id', string='切削速度Vc')
-    feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz',
-                                         domain=[('cutting_speed', '!=', False)])
-    feed_per_tooth_ids_2 = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz',
-                                           domain=[('machining_method', '!=', False)])
-    feed_per_tooth_ids_3 = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz',
-                                           domain=[('cutting_speed', '!=', False)])
-    feed_per_tooth_ids_4 = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz',
-                                           domain=[('machining_method', '!=', False)])
-
-    @api.depends('cutting_tool_library_id')
-    def set_specification(self):
-        for vals in self.cutting_tool_library_id.integral_tool_basic_parameters_ids:
-            vals.write({'specification_id': self.id})
diff --git a/sf_dlm/wizard/cutting_tool_specification_wizard.xml b/sf_dlm/wizard/cutting_tool_specification_wizard.xml
deleted file mode 100644
index fee87e2d..00000000
--- a/sf_dlm/wizard/cutting_tool_specification_wizard.xml
+++ /dev/null
@@ -1,266 +0,0 @@
-<odoo>
-    <data>
-        <record model="ir.ui.view" id="cutting_tool_specification_wizard_form_view">
-            <field name="name">sf.cutting_tool.specification.wizard.form.view</field>
-            <field name="model">sf.cutting_tool.specification.wizard</field>
-            <field name="arch" type="xml">
-                <form string="刀具规格">
-                    <group>
-                        <field name="cutting_tool_material_id" readonly="1"/>
-                        <field name="cutting_tool_type_id" readonly="1" string="刀具类型"/>
-                        <field name="cutting_tool_library_id" readonly="1" string="型号"/>
-                        <field name="brand_id" readonly="1"/>
-                        <field name="cutting_tool_type" invisible="1"/>
-                    </group>
-                    <notebook>
-                        <page string="基本参数">
-                            <field name="integral_tool_basic_parameters_ids"
-                                   attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
-                                <tree class="center">
-                                    <field name="cutting_tool_type" invisible="1"/>
-                                    <field name="specification_id" invisible="1"/>
-                                    <field name="code"/>
-                                    <field name="total_length"/>
-                                    <field name="blade_diameter" class="diameter"/>
-                                    <field name="blade_length"/>
-                                    <field name="blade_number" placeholder="请选择"/>
-                                    <field name="neck_length"/>
-                                    <field name="neck_diameter" class="diameter"/>
-                                    <field name="handle_diameter" class="diameter"/>
-                                    <field name="handle_length"/>
-                                    <field name="blade_tip_working_size" class="du"/>
-                                    <field name="blade_tip_diameter" class="diameter"/>
-                                    <field name="blade_tip_taper" class="du"/>
-                                    <field name="blade_helix_angle" class="du"/>
-                                    <field name="pitch"/>
-                                    <field name="blade_width"/>
-                                    <field name="blade_depth"/>
-                                    <field name="cutting_depth"/>
-                                </tree>
-                            </field>
-
-                            <field name="blade_basic_parameters_ids"
-                                   attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}">
-                                <tree editable="bottom" class="center">
-                                    <field name="cutting_tool_type" invisible="1"/>
-                                    <field name="specification_id" invisible="1"/>
-                                    <field name="code"/>
-                                    <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="chip_breaker_groove" placeholder="请选择"/>
-                                    <field name="blade_teeth_model" placeholder="请选择"/>
-                                    <field name="cutting_depth" string="最大切削深度(mm)"/>
-                                    <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"/>
-                                </tree>
-                            </field>
-                            <field name="cutter_bar_basic_parameters_ids"
-                                   attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}">
-                                <tree editable="bottom" class="center">
-                                    <field name="cutting_tool_type" invisible="1"/>
-                                    <field name="specification_id" invisible="1"/>
-                                    <field name="code"/>
-                                    <field name="height"/>
-                                    <field name="width"/>
-                                    <field name="total_length"/>
-                                    <field name="blade_height"/>
-                                    <field name="blade_width"/>
-                                    <field name="blade_length"/>
-                                    <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="min_machining_aperture" class="diameter"/>
-                                    <field name="install_blade_tip_num"/>
-                                    <field name="cutting_blade_model"/>
-                                    <field name="cooling_hole" placeholder="请选择"/>
-                                    <field name="locating_slot_code"/>
-                                    <field name="installing_structure"/>
-                                    <field name="blade_ids" widget="many2many_tags" placeholder="请选择"/>
-                                    <field name="tool_shim"/>
-                                    <field name="cotter_pin"/>
-                                    <field name="pressing_plate"/>
-                                    <field name="screw"/>
-                                    <field name="spanner"/>
-                                </tree>
-                            </field>
-
-                            <field name="cutter_head_basic_parameters_ids"
-                                   attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}">
-                                <tree editable="bottom" class="center" delete="1">
-                                    <field name="cutting_tool_type" invisible="1"/>
-                                    <field name="specification_id" invisible="1"/>
-                                    <field name="code"/>
-                                    <field name="install_blade_tip_num"/>
-                                    <field name="blade_diameter" class="diameter"/>
-                                    <field name="cutter_head_diameter" class="diameter"/>
-                                    <field name="interface_diameter" class="diameter"/>
-                                    <field name="total_length"/>
-                                    <field name="blade_length"/>
-                                    <field name="cutting_depth" string="最大切削深度(mm)"/>
-                                    <field name="main_included_angle" class="du"/>
-                                    <field name="installing_structure"/>
-                                    <field name="blade_ids" widget="many2many_tags" placeholder="请选择"/>
-                                    <field name="screw"/>
-                                    <field name="spanner"/>
-                                    <field name="cutting_blade_model"/>
-                                    <field name="cooling_hole" placeholder="请选择"/>
-                                    <field name="locating_slot_code"/>
-                                </tree>
-                            </field>
-
-                            <field name="knife_handle_basic_parameters_ids"
-                                   attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}">
-                                <tree editable="bottom" class="center">
-                                    <field name="cutting_tool_type" invisible="1"/>
-                                    <field name="specification_id" invisible="1"/>
-                                    <field name="code"/>
-                                    <field name="total_length"/>
-                                    <field name="flange_shank_length"/>
-                                    <field name="handle_external_diameter" class="diameter"/>
-                                    <field name="handle_inside_diameter" class="diameter"/>
-                                    <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="cooling_model"/>
-                                    <field name="is_rough_machining" placeholder="请选择"/>
-                                    <field name="is_finish_machining" placeholder="请选择"/>
-                                    <field name="is_quick_cutting" placeholder="请选择"/>
-                                    <field name="is_drill_hole" placeholder="请选择"/>
-                                    <field name="is_safe_lock" placeholder="请选择"/>
-                                    <field name="screw"/>
-                                    <field name="spanner"/>
-                                </tree>
-                            </field>
-                            <field name="chuck_basic_parameters_ids"
-                                   attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}">
-                                <tree editable="bottom" class="center">
-                                    <field name="cutting_tool_type" invisible="1"/>
-                                    <field name="specification_id" invisible="1"/>
-                                    <field name="code"/>
-                                    <field name="er_size_model"/>
-                                    <field name="min_clamping_diameter" class="diameter" required="1"/>
-                                    <field name="max_clamping_diameter" class="diameter"/>
-                                    <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>
-                        </page>
-                        <page string="切削速度Vc"
-                              attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}">
-                            <field name="cutting_speed_ids">
-                                <tree editable="bottom" class="center">
-                                    <field name="execution_standard_id" placeholder="请选择" required="1"/>
-                                    <field name="specification_id" invisible="1"/>
-                                    <field name="material_code" readonly="1"/>
-                                    <field name="material_id" placeholder="请选择"
-                                           attrs="{'readonly': [('execution_standard_id', '=', False)], 'required': [('execution_standard_id', '!=', False)]}"/>
-                                    <field name="material_grade" readonly="1"/>
-                                    <field name="tensile_strength" readonly="1"/>
-                                    <field name="hardness" readonly="1"/>
-                                    <field name="slope_milling_angle" widget="du"/>
-                                    <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" placeholder="请选择" required="1"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="每齿走刀量fz"
-                              attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}">
-                            <field name="feed_per_tooth_ids"
-                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具'))]}">
-                                <tree editable="bottom" class="center">
-                                    <field name="specification_id" invisible="1"/>
-                                    <field name="cutting_speed"/>
-                                    <field name="blade_diameter"/>
-                                    <field name="feed_per_tooth" required="1"/>
-                                </tree>
-                            </field>
-                            <field name="feed_per_tooth_ids_2"
-                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具'))]}">
-                                <tree editable="bottom" class="center" create="0" delete="0">
-                                    <field name="specification_id" invisible="1"/>
-                                    <field name="machining_method"/>
-                                    <field name="materials_type_id"/>
-                                    <field name="blade_diameter"/>
-                                    <field name="feed_per_tooth" required="1"/>
-                                </tree>
-                            </field>
-                            <field name="feed_per_tooth_ids_3"
-                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}">
-                                <tree editable="bottom" class="center">
-                                    <field name="specification_id" invisible="1"/>
-                                    <field name="cutting_speed"/>
-                                    <field name="feed_per_tooth" required="1"/>
-                                </tree>
-                            </field>
-                            <field name="feed_per_tooth_ids_4"
-                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}">
-                                <tree editable="bottom" class="center">
-                                    <field name="specification_id" invisible="1"/>
-                                    <field name="machining_method"/>
-                                    <field name="materials_type_id"/>
-                                    <field name="feed_per_tooth" required="1"/>
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                    <footer>
-                        <!--                        <button string="确认" name="submit" type="object" class="oe_highlight"/>-->
-                        <!--                        <button string="取消" class="btn btn-secondary" special="cancel"/>-->
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_cutting_tool_specification_wizard" model="ir.actions.act_window">
-            <field name="name">刀具规格</field>
-            <field name="res_model">sf.cutting_tool.specification.wizard</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="cutting_tool_specification_wizard_form_view"/>
-            <field name="target">new</field>
-            <!--             <field name="context">{-->
-            <!--                'default_cutting_tool_model_id' : cutting_tool_model_id,-->
-            <!--            }</field>-->
-        </record>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/sf_manufacturing/wizard/cutting_tool_specification_wizard.py b/sf_manufacturing/wizard/cutting_tool_specification_wizard.py
index 31a43533..c962e2f0 100644
--- a/sf_manufacturing/wizard/cutting_tool_specification_wizard.py
+++ b/sf_manufacturing/wizard/cutting_tool_specification_wizard.py
@@ -51,6 +51,8 @@ class Cutting_toolSpecificationWizard(models.TransientModel):
         self.cutter_head_basic_parameters_ids = False
         self.knife_handle_basic_parameters_ids = False
         self.chuck_basic_parameters_ids = False
+        self.cutting_tool_type_id = False
+        self.brand_id = False
         if self.cutting_tool_library_id:
             for item in self:
                 item.cutting_tool_type_id = self.cutting_tool_library_id.cutting_tool_type_id.id
diff --git a/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml b/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml
index fee87e2d..03ecf43b 100644
--- a/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml
+++ b/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml
@@ -245,8 +245,8 @@
                         </page>
                     </notebook>
                     <footer>
-                        <!--                        <button string="确认" name="submit" type="object" class="oe_highlight"/>-->
-                        <!--                        <button string="取消" class="btn btn-secondary" special="cancel"/>-->
+                        <button string="选择" name="choose" type="object" class="oe_highlight"/>
+                        <button string="取消" class="btn btn-secondary" special="cancel"/>
                     </footer>
                 </form>
             </field>

From 38c77e7fbb825c49f12e42b9b820f231f9fd7aa2 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 24 Oct 2023 14:38:35 +0800
Subject: [PATCH 09/21] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E8=A7=84=E6=A0=BC=E5=9F=BA=E6=9C=AC=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wizard/cutting_tool_specification_wizard.py  | 16 ++++++++++++++++
 .../wizard/cutting_tool_specification_wizard.xml |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/sf_manufacturing/wizard/cutting_tool_specification_wizard.py b/sf_manufacturing/wizard/cutting_tool_specification_wizard.py
index c962e2f0..69643b1a 100644
--- a/sf_manufacturing/wizard/cutting_tool_specification_wizard.py
+++ b/sf_manufacturing/wizard/cutting_tool_specification_wizard.py
@@ -94,3 +94,19 @@ class Cutting_toolSpecificationWizard(models.TransientModel):
                         chuck_basic_parameters.append(
                             self.env['sf.tool.materials.basic.parameters']._json_chuck_basic_param(line))
                     item.chuck_basic_parameters_ids = chuck_basic_parameters
+
+
+    def choose_basic_param(self):
+        self.product_id.brand_id = self.brand_id.id
+        # self.product_id.brand_id = self.brand_id.id
+        # if self.cutting_tool_type == '整体式刀具':
+        #     self.product_id.brand_id = self.brand_id.id
+        #
+        # elif self.cutting_tool_type == '刀片':
+        #
+        # elif self.cutting_tool_type == '刀杆':
+        #
+        # elif self.cutting_tool_type == '刀盘':
+        #
+        # elif self.cutting_tool_type == '刀柄':
+
diff --git a/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml b/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml
index 03ecf43b..7668a0df 100644
--- a/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml
+++ b/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml
@@ -245,7 +245,7 @@
                         </page>
                     </notebook>
                     <footer>
-                        <button string="选择" name="choose" type="object" class="oe_highlight"/>
+                        <button string="选择" name="choose_basic_param" type="object" class="oe_highlight"/>
                         <button string="取消" class="btn btn-secondary" special="cancel"/>
                     </footer>
                 </form>

From 7b471be4cf76582a50bebc401b305d35a7f960f1 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 24 Oct 2023 17:47:05 +0800
Subject: [PATCH 10/21] =?UTF-8?q?=E6=B4=97=E6=BE=A1=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/tool_other_features.py         |  1 +
 .../cutting_tool_specification_wizard.py      | 41 ++++++++++++-------
 .../cutting_tool_specification_wizard.xml     |  2 +-
 sf_sale/models/auto_quatotion_common.py       | 24 +++++------
 4 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py
index 80410e3b..16b31433 100644
--- a/sf_base/models/tool_other_features.py
+++ b/sf_base/models/tool_other_features.py
@@ -125,6 +125,7 @@ class ToolMaterialsBasicParameters(models.Model):
 
     def _json_integral_tool_basic_param(self, obj):
         integral_tool_basic_param_str = (0, '', {
+            'standard_library_id': 1,
             'code': obj['code'],
             'cutting_tool_type': obj['cutting_tool_type'],
             'total_length': obj['total_length'],
diff --git a/sf_manufacturing/wizard/cutting_tool_specification_wizard.py b/sf_manufacturing/wizard/cutting_tool_specification_wizard.py
index 69643b1a..6105b941 100644
--- a/sf_manufacturing/wizard/cutting_tool_specification_wizard.py
+++ b/sf_manufacturing/wizard/cutting_tool_specification_wizard.py
@@ -43,6 +43,33 @@ class Cutting_toolSpecificationWizard(models.TransientModel):
     feed_per_tooth_ids_4 = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz',
                                            domain=[('machining_method', '!=', False)])
 
+    def choose_basic_param(self):
+        self.product_id.brand_id = self.brand_id.id
+        self.product_id.cutting_tool_type_id = self.cutting_tool_type_id.id
+        record = self.integral_tool_basic_parameters_ids.browse(id)
+
+        # selected_record = self.integral_tool_basic_parameters_ids.browse(self._context.get('active_id'))
+        if self.cutting_tool_type == '整体式刀具':
+            for record in self.integral_tool_basic_parameters_ids:
+                selected_record1 = self.env['sf.tool.materials.basic.parameters'].browse(self._context.get('active_id'))
+                # 获取选中记录的字段值
+                self.product_id.cutting_tool_total_length = selected_record1.total_length
+
+
+            # self.product_id.blade_diameter = self.integral_tool_basic_parameters_ids[0].blade_diameter
+            # self.product_id.blade_length = self.integral_tool_basic_parameters_ids[0].blade_length
+            # self.product_id.blade = self.integral_tool_basic_parameters_ids[0].shank_diameter
+            # self.product_id.shank_length = self.integral_tool_basic_parameters_ids[0].shank_length
+
+
+        # elif self.cutting_tool_type == '刀片':
+        #
+        # elif self.cutting_tool_type == '刀杆':
+        #
+        # elif self.cutting_tool_type == '刀盘':
+        #
+        # elif self.cutting_tool_type == '刀柄':
+
     @api.depends('cutting_tool_library_id', 'cutting_tool_type')
     def set_specification(self):
         self.integral_tool_basic_parameters_ids = False
@@ -96,17 +123,3 @@ class Cutting_toolSpecificationWizard(models.TransientModel):
                     item.chuck_basic_parameters_ids = chuck_basic_parameters
 
 
-    def choose_basic_param(self):
-        self.product_id.brand_id = self.brand_id.id
-        # self.product_id.brand_id = self.brand_id.id
-        # if self.cutting_tool_type == '整体式刀具':
-        #     self.product_id.brand_id = self.brand_id.id
-        #
-        # elif self.cutting_tool_type == '刀片':
-        #
-        # elif self.cutting_tool_type == '刀杆':
-        #
-        # elif self.cutting_tool_type == '刀盘':
-        #
-        # elif self.cutting_tool_type == '刀柄':
-
diff --git a/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml b/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml
index 7668a0df..5433bddb 100644
--- a/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml
+++ b/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml
@@ -16,7 +16,7 @@
                         <page string="基本参数">
                             <field name="integral_tool_basic_parameters_ids"
                                    attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
-                                <tree class="center">
+                                <tree sample="1" multi_edit="1">
                                     <field name="cutting_tool_type" invisible="1"/>
                                     <field name="specification_id" invisible="1"/>
                                     <field name="code"/>
diff --git a/sf_sale/models/auto_quatotion_common.py b/sf_sale/models/auto_quatotion_common.py
index 09ea3f0f..2d34a76e 100644
--- a/sf_sale/models/auto_quatotion_common.py
+++ b/sf_sale/models/auto_quatotion_common.py
@@ -2,7 +2,7 @@
 import logging
 from odoo.modules import get_resource_path
 from odoo import fields, models, api
-from quatotion import readSql, feature_recognize, auto_quatotion
+#from quatotion import readSql, feature_recognize, auto_quatotion
 
 __author__ = 'jinling.yang'
 _logger = logging.getLogger(__name__)
@@ -24,14 +24,14 @@ class AutoQuatotion(models.Model):
     def get_process_time_db_path(self):
         return get_resource_path('sf_sale', 'models', 'process_time.db')
 
-    def get_auto_quatotion(self, stp_url, feature_full_path, process_time_db_path, model_code):
-        '''
-        通过打包好的.so库，
-        以调用autoQuatotion库中Quatotion类，
-        初始化后调用类的analyseShape方法对模型文件进行价格预测
-        '''
-        # 初始化自动报价类(输入特征数据库和加工时间数据库)
-        reader = auto_quatotion.Quatotion(feature_full_path, process_time_db_path)
-        # 获取价格、加工时间、尺寸、XYZ、翻面次数
-        feature_info = reader.analyseShape(stp_url, InfoJson={})
-        return feature_info
+    # def get_auto_quatotion(self, stp_url, feature_full_path, process_time_db_path, model_code):
+    #     '''
+    #     通过打包好的.so库，
+    #     以调用autoQuatotion库中Quatotion类，
+    #     初始化后调用类的analyseShape方法对模型文件进行价格预测
+    #     '''
+    #     # 初始化自动报价类(输入特征数据库和加工时间数据库)
+    #     reader = auto_quatotion.Quatotion(feature_full_path, process_time_db_path)
+    #     # 获取价格、加工时间、尺寸、XYZ、翻面次数
+    #     feature_info = reader.analyseShape(stp_url, InfoJson={})
+    #     return feature_info

From 39f97131a29e0e3e1360c8ce0b4fcaf02d4c9dd1 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 25 Oct 2023 15:07:29 +0800
Subject: [PATCH 11/21] =?UTF-8?q?1.=E5=8E=BB=E6=8E=89=E4=B8=8D=E8=A6=81?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=812,.=E4=BA=A7=E5=93=81=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=96=B0=E5=A2=9E=E8=A7=84=E6=A0=BC=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/tool_other_features.py         |  23 +-
 sf_base/views/tool_views.xml                  |  12 +-
 sf_dlm/views/product_template_view.xml        |  21 +-
 sf_manufacturing/__init__.py                  |   2 +-
 sf_manufacturing/__manifest__.py              |   1 -
 sf_manufacturing/models/product_template.py   |   4 +-
 sf_manufacturing/security/ir.model.access.csv |   1 -
 sf_manufacturing/wizard/__init__.py           |   3 -
 .../cutting_tool_specification_wizard.py      | 125 --------
 .../cutting_tool_specification_wizard.xml     | 266 ------------------
 10 files changed, 31 insertions(+), 427 deletions(-)
 delete mode 100644 sf_manufacturing/wizard/__init__.py
 delete mode 100644 sf_manufacturing/wizard/cutting_tool_specification_wizard.py
 delete mode 100644 sf_manufacturing/wizard/cutting_tool_specification_wizard.xml

diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py
index 16b31433..e4376d63 100644
--- a/sf_base/models/tool_other_features.py
+++ b/sf_base/models/tool_other_features.py
@@ -5,13 +5,13 @@ class ToolMaterialsBasicParameters(models.Model):
     _name = 'sf.tool.materials.basic.parameters'
     _description = '刀具物料基本参数'
 
+    name = fields.Char('物料号', size=50)
     standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀具标准库')
-    specification_id = fields.Many2one('sf.cutting_tool.specification.wizard', string='刀具规格')
     cutting_tool_type = fields.Char(related='standard_library_id.cutting_tool_type', string='刀具物料类型',
                                     store=True)
 
     # 整体式刀具参数
-    code = fields.Char('物料号', size=50)
+    # code = fields.Char('物料号', size=50)
     total_length = fields.Char('总长度(mm)', size=20)
     blade_number = fields.Selection(
         [('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8')],
@@ -123,10 +123,15 @@ class ToolMaterialsBasicParameters(models.Model):
         string='适用刀柄型号'
     )
 
+    def name_get(self):
+        res = []
+        for obj in self:
+            res.append((obj.id, obj.blade_diameter))
+        return res
+
     def _json_integral_tool_basic_param(self, obj):
         integral_tool_basic_param_str = (0, '', {
-            'standard_library_id': 1,
-            'code': obj['code'],
+            'name': obj['code'],
             'cutting_tool_type': obj['cutting_tool_type'],
             'total_length': obj['total_length'],
             'blade_diameter': obj['blade_diameter'],
@@ -149,7 +154,7 @@ class ToolMaterialsBasicParameters(models.Model):
 
     def _json_blade_basic_param(self, obj):
         blade_basic_param_str = (0, '', {
-            'code': obj['code'],
+            'name': obj['code'],
             'cutting_tool_type': obj['cutting_tool_type'],
             'length': obj['length'],
             'thickness': obj['thickness'],
@@ -179,7 +184,7 @@ class ToolMaterialsBasicParameters(models.Model):
 
     def _json_cutter_arbor_basic_param(self, obj):
         cutter_arbor_basic_param_str = (0, '', {
-            'code': obj['code'],
+            'name': obj['code'],
             'cutting_tool_type': obj['cutting_tool_type'],
             'height': obj['height'],
             'width': obj['width'],
@@ -210,7 +215,7 @@ class ToolMaterialsBasicParameters(models.Model):
 
     def _json_cutter_head_basic_param(self, obj):
         cutter_head_basic_param_str = (0, '', {
-            'code': obj['code'],
+            'name': obj['code'],
             'cutting_tool_type': obj['cutting_tool_type'],
             'install_blade_tip_num': obj['install_blade_tip_num'],
             'blade_diameter': obj['blade_diameter'],
@@ -233,7 +238,7 @@ class ToolMaterialsBasicParameters(models.Model):
 
     def _json_knife_handle_basic_param(self, obj):
         knife_handle_basic_param_str = (0, '', {
-            'code': obj['code'],
+            'name': obj['code'],
             'cutting_tool_type': obj['cutting_tool_type'],
             'total_length': obj['total_length'],
             'flange_shank_length': obj['flange_shank_length'],
@@ -261,7 +266,7 @@ class ToolMaterialsBasicParameters(models.Model):
 
     def _json_chuck_basic_param(self, obj):
         chuck_basic_param_str = (0, '', {
-            'code': obj['code'],
+            'name': obj['code'],
             'cutting_tool_type': obj['cutting_tool_type'],
             'er_size_model': obj['er_size_model'],
             'min_clamping_diameter': obj['min_clamping_diameter'],
diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index bc1c9605..bfaac129 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -255,7 +255,7 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
                                     <tree editable="bottom" class="center" delete="1">
                                         <field name="cutting_tool_type" invisible="1"/>
-                                        <field name="code"/>
+                                        <field name="name"/>
                                         <field name="total_length"/>
                                         <field name="blade_diameter" class="diameter"/>
                                         <field name="blade_length"/>
@@ -279,7 +279,7 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}">
                                     <tree editable="bottom" class="center" delete="1">
                                         <field name="cutting_tool_type" invisible="1"/>
-                                        <field name="code"/>
+                                        <field name="name"/>
                                         <field name="length"/>
                                         <field name="thickness"/>
                                         <field name="width"/>
@@ -309,7 +309,7 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}">
                                     <tree editable="bottom" class="center" delete="1">
                                         <field name="cutting_tool_type" invisible="1"/>
-                                        <field name="code"/>
+                                        <field name="name"/>
                                         <field name="height"/>
                                         <field name="width"/>
                                         <field name="total_length"/>
@@ -340,7 +340,7 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}">
                                     <tree editable="bottom" class="center" delete="1">
                                         <field name="cutting_tool_type" invisible="1"/>
-                                        <field name="code"/>
+                                        <field name="name"/>
                                         <field name="install_blade_tip_num"/>
                                         <field name="blade_diameter" class="diameter"/>
                                         <field name="cutter_head_diameter" class="diameter"/>
@@ -363,7 +363,7 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}">
                                     <tree editable="bottom" class="center" delete="1">
                                         <field name="cutting_tool_type" invisible="1"/>
-                                        <field name="code"/>
+                                        <field name="name"/>
                                         <field name="total_length"/>
                                         <field name="flange_shank_length"/>
                                         <field name="handle_external_diameter" class="diameter"/>
@@ -391,7 +391,7 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}">
                                     <tree editable="bottom" class="center" delete="1">
                                         <field name="cutting_tool_type" invisible="1"/>
-                                        <field name="code"/>
+                                        <field name="name"/>
                                         <field name="er_size_model"/>
                                         <field name="min_clamping_diameter" class="diameter" required="1"/>
                                         <field name="max_clamping_diameter" class="diameter"/>
diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index 44351c94..c6565d80 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -51,19 +51,12 @@
                            attrs="{'invisible': ['|',('categ_type', '!=', '表面工艺'),('categ_type', '=', False)]}"/>
                     <field name="cutting_tool_material_id" attrs="{'invisible': [('categ_type', '!=', '刀具')]}"
                            placeholder="请选择"/>
-                    <label for="cutting_tool_model_id" string="型号" class="type_label"
-                           attrs="{'invisible': [('categ_type', '!=', '刀具')]}"/>
-                    <div attrs="{'invisible': [('categ_type', '!=', '刀具')]}" class="button_width">
-                        <field name="cutting_tool_model_id" placeholder="请选择"
-                               domain="[('cutting_tool_material_id','=',cutting_tool_material_id)]"/>
-                        <button string="选择刀具规格" type="action"
-                                name="%(sf_manufacturing.action_cutting_tool_specification_wizard)d"
-                                class="oe_highlight" context="{'default_product_id':active_id,
-                                'default_cutting_tool_material_id': cutting_tool_material_id,
-                                'default_cutting_tool_library_id': cutting_tool_model_id,
-                                'default_cutting_tool_type': cutting_tool_type}"
-                        />
-                    </div>
+                    <field name="cutting_tool_model_id" placeholder="请选择"
+                           attrs="{'invisible': [('categ_type', '!=', '刀具')]}"
+                           domain="[('cutting_tool_material_id','=',cutting_tool_material_id)]"/>
+                    <field name="specification_id" placeholder="请选择" class="diameter"
+                           attrs="{'invisible': [('categ_type', '!=', '刀具')]}"
+                           domain="[('standard_library_id','=',cutting_tool_model_id)]"/>
                     <field name="fixture_material_id" attrs="{'invisible': [('categ_type', '!=', '夹具')]}"
                            placeholder="请选择"/>
                     <field name="fixture_model_id" string="型号" placeholder="请选择"
@@ -111,7 +104,7 @@
                         </group>
                     </page>
                 </xpath>
-                <xpath expr="//page[last()-1]" position="after">
+                <xpath expr="//page[@name='general_information']" position="after">
                     <page string="刀具物料参数" attrs="{'invisible': [('categ_type', '!=', '刀具')]}">
                         <group>
                             <group attrs="{'invisible': [('categ_type', '!=', '刀具')]}" col="1">
diff --git a/sf_manufacturing/__init__.py b/sf_manufacturing/__init__.py
index a22f9844..7c378d64 100644
--- a/sf_manufacturing/__init__.py
+++ b/sf_manufacturing/__init__.py
@@ -1,3 +1,3 @@
 from . import models
-from . import wizard
+
 
diff --git a/sf_manufacturing/__manifest__.py b/sf_manufacturing/__manifest__.py
index d88edf21..9800bf5d 100644
--- a/sf_manufacturing/__manifest__.py
+++ b/sf_manufacturing/__manifest__.py
@@ -15,7 +15,6 @@
         'data/stock_data.xml',
         'security/group_security.xml',
         'security/ir.model.access.csv',
-        'wizard/cutting_tool_specification_wizard.xml',
         'views/mrp_production_addional_change.xml',
         # 'views/mrp_maintenance_views.xml',
         'views/mrp_routing_workcenter_view.xml',
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 7ee17fb2..857e1cfd 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -47,7 +47,6 @@ class ResProductMo(models.Model):
     width = fields.Float('宽(mm)', digits=(16, 3))
     height = fields.Float('高(mm)', digits=(16, 3))
     single_manufacturing = fields.Boolean(string="单个制造")
-
     model_code = fields.Char('模型编码')
     is_bfm = fields.Boolean('业务平台是否自动创建', default=False)
     upload_model_file = fields.Many2many('ir.attachment', 'upload_model_file_attachment_ref', string='上传模型文件')
@@ -64,11 +63,14 @@ class ResProductMo(models.Model):
     cutting_tool_type = fields.Char(string="刀具物料类型", related='cutting_tool_material_id.name', store=True)
 
     cutting_tool_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='型号')
+    specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='规格')
 
     cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', string='类型',
                                            domain="[('cutting_tool_material_id.name', '=', cutting_tool_type)]")
 
+
     brand_id = fields.Many2one('sf.machine.brand', '品牌')
+
     tool_length = fields.Float('长度(mm)')
     tool_width = fields.Float('宽度(mm)')
     tool_height = fields.Float('高度(mm)')
diff --git a/sf_manufacturing/security/ir.model.access.csv b/sf_manufacturing/security/ir.model.access.csv
index 6fe2804b..a3c4e2a9 100644
--- a/sf_manufacturing/security/ir.model.access.csv
+++ b/sf_manufacturing/security/ir.model.access.csv
@@ -6,7 +6,6 @@ access_sf_embryo_model_type_routing_sort,sf_embryo_model_type_routing_sort,model
 access_sf_surface_technics_model_type_routing_sort,sf_surface_technics_model_type_routing_sort,model_sf_surface_technics_model_type_routing_sort,base.group_user,1,1,1,1
 access_sf_production_line,sf.production.line,model_sf_production_line,base.group_user,1,1,1,1
 access_maintenance_equipment_tool,maintenance_equipment_tool,model_maintenance_equipment_tool,base.group_user,1,1,1,1
-access_sf_cutting_tool_specification_wizard,sf_cutting_tool_specification_wizard,model_sf_cutting_tool_specification_wizard,base.group_user,1,1,1,1
 
 
 
diff --git a/sf_manufacturing/wizard/__init__.py b/sf_manufacturing/wizard/__init__.py
deleted file mode 100644
index 2e93b759..00000000
--- a/sf_manufacturing/wizard/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from . import cutting_tool_specification_wizard
diff --git a/sf_manufacturing/wizard/cutting_tool_specification_wizard.py b/sf_manufacturing/wizard/cutting_tool_specification_wizard.py
deleted file mode 100644
index 6105b941..00000000
--- a/sf_manufacturing/wizard/cutting_tool_specification_wizard.py
+++ /dev/null
@@ -1,125 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from odoo import models, fields, api, _
-from odoo.exceptions import ValidationError
-import logging
-
-_logger = logging.getLogger(__name__)
-
-
-class Cutting_toolSpecificationWizard(models.TransientModel):
-    _name = "sf.cutting_tool.specification.wizard"
-    _description = u'刀具规格'
-
-    product_id = fields.Many2one('product.template', string='产品')
-    cutting_tool_library_id = fields.Many2one('sf.cutting_tool.standard.library', '刀具标准库')
-    cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料')
-    cutting_tool_type = fields.Char(related=cutting_tool_material_id.name)
-    cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', '刀具类型', compute='set_specification')
-    brand_id = fields.Many2one('sf.machine.brand', '品牌', compute='set_specification')
-    integral_tool_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
-                                                         'specification_id', string='整体式刀具基本参数',
-                                                         compute='set_specification')
-    blade_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
-                                                 'specification_id', string='刀片基本参数', compute='set_specification')
-    cutter_bar_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
-                                                      'specification_id', string='刀杆基本参数',
-                                                      compute='set_specification')
-    cutter_head_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
-                                                       'specification_id', string='刀盘基本参数',
-                                                       compute='set_specification')
-    knife_handle_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
-                                                        'specification_id', string='刀柄基本参数',
-                                                        compute='set_specification')
-    chuck_basic_parameters_ids = fields.One2many('sf.tool.materials.basic.parameters',
-                                                 'specification_id', string='夹头基本参数', compute='set_specification')
-    cutting_speed_ids = fields.One2many('sf.cutting.speed', 'specification_id', string='切削速度Vc')
-    feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz',
-                                         domain=[('cutting_speed', '!=', False)])
-    feed_per_tooth_ids_2 = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz',
-                                           domain=[('machining_method', '!=', False)])
-    feed_per_tooth_ids_3 = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz',
-                                           domain=[('cutting_speed', '!=', False)])
-    feed_per_tooth_ids_4 = fields.One2many('sf.feed.per.tooth', 'specification_id', '每齿走刀量fz',
-                                           domain=[('machining_method', '!=', False)])
-
-    def choose_basic_param(self):
-        self.product_id.brand_id = self.brand_id.id
-        self.product_id.cutting_tool_type_id = self.cutting_tool_type_id.id
-        record = self.integral_tool_basic_parameters_ids.browse(id)
-
-        # selected_record = self.integral_tool_basic_parameters_ids.browse(self._context.get('active_id'))
-        if self.cutting_tool_type == '整体式刀具':
-            for record in self.integral_tool_basic_parameters_ids:
-                selected_record1 = self.env['sf.tool.materials.basic.parameters'].browse(self._context.get('active_id'))
-                # 获取选中记录的字段值
-                self.product_id.cutting_tool_total_length = selected_record1.total_length
-
-
-            # self.product_id.blade_diameter = self.integral_tool_basic_parameters_ids[0].blade_diameter
-            # self.product_id.blade_length = self.integral_tool_basic_parameters_ids[0].blade_length
-            # self.product_id.blade = self.integral_tool_basic_parameters_ids[0].shank_diameter
-            # self.product_id.shank_length = self.integral_tool_basic_parameters_ids[0].shank_length
-
-
-        # elif self.cutting_tool_type == '刀片':
-        #
-        # elif self.cutting_tool_type == '刀杆':
-        #
-        # elif self.cutting_tool_type == '刀盘':
-        #
-        # elif self.cutting_tool_type == '刀柄':
-
-    @api.depends('cutting_tool_library_id', 'cutting_tool_type')
-    def set_specification(self):
-        self.integral_tool_basic_parameters_ids = False
-        self.blade_basic_parameters_ids = False
-        self.cutter_bar_basic_parameters_ids = False
-        self.cutter_head_basic_parameters_ids = False
-        self.knife_handle_basic_parameters_ids = False
-        self.chuck_basic_parameters_ids = False
-        self.cutting_tool_type_id = False
-        self.brand_id = False
-        if self.cutting_tool_library_id:
-            for item in self:
-                item.cutting_tool_type_id = self.cutting_tool_library_id.cutting_tool_type_id.id
-                item.brand_id = self.cutting_tool_library_id.brand_id.id
-                if item.cutting_tool_type == '整体式刀具':
-                    integral_tool_basic_parameters = []
-                    for line in item.cutting_tool_library_id.integral_tool_basic_parameters_ids:
-                        integral_tool_basic_parameters.append(
-                            self.env['sf.tool.materials.basic.parameters']._json_integral_tool_basic_param(
-                                line))
-                    item.integral_tool_basic_parameters_ids = integral_tool_basic_parameters
-                elif item.cutting_tool_type == '刀片':
-                    blade_basic_parameters = []
-                    for line in item.cutting_tool_library_id.blade_basic_parameters_ids:
-                        blade_basic_parameters.append(
-                            self.env['sf.tool.materials.basic.parameters']._json_blade_basic_param(line))
-                    item.blade_basic_parameters_ids = blade_basic_parameters
-                elif item.cutting_tool_type == '刀杆':
-                    cutter_bar_basic_parameters = []
-                    for line in item.cutting_tool_library_id.cutter_bar_basic_parameters_ids:
-                        cutter_bar_basic_parameters.append(
-                            self.env['sf.tool.materials.basic.parameters']._json_cutter_bar_basic_param(line))
-                    item.cutter_bar_basic_parameters_ids = cutter_bar_basic_parameters
-                elif item.cutting_tool_type == '刀盘':
-                    cutter_head_basic_parameters = []
-                    for line in item.cutting_tool_library_id.cutter_head_basic_parameters_ids:
-                        cutter_head_basic_parameters.append(
-                            self.env['sf.tool.materials.basic.parameters']._json_cutter_head_basic_param(line))
-                    item.cutter_head_basic_parameters_ids = cutter_head_basic_parameters
-                elif item.cutting_tool_type == '刀柄':
-                    knife_handle_basic_parameters = []
-                    for line in item.cutting_tool_library_id.knife_handle_basic_parameters_ids:
-                        knife_handle_basic_parameters.append(
-                            self.env['sf.tool.materials.basic.parameters']._json_knife_handle_basic_param(line))
-                    item.knife_handle_basic_parameters_ids = knife_handle_basic_parameters
-                elif item.cutting_tool_type == '夹头':
-                    chuck_basic_parameters = []
-                    for line in item.cutting_tool_library_id.chuck_basic_parameters_ids:
-                        chuck_basic_parameters.append(
-                            self.env['sf.tool.materials.basic.parameters']._json_chuck_basic_param(line))
-                    item.chuck_basic_parameters_ids = chuck_basic_parameters
-
-
diff --git a/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml b/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml
deleted file mode 100644
index 5433bddb..00000000
--- a/sf_manufacturing/wizard/cutting_tool_specification_wizard.xml
+++ /dev/null
@@ -1,266 +0,0 @@
-<odoo>
-    <data>
-        <record model="ir.ui.view" id="cutting_tool_specification_wizard_form_view">
-            <field name="name">sf.cutting_tool.specification.wizard.form.view</field>
-            <field name="model">sf.cutting_tool.specification.wizard</field>
-            <field name="arch" type="xml">
-                <form string="刀具规格">
-                    <group>
-                        <field name="cutting_tool_material_id" readonly="1"/>
-                        <field name="cutting_tool_type_id" readonly="1" string="刀具类型"/>
-                        <field name="cutting_tool_library_id" readonly="1" string="型号"/>
-                        <field name="brand_id" readonly="1"/>
-                        <field name="cutting_tool_type" invisible="1"/>
-                    </group>
-                    <notebook>
-                        <page string="基本参数">
-                            <field name="integral_tool_basic_parameters_ids"
-                                   attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
-                                <tree sample="1" multi_edit="1">
-                                    <field name="cutting_tool_type" invisible="1"/>
-                                    <field name="specification_id" invisible="1"/>
-                                    <field name="code"/>
-                                    <field name="total_length"/>
-                                    <field name="blade_diameter" class="diameter"/>
-                                    <field name="blade_length"/>
-                                    <field name="blade_number" placeholder="请选择"/>
-                                    <field name="neck_length"/>
-                                    <field name="neck_diameter" class="diameter"/>
-                                    <field name="handle_diameter" class="diameter"/>
-                                    <field name="handle_length"/>
-                                    <field name="blade_tip_working_size" class="du"/>
-                                    <field name="blade_tip_diameter" class="diameter"/>
-                                    <field name="blade_tip_taper" class="du"/>
-                                    <field name="blade_helix_angle" class="du"/>
-                                    <field name="pitch"/>
-                                    <field name="blade_width"/>
-                                    <field name="blade_depth"/>
-                                    <field name="cutting_depth"/>
-                                </tree>
-                            </field>
-
-                            <field name="blade_basic_parameters_ids"
-                                   attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}">
-                                <tree editable="bottom" class="center">
-                                    <field name="cutting_tool_type" invisible="1"/>
-                                    <field name="specification_id" invisible="1"/>
-                                    <field name="code"/>
-                                    <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="chip_breaker_groove" placeholder="请选择"/>
-                                    <field name="blade_teeth_model" placeholder="请选择"/>
-                                    <field name="cutting_depth" string="最大切削深度(mm)"/>
-                                    <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"/>
-                                </tree>
-                            </field>
-                            <field name="cutter_bar_basic_parameters_ids"
-                                   attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}">
-                                <tree editable="bottom" class="center">
-                                    <field name="cutting_tool_type" invisible="1"/>
-                                    <field name="specification_id" invisible="1"/>
-                                    <field name="code"/>
-                                    <field name="height"/>
-                                    <field name="width"/>
-                                    <field name="total_length"/>
-                                    <field name="blade_height"/>
-                                    <field name="blade_width"/>
-                                    <field name="blade_length"/>
-                                    <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="min_machining_aperture" class="diameter"/>
-                                    <field name="install_blade_tip_num"/>
-                                    <field name="cutting_blade_model"/>
-                                    <field name="cooling_hole" placeholder="请选择"/>
-                                    <field name="locating_slot_code"/>
-                                    <field name="installing_structure"/>
-                                    <field name="blade_ids" widget="many2many_tags" placeholder="请选择"/>
-                                    <field name="tool_shim"/>
-                                    <field name="cotter_pin"/>
-                                    <field name="pressing_plate"/>
-                                    <field name="screw"/>
-                                    <field name="spanner"/>
-                                </tree>
-                            </field>
-
-                            <field name="cutter_head_basic_parameters_ids"
-                                   attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}">
-                                <tree editable="bottom" class="center" delete="1">
-                                    <field name="cutting_tool_type" invisible="1"/>
-                                    <field name="specification_id" invisible="1"/>
-                                    <field name="code"/>
-                                    <field name="install_blade_tip_num"/>
-                                    <field name="blade_diameter" class="diameter"/>
-                                    <field name="cutter_head_diameter" class="diameter"/>
-                                    <field name="interface_diameter" class="diameter"/>
-                                    <field name="total_length"/>
-                                    <field name="blade_length"/>
-                                    <field name="cutting_depth" string="最大切削深度(mm)"/>
-                                    <field name="main_included_angle" class="du"/>
-                                    <field name="installing_structure"/>
-                                    <field name="blade_ids" widget="many2many_tags" placeholder="请选择"/>
-                                    <field name="screw"/>
-                                    <field name="spanner"/>
-                                    <field name="cutting_blade_model"/>
-                                    <field name="cooling_hole" placeholder="请选择"/>
-                                    <field name="locating_slot_code"/>
-                                </tree>
-                            </field>
-
-                            <field name="knife_handle_basic_parameters_ids"
-                                   attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}">
-                                <tree editable="bottom" class="center">
-                                    <field name="cutting_tool_type" invisible="1"/>
-                                    <field name="specification_id" invisible="1"/>
-                                    <field name="code"/>
-                                    <field name="total_length"/>
-                                    <field name="flange_shank_length"/>
-                                    <field name="handle_external_diameter" class="diameter"/>
-                                    <field name="handle_inside_diameter" class="diameter"/>
-                                    <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="cooling_model"/>
-                                    <field name="is_rough_machining" placeholder="请选择"/>
-                                    <field name="is_finish_machining" placeholder="请选择"/>
-                                    <field name="is_quick_cutting" placeholder="请选择"/>
-                                    <field name="is_drill_hole" placeholder="请选择"/>
-                                    <field name="is_safe_lock" placeholder="请选择"/>
-                                    <field name="screw"/>
-                                    <field name="spanner"/>
-                                </tree>
-                            </field>
-                            <field name="chuck_basic_parameters_ids"
-                                   attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}">
-                                <tree editable="bottom" class="center">
-                                    <field name="cutting_tool_type" invisible="1"/>
-                                    <field name="specification_id" invisible="1"/>
-                                    <field name="code"/>
-                                    <field name="er_size_model"/>
-                                    <field name="min_clamping_diameter" class="diameter" required="1"/>
-                                    <field name="max_clamping_diameter" class="diameter"/>
-                                    <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>
-                        </page>
-                        <page string="切削速度Vc"
-                              attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}">
-                            <field name="cutting_speed_ids">
-                                <tree editable="bottom" class="center">
-                                    <field name="execution_standard_id" placeholder="请选择" required="1"/>
-                                    <field name="specification_id" invisible="1"/>
-                                    <field name="material_code" readonly="1"/>
-                                    <field name="material_id" placeholder="请选择"
-                                           attrs="{'readonly': [('execution_standard_id', '=', False)], 'required': [('execution_standard_id', '!=', False)]}"/>
-                                    <field name="material_grade" readonly="1"/>
-                                    <field name="tensile_strength" readonly="1"/>
-                                    <field name="hardness" readonly="1"/>
-                                    <field name="slope_milling_angle" widget="du"/>
-                                    <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" placeholder="请选择" required="1"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="每齿走刀量fz"
-                              attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}">
-                            <field name="feed_per_tooth_ids"
-                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具'))]}">
-                                <tree editable="bottom" class="center">
-                                    <field name="specification_id" invisible="1"/>
-                                    <field name="cutting_speed"/>
-                                    <field name="blade_diameter"/>
-                                    <field name="feed_per_tooth" required="1"/>
-                                </tree>
-                            </field>
-                            <field name="feed_per_tooth_ids_2"
-                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具'))]}">
-                                <tree editable="bottom" class="center" create="0" delete="0">
-                                    <field name="specification_id" invisible="1"/>
-                                    <field name="machining_method"/>
-                                    <field name="materials_type_id"/>
-                                    <field name="blade_diameter"/>
-                                    <field name="feed_per_tooth" required="1"/>
-                                </tree>
-                            </field>
-                            <field name="feed_per_tooth_ids_3"
-                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}">
-                                <tree editable="bottom" class="center">
-                                    <field name="specification_id" invisible="1"/>
-                                    <field name="cutting_speed"/>
-                                    <field name="feed_per_tooth" required="1"/>
-                                </tree>
-                            </field>
-                            <field name="feed_per_tooth_ids_4"
-                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}">
-                                <tree editable="bottom" class="center">
-                                    <field name="specification_id" invisible="1"/>
-                                    <field name="machining_method"/>
-                                    <field name="materials_type_id"/>
-                                    <field name="feed_per_tooth" required="1"/>
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                    <footer>
-                        <button string="选择" name="choose_basic_param" type="object" class="oe_highlight"/>
-                        <button string="取消" class="btn btn-secondary" special="cancel"/>
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_cutting_tool_specification_wizard" model="ir.actions.act_window">
-            <field name="name">刀具规格</field>
-            <field name="res_model">sf.cutting_tool.specification.wizard</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="cutting_tool_specification_wizard_form_view"/>
-            <field name="target">new</field>
-            <!--             <field name="context">{-->
-            <!--                'default_cutting_tool_model_id' : cutting_tool_model_id,-->
-            <!--            }</field>-->
-        </record>
-    </data>
-</odoo>
\ No newline at end of file

From 9fffcd4f046f65c667d301bdd8338d7b895c19d0 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 25 Oct 2023 17:37:17 +0800
Subject: [PATCH 12/21] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=E6=94=B9=E5=8F=98=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/tool_other_features.py       |   2 -
 sf_base/static/src/scss/test.scss           |   3 +
 sf_dlm/views/product_template_view.xml      | 293 +++++++++++---------
 sf_manufacturing/models/product_template.py |  50 +++-
 4 files changed, 214 insertions(+), 134 deletions(-)

diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py
index e4376d63..f365b4f3 100644
--- a/sf_base/models/tool_other_features.py
+++ b/sf_base/models/tool_other_features.py
@@ -295,7 +295,6 @@ class CuttingSpeed(models.Model):
     _description = '切削速度Vc'
 
     product_template_id = fields.Many2one('product.template')
-    specification_id = fields.Many2one('sf.cutting_tool.specification.wizard', string='刀具规格')
     standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='标准库')
     execution_standard_id = fields.Many2one('sf.international.standards', string='执行标准', store=True)
     material_code = fields.Char('材料代号')
@@ -342,7 +341,6 @@ class FeedPerTooth(models.Model):
 
     product_template_id = fields.Many2one('product.template')
     standard_library_id = fields.Many2one('sf.cutting_tool.standard.library', string='标准库')
-    specification_id = fields.Many2one('sf.cutting_tool.specification.wizard', string='刀具规格')
     cutting_speed = fields.Char('径向切宽 ae(mm)')
     machining_method = fields.Selection([('直铣', '直铣'), ('坡铣', '坡铣')], string='加工方式')
     materials_type_id = fields.Many2one('sf.materials.model', string='材料型号')
diff --git a/sf_base/static/src/scss/test.scss b/sf_base/static/src/scss/test.scss
index d8761b94..a2992e1a 100644
--- a/sf_base/static/src/scss/test.scss
+++ b/sf_base/static/src/scss/test.scss
@@ -179,4 +179,7 @@ td.o_required_modifier {
 .button_width{
   display: flex;
 }
+.o_field_widget.o_field_many2one {
+  flex-direction: row !important;
+}
 
diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index 267775a2..9c81ee0c 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <data>
-        <record model="ir.ui.view" id="view_product_template_only_form_inherit_sf">
-            <field name="name">product.template.only.form.inherit.sf</field>
-            <field name="model">product.template</field>
-            <field name="inherit_id" ref="product.product_template_only_form_view"/>
-            <field name="arch" type="xml">
-                <field name="barcode" position="replace">
-                    <field name='barcode' invisible="1"/>
-                </field>
-                <field name="default_code" position="replace">
-                    <field name='default_code' invisible="1"/>
-                </field>
-            </field>
-        </record>
+        <!--        <record model="ir.ui.view" id="view_product_template_only_form_inherit_sf">-->
+        <!--            <field name="name">product.template.only.form.inherit.sf</field>-->
+        <!--            <field name="model">product.template</field>-->
+        <!--            <field name="inherit_id" ref="product.product_template_only_form_view"/>-->
+        <!--            <field name="arch" type="xml">-->
+        <!--                <field name="barcode" position="replace">-->
+        <!--                    <field name='barcode' invisible="1"/>-->
+        <!--                </field>-->
+        <!--                <field name="default_code" position="replace">-->
+        <!--                    <field name='default_code' invisible="1"/>-->
+        <!--                </field>-->
+        <!--            </field>-->
+        <!--        </record>-->
 
         <record model="ir.ui.view" id="view_product_template_form_inherit_sf">
             <field name="name">product.template.form.inherit.sf</field>
@@ -59,10 +59,10 @@
                            domain="[('standard_library_id','=',cutting_tool_model_id)]"/>
                     <field name="fixture_material_id" attrs="{'invisible': [('categ_type', '!=', '夹具')]}"
                            placeholder="请选择"/>
-                    <field name="fixture_model_id" string="型号" placeholder="请选择"
-                           context="{'default_fixture_material_id': fixture_material_id,'default_multi_mounting_type_id': fixture_multi_mounting_type_id}"
-                           attrs="{'invisible': [('categ_type', '!=', '夹具')]}"
-                           domain="[('fixture_material_id','=',fixture_material_id)]"/>
+                    <!--                    <field name="fixture_model_id" string="型号" placeholder="请选择"-->
+                    <!--                           context="{'default_fixture_material_id': fixture_material_id,'default_multi_mounting_type_id': fixture_multi_mounting_type_id}"-->
+                    <!--                           attrs="{'invisible': [('categ_type', '!=', '夹具')]}"-->
+                    <!--                           domain="[('fixture_material_id','=',fixture_material_id)]"/>-->
                 </field>
 
                 <xpath expr="//label[@for='volume']" position="before">
@@ -104,47 +104,83 @@
                         </group>
                     </page>
                 </xpath>
-                <xpath expr="//page[@name='general_information']" position="after">
+                <!--                <xpath expr="//page[@name='general_information']" position="after">-->
+                <!--                    <page string="刀具物料参数" attrs="{'invisible': [('categ_type', '!=', '刀具')]}">-->
+                <!--                    </page>-->
+                <!--                </xpath>-->
+            </field>
+        </record>
+
+
+        <record model="ir.ui.view" id="view_product_template_only_form_inherit_sf">
+            <field name="name">product.template.only.form.inherit.sf</field>
+            <field name="model">product.template</field>
+            <field name="inherit_id" ref="product.product_template_only_form_view"/>
+            <field name="arch" type="xml">
+                <field name="barcode" position="replace">
+                    <field name='barcode' invisible="1"/>
+                </field>
+                <field name="default_code" position="replace">
+                    <field name='default_code' invisible="1"/>
+                </field>
+                <xpath expr="//page[@name='variants']" position="before">
                     <page string="刀具物料参数" attrs="{'invisible': [('categ_type', '!=', '刀具')]}">
                         <group>
                             <group attrs="{'invisible': [('categ_type', '!=', '刀具')]}" col="1">
                                 <field name="cutting_tool_type_id" options="{'no_create': True}" placeholder="请选择"/>
                                 <field name="brand_id" options="{'no_create': True}" placeholder="请选择"/>
-                                <field name="materials_type_id" options="{'no_create': True}"
-                                       attrs="{'invisible': [('cutting_tool_type', 'in', ('整体式刀具','夹头','刀柄'))]}"
-                                       placeholder="请选择"/>
+                                <field name="tool_hardness" string="硬度(hrc)"/>
+                                <label for="cutting_tool_run_out_accuracy_min" string="端跳精度"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <div class="o_address_format"
+                                     attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
+                                    <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','!=','整体式刀具')]}"/>
+                                    <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','!=','整体式刀具')]}"/>
+                                    <span>(mm)&amp;nbsp;</span>
+                                </div>
                                 <field name="cutting_tool_total_length"
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀柄','夹头'))]}"/>
 
                                 <field name="cutting_tool_flange_length"
                                        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', '!=', '夹头')]}"/>
-                                <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', '!=', '夹头')]}"/>-->
+                                <!--                                <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="cutting_tool_blade_length"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
                                 <field name="cutting_tool_blade_diameter" string="刃部直径(mm)" class="diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="cutting_tool_blade_type"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="cutting_tool_blade_helix_angle"
+                                <field name="cutting_tool_blade_length"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
                                 <field name="cutting_tool_blade_number" placeholder="请选择"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_shank_length"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_neck_length" string="颈部长度(mm)"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_neck_diameter" string="颈部直径(mm)" class="diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_shank_diameter" string="柄部直径(mm)" class="diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
 
 
                                 <!--刀片-->
@@ -210,37 +246,31 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
                             </group>
                             <group attrs="{'invisible': [('categ_type', '!=', '刀具')]}">
+                                <field name="materials_type_id" options="{'no_create': True}" placeholder="请选择"
+                                       string="材质"/>
+                                <field name="coating_material"/>
+                                <field name="cutting_tool_blade_type"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_coarse_medium_fine" string="粗/中/精" placeholder="请选择"
+                                       attrs="{'required': [('cutting_tool_type','=','整体式刀具')],'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
                                 <!--整体式刀具-->
-                                <field name="cutting_tool_shank_length"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="cutting_tool_shank_diameter" string="柄部直径(mm)" class="diameter"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="cutting_tool_neck_length" string="颈部长度(mm)"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="cutting_tool_neck_diameter" string="颈部直径(mm)" class="diameter"
+                                <field name="cutting_tool_blade_tip_working_size" string="刀尖直径(mm)" class="diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
                                 <field name="cutting_tool_blade_tip_diameter" string="刀尖直径(mm)" class="diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
                                 <field name="cutting_tool_blade_tip_taper" string="刀尖锥度(°)"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-
-                                <label for="cutting_tool_run_out_accuracy_min" string="端跳精度"
+                                <field name="cutting_tool_blade_helix_angle"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <div class="o_address_format"
-                                     attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
-                                    <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','!=','整体式刀具')]}"/>
-                                    <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','!=','整体式刀具')]}"/>
-                                    <span>(mm)&amp;nbsp;</span>
-                                </div>
-                                <field name="cutting_tool_coarse_medium_fine" string="粗/中/精" placeholder="请选择"
-                                       attrs="{'required': [('cutting_tool_type','=','整体式刀具')],'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_pitch"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_blade_width"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_blade_depth"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_cut_depth"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+
 
                                 <field name="tool_weight"
                                        attrs='{"invisible": [("cutting_tool_type","not in",("夹头","刀柄"))]}'/>
@@ -274,8 +304,8 @@
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
                                 <field name="cutting_tool_main_included_angle"
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
-                                <field name="coating_material"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片','刀柄'))]}"/>
+                                <!--                                <field name="coating_material"-->
+                                <!--                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片','刀柄'))]}"/>-->
                                 <field name="cutting_tool_accuracy_level"
                                        attrs="{'invisible': [('cutting_tool_type', 'in', ('刀柄', '整体式刀具','夹头'))]}"/>
                                 <field name="cutting_tool_working_hardness"
@@ -332,71 +362,76 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
                                 <field name="apply_lock_wrench_model"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
-
-
                             </group>
                         </group>
-                        <group col="1" attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
-                            <group string="适合加工方式">
-                                <field name="suitable_machining_method_ids" string=""
-                                       widget="custom_many2many_checkboxes"/>
-                            </group>
-                            <group>
-                                <group string="刀尖特征">
-                                    <field name="blade_tip_characteristics_ids" string=""
-                                           widget="custom_many2many_checkboxes"/>
-                                </group>
-                                <group string="柄部类型">
-                                    <field name="handle_type_ids" string="" widget="custom_many2many_checkboxes"/>
-                                </group>
-                            </group>
-                            <group>
-                                <group string="走刀方向">
-                                    <field name="cutting_direction_ids" string="" widget="custom_many2many_checkboxes"/>
-                                </group>
-                                <group string="适合冷却液">
-                                    <field name="suitable_coolant_ids" string="" widget="custom_many2many_checkboxes"/>
-                                </group>
-                            </group>
-                            <notebook>
-                                <page string="切削速度Vc">
-                                    <field name="cutting_speed_ids" string="" widget="one2many">
-                                        <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>
-                                </page>
-                                <page string="每齿走刀量fz">
-                                    <field name="feed_per_tooth_ids" string="" widget="one2many">
-                                        <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="blade_diameter"/>
-                                            <field name="feed_per_tooth"/>
-                                        </tree>
-                                    </field>
-                                </page>
-                            </notebook>
-
+                        <group string="适配刀片形状"
+                               attrs="{'invisible': [('cutting_tool_type', 'in', ('刀柄','夹头','整体式刀具',False))]}">
+                            <field name="fit_blade_shape_ids" string="" widget="custom_many2many_checkboxes"/>
                         </group>
+                        <group string="适合加工方式"
+                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
+                            <field name="suitable_machining_method_ids" string=""
+                                   widget="custom_many2many_checkboxes"/>
+                        </group>
+                        <group string="刀尖特征"
+                               attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
+                            <field name="blade_tip_characteristics_ids" string=""
+                                   widget="custom_many2many_checkboxes"/>
+                        </group>
+                        <group attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
+                            <group string="柄部类型" attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
+                                <field name="handle_type_ids" string="" widget="custom_many2many_checkboxes"/>
+                            </group>
+                            <group string="压紧方式"
+                                   attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}">
+                                <field name="compaction_way_ids" string="" widget="custom_many2many_checkboxes"/>
+                            </group>
+                        </group>
+                        <group attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
+                            <group string="走刀方向">
+                                <field name="cutting_direction_ids" string="" widget="custom_many2many_checkboxes"/>
+                            </group>
+                            <group string="适合冷却液">
+                                <field name="suitable_coolant_ids" string="" widget="custom_many2many_checkboxes"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="切削速度Vc">
+                                <field name="cutting_speed_ids" string="" widget="one2many">
+                                    <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>
+                            </page>
+                            <page string="每齿走刀量fz">
+                                <field name="feed_per_tooth_ids" string="" widget="one2many">
+                                    <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="blade_diameter"/>
+                                        <field name="feed_per_tooth"/>
+                                    </tree>
+                                </field>
+                            </page>
+                        </notebook>
                     </page>
                     <page string="夹具物料参数" attrs="{'invisible': [('categ_type', '!=', '夹具')]}">
                         <group attrs='{"invisible": [("fixture_material_type","not in",("气动夹具","转接板(锁板)夹具","磁吸夹具","虎钳夹具","零点卡盘","零点托盘"))]}'>
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 857e1cfd..e6fd1c39 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -68,7 +68,6 @@ class ResProductMo(models.Model):
     cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', string='类型',
                                            domain="[('cutting_tool_material_id.name', '=', cutting_tool_type)]")
 
-
     brand_id = fields.Many2one('sf.machine.brand', '品牌')
 
     tool_length = fields.Float('长度(mm)')
@@ -93,9 +92,16 @@ class ResProductMo(models.Model):
     cutting_tool_blade_tip_taper = fields.Integer('刀尖锥度(°)')
     cutting_tool_blade_helix_angle = fields.Integer('刃部螺旋角(°)')
     cutting_tool_blade_type = fields.Char('刃部类型')
+    cutting_tool_pitch = fields.Char('牙距(mm)', size=20)
+    cutting_tool_blade_width = fields.Char('刃部宽度(mm)', size=20)
+    cutting_tool_blade_depth = fields.Char('刃部深度(mm)', size=20)
+    cutting_tool_cut_depth = fields.Char('切削深度(mm)', size=20)
     cutting_tool_coarse_medium_fine = fields.Selection([('粗', '粗'), ('中', '中'), ('精', '精')], '粗/中/精')
     cutting_tool_run_out_accuracy_max = fields.Float('端跳精度max', digits=(6, 1))
     cutting_tool_run_out_accuracy_min = fields.Float('端跳精度min', digits=(6, 1))
+    cutting_tool_blade_tip_working_size = fields.Char('刀尖处理尺寸(R半径mm/倒角)', size=20)
+    fit_blade_shape_ids = fields.Many2many('maintenance.equipment.image', 'rel_fit_blade_shape_product_template',
+                                           '适配刀片形状', domain=[('type', '=', '刀片形状')])
     suitable_machining_method_ids = fields.Many2many('maintenance.equipment.image',
                                                      'rel_machining_product_template', '适合加工方式',
                                                      domain=[('type', '=', '加工能力')])
@@ -108,6 +114,46 @@ class ResProductMo(models.Model):
                                              '走刀方向', domain=[('type', '=', '走刀方向')])
     suitable_coolant_ids = fields.Many2many('maintenance.equipment.image', 'rel_coolant_product_template',
                                             '适合冷却液', domain=[('type', '=', '冷却液')])
+    compaction_way_ids = fields.Many2many('maintenance.equipment.image', 'rel_compaction_product_template',
+                                          '压紧方式', domain=[('type', '=', '压紧方式')])
+
+    @api.onchange('specification_id')
+    def _onchange_specification(self):
+        if self.specification_id:
+            self.cutting_tool_type_id = self.cutting_tool_model_id.cutting_tool_type_id.id
+            self.brand_id = self.cutting_tool_model_id.brand_id.id
+            self.tool_hardness = self.cutting_tool_model_id.tool_hardness
+            self.cutting_tool_run_out_accuracy_max = self.cutting_tool_model_id.integral_run_out_accuracy_max
+            self.cutting_tool_run_out_accuracy_min = self.cutting_tool_model_id.integral_run_out_accuracy_min
+            self.materials_type_id = self.cutting_tool_model_id.material_model_id.id
+            self.cutting_tool_blade_type = self.cutting_tool_model_id.blade_type
+            self.cutting_tool_coarse_medium_fine = self.cutting_tool_model_id.integral_coarse_medium_fine
+            self.coating_material = self.cutting_tool_model_id.coating_material
+            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)]
+            self.blade_tip_characteristics_ids = [(6, 0,
+                                                   [])] if not self.cutting_tool_model_id.blade_tip_characteristics_ids else [
+                (6, 0, self.cutting_tool_model_id.blade_tip_characteristics_ids.ids)]
+
+            self.handle_type_ids = [(6, 0,
+                                     [])] if not self.cutting_tool_model_id.handle_type_ids else [
+                (6, 0, self.cutting_tool_model_id.handle_type_ids.ids)]
+
+            self.cutting_direction_ids = [(6, 0,
+                                           [])] if not self.cutting_tool_model_id.cutting_direction_ids else [
+                (6, 0, self.cutting_tool_model_id.cutting_direction_ids.ids)]
+
+            self.suitable_coolant_ids = [(6, 0,
+                                          [])] if not self.cutting_tool_model_id.suitable_coolant_ids else [
+                (6, 0, self.cutting_tool_model_id.suitable_coolant_ids.ids)]
+            self.compaction_way_ids = [(6, 0,
+                                        [])] if not self.cutting_tool_model_id.compaction_way_ids else [
+                (6, 0, self.cutting_tool_model_id.compaction_way_ids.ids)]
+            self.cutting_speed_ids = self.cutting_tool_model_id.cutting_speed_ids
+            self.feed_per_tooth_ids = [(0, 0, {'product_template_id': product_template.id}) for product_template in
+                                       self.cutting_tool_model_id.feed_per_tooth_ids.filtered(
+                                           lambda r: r.blade_diameter == self.specification_id.blade_diameter)]
 
     # @api.constrains('suitable_machining_method_ids')
     # def _check_suitable_machining_method_ids(self):
@@ -427,8 +473,6 @@ class ResProductMo(models.Model):
     # def _onchange_cutting_tool_material_id(self):
     #     if self.cutting_tool_material_id:
 
-
-
     @api.onchange('fixture_material_id')
     def _onchange_fixture_material_id(self):
         for item in self:

From 4a01132b91606737b438990f05b052437fa77d1e Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Thu, 26 Oct 2023 10:10:47 +0800
Subject: [PATCH 13/21] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E5=8F=82=E6=95=B0=E9=87=8C=E7=9A=84=E8=B5=B0?=
 =?UTF-8?q?=E5=88=80=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/product_template.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index e6fd1c39..297de837 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -151,7 +151,12 @@ class ResProductMo(models.Model):
                                         [])] if not self.cutting_tool_model_id.compaction_way_ids else [
                 (6, 0, self.cutting_tool_model_id.compaction_way_ids.ids)]
             self.cutting_speed_ids = self.cutting_tool_model_id.cutting_speed_ids
-            self.feed_per_tooth_ids = [(0, 0, {'product_template_id': product_template.id}) for product_template in
+            self.feed_per_tooth_ids = [(0, 0, {'product_template_id': product_template.id,
+                                               'cutting_speed': product_template.cutting_speed,
+                                               'machining_method': product_template.machining_method,
+                                               'blade_diameter': product_template.blade_diameter,
+                                               'materials_type_id': product_template.materials_type_id.id}) for
+                                       product_template in
                                        self.cutting_tool_model_id.feed_per_tooth_ids.filtered(
                                            lambda r: r.blade_diameter == self.specification_id.blade_diameter)]
 

From 46807003e12fa8abfe3d4b71d271546cf34e40f2 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Fri, 27 Oct 2023 17:44:12 +0800
Subject: [PATCH 14/21] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E7=89=A9=E6=96=99=E4=B8=BA=E5=88=80=E7=89=87?=
 =?UTF-8?q?=EF=BC=8C=E5=88=80=E7=9B=98=EF=BC=8C=E5=88=80=E6=9D=86=EF=BC=8C?=
 =?UTF-8?q?=E5=A4=B9=E5=A4=B4=EF=BC=8C=E5=88=80=E6=9F=84=EF=BC=8C=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=8F=8A?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E9=A1=B5=E9=9D=A2=E7=9A=84=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/src/scss/custom_style.scss         |   2 +-
 sf_dlm/views/product_template_view.xml        | 213 +++++++++++-------
 sf_manufacturing/models/product_template.py   | 186 ++++++++++-----
 3 files changed, 267 insertions(+), 134 deletions(-)

diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss
index 3626cd08..d3534180 100644
--- a/jikimo_frontend/static/src/scss/custom_style.scss
+++ b/jikimo_frontend/static/src/scss/custom_style.scss
@@ -261,7 +261,7 @@ div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > .
 
 .test_model > .o_form_label  {
   margin-left: 4px !important;
-  line-height: 0 !important;
+  //line-height: 0 !important;
 }
 
 @media screen and (min-width: 1200px) {
diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index 9c81ee0c..a19a0e59 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -145,11 +145,17 @@
                                            attrs="{'invisible': [('cutting_tool_type','!=','整体式刀具')]}"/>
                                     <span>(mm)&amp;nbsp;</span>
                                 </div>
-                                <field name="cutting_tool_total_length"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀柄','夹头'))]}"/>
 
+                                <field name="tool_width"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
+                                <field name="tool_height"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
                                 <field name="cutting_tool_flange_length"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                 <field name="cutting_tool_shank_outer_diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                <field name="cutting_tool_shank_inner_diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
 
                                 <!--                                <field name="materials_type_id" options="{'no_create': True}" string="刀具材质"-->
                                 <!--                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"-->
@@ -181,33 +187,93 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
                                 <field name="cutting_tool_shank_diameter" string="柄部直径(mm)" class="diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-
-
                                 <!--刀片-->
+                                <field name="cutting_tool_cutter_bar_ids" widget="many2many_tags"
+                                       options="{'no_create': True}"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_cutter_pad_ids" widget="many2many_tags"
+                                       options="{'no_create': True}"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
                                 <label for="tool_length" string="尺寸(mm)"
-                                       attrs='{"invisible": [("cutting_tool_type","not in",("刀片","刀杆","刀盘"))]}'/>
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
                                 <div class="test_model"
-                                     attrs='{"invisible": [("cutting_tool_type","not in",("刀片","刀杆","刀盘"))]}'>
+                                     attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}">
                                     <label for="tool_length" string="长"/>
                                     <field name="tool_length" class="o_address_zip"
                                            options="{'format': false}"/>
-                                    <label for="tool_width" string="宽"/>
-                                    <field name="tool_width" class="o_address_zip"
-                                           options="{'format': false}"/>
                                     <label for="tool_thickness" string="厚"/>
                                     <field name="tool_thickness" class="o_address_zip"
                                            options="{'format': false}"/>
+                                    <label for="tool_width" string="宽"/>
+                                    <field name="tool_width" class="o_address_zip"
+                                           options="{'format': false}"/>
                                 </div>
-                                <field name="cutting_tool_diameter" class="diameter"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片','刀杆','刀盘'))]}"/>
-                                <field name="cutting_tool_blade_diameter" class="diameter" string="刃径"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
-                                <field name="cutting_tool_blade_number"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片','刀杆','刀盘'))]}"/>
-                                <!--夹头-->
+                                <field name="cutting_tool_cut_blade_length"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_blade_tip_circular_arc_radius"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <!--                                <field name="cutting_tool_top_angle"-->
+                                <!--                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>-->
+                                <field name="cutting_tool_inscribed_circle_diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_install_aperture_diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_chip_breaker_groove"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
 
+                                <field name="cutting_tool_bladed_teeth_model"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_cut_depth_max"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_blade_blade_number"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_blade_width"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <!--刀杆-->
+                                <field name="cutting_tool_total_length"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘','夹头','刀柄'))]}"/>
+                                <label for="cutting_tool_knife_head_length" string="刀头尺寸(mm)"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
+                                <div class="test_model"
+                                     attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}">
+                                    <label for="cutting_tool_knife_head_length" string="长"/>
+                                    <field name="cutting_tool_knife_head_length" class="o_address_zip"
+                                           options="{'format': false}"/>
+                                    <label for="cutting_tool_knife_head_width" string="宽"/>
+                                    <field name="cutting_tool_knife_head_width" class="o_address_zip"
+                                           options="{'format': false}"/>
+                                    <label for="cutting_tool_knife_head_height" string="高"/>
+                                    <field name="cutting_tool_knife_head_height" class="o_address_zip"
+                                           options="{'format': false}"/>
+                                </div>
+                                <field name="cutting_tool_blade_diameter" string="刃部直径(mm)" class="diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+
+                                <field name="cutting_tool_blade_length"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}"/>
+
+                                <field name="cutting_tool_cutter_arbor_diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
+                                <field name="cutting_tool_cut_blade_length" string="切削刃长度(mm)"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+                                <field name="cutting_tool_cut_depth_max"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+                                <field name="cutting_tool_min_machining_aperture"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
+                                <field name="cutting_tool_install_blade_tip_num"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
+                                <field name="cutting_tool_main_included_angle"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+                                <field name="cutting_tool_rear_angle"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
+                                <!--刀盘-->
+                                <field name="cutting_tool_cutter_head_diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}"/>
+                                <field name="cutting_tool_interface_diameter"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}"/>
                                 <field name="cutting_tool_clamping_way"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                <!--夹头-->
                                 <field name="cutting_tool_clamping_length"
                                        attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
                                 <field name="cutting_tool_clamping_tolerance"
@@ -227,12 +293,15 @@
                                            attrs="{'required': [('cutting_tool_type','not in',('夹头','刀柄'))]}"/>
                                     <span>(mm)&amp;nbsp;</span>
                                 </div>
-                                <field name="cutting_tool_head_diameter" class="diameter"
+                                <field name="cutting_tool_clamping_way"
+                                       attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
+                                <field name="cutting_tool_top_diameter" class="diameter"
                                        attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
                                 <field name="cutting_tool_outer_diameter" class="diameter"
                                        attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
                                 <field name="cutting_tool_inner_diameter" class="diameter"
                                        attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
+   <!--夹头-->
 
                                 <field name="cutting_tool_standard_speed"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
@@ -242,8 +311,6 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
                                 <field name="cutting_tool_cooling_type"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
-                                <field name="cutting_tool_dynamic_balance_class"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
                             </group>
                             <group attrs="{'invisible': [('categ_type', '!=', '刀具')]}">
                                 <field name="materials_type_id" options="{'no_create': True}" placeholder="请选择"
@@ -252,7 +319,7 @@
                                 <field name="cutting_tool_blade_type"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
                                 <field name="cutting_tool_coarse_medium_fine" string="粗/中/精" placeholder="请选择"
-                                       attrs="{'required': [('cutting_tool_type','=','整体式刀具')],'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                       attrs="{'required': [('cutting_tool_type','=','整体式刀具')],'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
                                 <!--整体式刀具-->
                                 <field name="cutting_tool_blade_tip_working_size" string="刀尖直径(mm)" class="diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
@@ -277,43 +344,33 @@
                                 <field name="cutting_tool_taper"
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头','刀柄'))]}"/>
 
-                                <label for="cutting_tool_detection_accuracy_min" string="检测精度"
-                                       attrs='{"invisible": [("cutting_tool_type","not in",("刀柄"))]}'/>
-                                <div class="o_address_format"
-                                     attrs='{"invisible": [("cutting_tool_type","not in",("刀柄"))]}'>
-                                    <label for="cutting_tool_detection_accuracy_min" string="最小"/>
-                                    <field name="cutting_tool_detection_accuracy_min" class="o_address_zip"
-                                           options="{'format': false}"
-                                           attrs="{'required': [('cutting_tool_type','=','刀柄')]}"/>
-                                    <span>(mm)&amp;nbsp;</span>
-                                    <label for="cutting_tool_detection_accuracy_max" string="最大"/>
-                                    <field name="cutting_tool_detection_accuracy_max" class="o_address_zip"
-                                           options="{'format': false}"
-                                           attrs="{'required': [('cutting_tool_type','=','刀柄')]}"/>
-                                    <span>(mm)&amp;nbsp;</span>
-                                </div>
-                                <field name="cutting_tool_body_accuracy"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
                                 <field name="cutting_tool_jump_accuracy"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
-                                <field name="cutting_tool_front_angle"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
-                                <field name="cutting_tool_top_angle"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
                                 <field name="cutting_tool_rear_angle"
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
                                 <field name="cutting_tool_main_included_angle"
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
-                                <!--                                <field name="coating_material"-->
-                                <!--                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片','刀柄'))]}"/>-->
-                                <field name="cutting_tool_accuracy_level"
-                                       attrs="{'invisible': [('cutting_tool_type', 'in', ('刀柄', '整体式刀具','夹头'))]}"/>
-                                <field name="cutting_tool_working_hardness"
-                                       attrs="{'invisible': [('cutting_tool_type', 'in', ('整体式刀具','夹头','刀柄'))]}"/>
-
-                                <!--                                <field name="tool_height" attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>-->
-
-
+                                <!--                                <field name="cutting_tool_front_angle"-->
+                                <!--                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>-->
+                                <field name="cutting_tool_top_angle"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
+                                <field name="cutting_tool_blade_tip_dip_angle"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_side_cutting_edge_angle"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_thread_model"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_pitch"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_thread_num"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_blade_tip_height_tolerance"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_inscribed_circle_tolerance"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_thickness_tolerance"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <!--刀柄-->
                                 <field name="cutting_tool_is_rough_finish"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
                                 <field name="cutting_tool_is_finish"
@@ -328,40 +385,44 @@
 
                                 <field name="cutting_tool_jump_accuracy" string="跳动精度(mm)"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
-                                <field name="coating_material"
+                                <field name="cutting_tool_max_load_capacity"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
                                 <field name="cutting_tool_er_size_model"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
-                                <!--                                <field name="cutting_tool_handle_ids" widget="many2many_tags"-->
-                                <!--                                       options="{'no_create': True}"-->
-                                <!--                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>-->
+                                <field name="cutting_tool_handle_ids" widget="many2many_tags"
+                                       options="{'no_create': True}"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
                                 <field name="cooling_suit_type_ids"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
-
-                                <field name="cutting_tool_wrench"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘' ))]}"/>
-                                <!--                                <field name="cutting_tool_screw"-->
-                                <!--                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀柄'))]}"/>-->
-                                <field name="cutting_tool_nut"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
-
-                                <!--                                <field name="cutting_tool_cutter_bar_ids" widget="many2many_tags"-->
-                                <!--                                       options="{'no_create': True}"-->
-                                <!--                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>-->
-                                <!--                                <field name="cutting_tool_cutter_pad_ids" widget="many2many_tags"-->
-                                <!--                                       options="{'no_create': True}"-->
-                                <!--                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>-->
-                                <!--                                <field name="cutting_tool_blade_ids" widget="many2many_tags"-->
-                                <!--                                       options="{'no_create': True}"-->
-                                <!--                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>-->
-
-                                <!--                                <field name="cutting_tool_chuck_ids" widget="many2many_tags"-->
-                                <!--                                       options="{'no_create': True}"-->
-                                <!--                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘','刀柄'))]}"/>-->
                                 <field name="apply_lock_nut_model"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
                                 <field name="apply_lock_wrench_model"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+                                <!-- 刀杆 -->
+                                <field name="cutting_tool_installing_structure"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+                                <field name="cutting_tool_cooling_hole"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+                                <field name="cutting_tool_locating_slot_code"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+                                <field name="cutting_tool_blade_ids" widget="many2many_tags"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+                                <field name="cutting_tool_tool_shim"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
+                                <field name="cutting_tool_cotter_pin"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
+                                <field name="cutting_tool_pressing_plate"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
+                                <field name="cutting_tool_screw"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+                                <field name="cutting_tool_wrench"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+                                <!-- 刀盘 -->
+                                <field name="cutting_tool_blade_ids" widget="many2many_tags"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}"/>
+                                <field name="cutting_tool_blade_ids" widget="many2many_tags"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}"/>
+
                             </group>
                         </group>
                         <group string="适配刀片形状"
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 297de837..9118c0aa 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -96,6 +96,7 @@ class ResProductMo(models.Model):
     cutting_tool_blade_width = fields.Char('刃部宽度(mm)', size=20)
     cutting_tool_blade_depth = fields.Char('刃部深度(mm)', size=20)
     cutting_tool_cut_depth = fields.Char('切削深度(mm)', size=20)
+    cutting_tool_cut_depth_max = fields.Char('最大切削深度(mm)', size=20)
     cutting_tool_coarse_medium_fine = fields.Selection([('粗', '粗'), ('中', '中'), ('精', '精')], '粗/中/精')
     cutting_tool_run_out_accuracy_max = fields.Float('端跳精度max', digits=(6, 1))
     cutting_tool_run_out_accuracy_min = fields.Float('端跳精度min', digits=(6, 1))
@@ -115,7 +116,50 @@ class ResProductMo(models.Model):
     suitable_coolant_ids = fields.Many2many('maintenance.equipment.image', 'rel_coolant_product_template',
                                             '适合冷却液', domain=[('type', '=', '冷却液')])
     compaction_way_ids = fields.Many2many('maintenance.equipment.image', 'rel_compaction_product_template',
-                                          '压紧方式', domain=[('type', '=', '压紧方式')])
+                                          '压紧方式', domain=[('type', '=', '压紧方式')])\
+
+
+    @api.onchange('cutting_tool_material_id')
+    def _onchange_cutting_tool_material_id(self):
+        for item in self:
+            if item.cutting_tool_material_id.id != item.cutting_tool_model_id.cutting_tool_material_id.id:
+                item.cutting_tool_model_id = False
+                item.specification_id = False
+                item.cutting_tool_type_id = False
+                item.brand_id = False
+                item.tool_hardness = False
+                item.cutting_tool_run_out_accuracy_max = False
+                item.cutting_tool_run_out_accuracy_min = False
+                item.materials_type_id = False
+                item.cutting_tool_blade_type = False
+                item.cutting_tool_total_length = False
+                item.cutting_tool_shank_length = False
+                item.cutting_tool_blade_length = False
+                item.cutting_tool_blade_number = False
+                item.cutting_tool_neck_length = False
+                item.cutting_tool_neck_diameter = False
+                item.cutting_tool_shank_diameter = False
+                item.cutting_tool_blade_tip_diameter = False
+                item.cutting_tool_blade_tip_taper = False
+                item.cutting_tool_blade_helix_angle = False
+                item.cutting_tool_blade_type = False
+                item.cutting_tool_pitch = False
+                item.cutting_tool_blade_width = False
+                item.cutting_tool_blade_depth = False
+                item.cutting_tool_cut_depth = False
+                item.cutting_tool_coarse_medium_fine = False
+                item.cutting_tool_run_out_accuracy_max = False
+                item.cutting_tool_run_out_accuracy_min = False
+                item.cutting_tool_blade_tip_working_size = False
+                item.fit_blade_shape_ids = False
+                item.suitable_machining_method_ids = False
+                item.blade_tip_characteristics_ids = False
+                item.handle_type_ids = False
+                item.cutting_direction_ids = False
+                item.suitable_coolant_ids = False
+                item.compaction_way_ids = False
+                item.cutting_speed_ids = False
+                item.feed_per_tooth_ids = False
 
     @api.onchange('specification_id')
     def _onchange_specification(self):
@@ -123,9 +167,13 @@ class ResProductMo(models.Model):
             self.cutting_tool_type_id = self.cutting_tool_model_id.cutting_tool_type_id.id
             self.brand_id = self.cutting_tool_model_id.brand_id.id
             self.tool_hardness = self.cutting_tool_model_id.tool_hardness
-            self.cutting_tool_run_out_accuracy_max = self.cutting_tool_model_id.integral_run_out_accuracy_max
-            self.cutting_tool_run_out_accuracy_min = self.cutting_tool_model_id.integral_run_out_accuracy_min
             self.materials_type_id = self.cutting_tool_model_id.material_model_id.id
+            if self.cutting_tool_type == '整体式刀具':
+                self.cutting_tool_run_out_accuracy_max = self.cutting_tool_model_id.integral_run_out_accuracy_max
+                self.cutting_tool_run_out_accuracy_min = self.cutting_tool_model_id.integral_run_out_accuracy_min
+            elif self.cutting_tool_type == '刀片':
+                self.cutting_tool_cutter_bar_ids = self.cutting_tool_model_id.cutting_tool_cutter_bar_ids.ids,
+                self.cutting_tool_cutter_pad_ids = self.cutting_tool_model_id.cutting_tool_cutter_pad_ids.ids,
             self.cutting_tool_blade_type = self.cutting_tool_model_id.blade_type
             self.cutting_tool_coarse_medium_fine = self.cutting_tool_model_id.integral_coarse_medium_fine
             self.coating_material = self.cutting_tool_model_id.coating_material
@@ -150,15 +198,18 @@ class ResProductMo(models.Model):
             self.compaction_way_ids = [(6, 0,
                                         [])] if not self.cutting_tool_model_id.compaction_way_ids else [
                 (6, 0, self.cutting_tool_model_id.compaction_way_ids.ids)]
-            self.cutting_speed_ids = self.cutting_tool_model_id.cutting_speed_ids
-            self.feed_per_tooth_ids = [(0, 0, {'product_template_id': product_template.id,
-                                               'cutting_speed': product_template.cutting_speed,
-                                               'machining_method': product_template.machining_method,
-                                               'blade_diameter': product_template.blade_diameter,
-                                               'materials_type_id': product_template.materials_type_id.id}) for
-                                       product_template in
-                                       self.cutting_tool_model_id.feed_per_tooth_ids.filtered(
-                                           lambda r: r.blade_diameter == self.specification_id.blade_diameter)]
+            if self.cutting_tool_type == '整体式刀具':
+                self.cutting_speed_ids = self.cutting_tool_model_id.cutting_speed_ids
+                self.feed_per_tooth_ids = [(0, 0, {'product_template_id': product_template.id,
+                                                   'cutting_speed': product_template.cutting_speed,
+                                                   'machining_method': product_template.machining_method,
+                                                   'blade_diameter': product_template.blade_diameter,
+                                                   'materials_type_id': product_template.materials_type_id.id}) for
+                                           product_template in
+                                           self.cutting_tool_model_id.feed_per_tooth_ids.filtered(
+                                               lambda r: r.blade_diameter == self.specification_id.blade_diameter)]
+
+
 
     # @api.constrains('suitable_machining_method_ids')
     # def _check_suitable_machining_method_ids(self):
@@ -248,52 +299,91 @@ class ResProductMo(models.Model):
     cutting_tool_rear_angle = fields.Integer('后角(°)')
     cutting_tool_main_included_angle = fields.Integer('主偏角(°)')
     # cutting_tool_material_model_id = fields.Many2one('sf.materials.model', '材料型号')
-    cutting_tool_nut = fields.Float('配对螺母(mm)')
     # 适用夹头型号可以多选
     cutting_tool_chuck_ids = fields.Many2many(
-        'sf.cutting.tool.model',
-        relation='product_cutting_tool_model_handle_chuck_rel',
+        '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='适用夹头型号')
     # 刀片参数
+    cutting_tool_cut_blade_length = fields.Char('切削刃长(mm)', size=20)
+    cutting_tool_blade_tip_circular_arc_radius = fields.Char('刀尖圆弧半径(mm)', size=20)
     cutting_tool_top_angle = fields.Integer('顶角(°)')
+    cutting_tool_inscribed_circle_diameter = fields.Char('内接圆直径(mm)', size=20)
+    cutting_tool_install_aperture_diameter = fields.Char('安装孔直径(mm)', size=20)
+    cutting_tool_chip_breaker_groove = fields.Selection([('无', '无'), ('单面', '单面'), ('双面', '双面')],
+                                           string='有无断屑槽')
+    cutting_tool_bladed_teeth_model = fields.Selection(
+        [('无', '无'), ('V牙型', 'V牙型'), ('米制全牙型', '米制全牙型'), ('美制全牙型', '美制全牙型'),
+         ('惠氏全牙型', '惠氏全牙型'), ('BSPT全牙型', 'BSPT全牙型'), ('NPT全牙型', 'NPT全牙型'),
+         ('UNJ全牙型', 'UNJ全牙型'), ('DIN405圆牙型', 'DIN405圆牙型'), ('ACME梯形', 'ACME梯形'),
+         ('石油管螺纹刀片', '石油管螺纹刀片'), ('矮牙ACME梯形', '矮牙ACME梯形'),
+         ('Trapeze30° 103', 'Trapeze30° 103')], string='刀片牙型')
+    cutting_tool_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='刀片的刃数(个)')
+
+    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.Char('每英寸螺纹数(tpi)', size=20)
+    cutting_tool_blade_tip_height_tolerance = fields.Char('刀尖高度公差(mm)', size=20)
+    cutting_tool_inscribed_circle_tolerance = fields.Char('内接圆公差(mm)', size=20)
+    cutting_tool_thickness_tolerance = fields.Char('厚度公差(mm)', size=20)
+
     cutting_tool_jump_accuracy = fields.Float('径跳精度(mm)')
     cutting_tool_working_hardness = fields.Char('加工硬度(hrc)')
     cutting_tool_cutter_bar_ids = fields.Many2many(
-        'sf.cutting.tool.model',
-        relation='product_cutting_tool_model_blade_cutter_bar_rel',
+        'sf.cutting_tool.standard.library',
+        relation='product_cutting_tool_library_cutter_bar_rel',
         column1='model_id_1',
         column2='model_id_2',
         domain="[('cutting_tool_type', '=', '刀杆')]",
         string='适用刀杆型号'
     )
     cutting_tool_cutter_pad_ids = fields.Many2many(
-        'sf.cutting.tool.model',
-        relation='product_cutting_tool_model_blade_cutter_pad_rel',
+        'sf.cutting_tool.standard.library',
+        relation='product_cutting_tool_library_cutter_pad_rel',
         column1='model_id_1',
         column2='model_id_2',
         domain="[('cutting_tool_type', '=', '刀盘')]",
         string='适用刀盘型号'  # 使用空列表作为默认值
     )
     # 刀杆/参数
+    cutting_tool_knife_head_height = fields.Float('刀头高度(mm)')
+    cutting_tool_knife_head_width = fields.Float('刀头宽度(mm)')
+    cutting_tool_knife_head_length = fields.Float('刀头长度(mm)')
     cutting_tool_blade_diameter = fields.Float('刃径/刃部直径(mm)')
+    cutting_tool_cutter_arbor_diameter = fields.Char('刀杆直径(mm)', size=20)
+    cutting_tool_min_machining_aperture = fields.Char('最小加工孔径(mm)', size=20)
+    cutting_tool_install_blade_tip_num = fields.Char('可装刀片数/齿数(个)', size=20)
+    cutting_tool_installing_structure = fields.Char('安装结构', size=20)
     cutting_tool_blade_ids = fields.Many2many(
-        'sf.cutting.tool.model',
-        relation='product_cutting_tool_model_pad_blade_rel',
+        '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='适用刀片型号'  # 使用空列表作为默认值
     )
-    cutting_tool_wrench = fields.Float('配对扳手(mm)')
-    # cutting_tool_screw = fields.Float('配备螺丝(mm)')
-    cutting_tool_accuracy_level = fields.Char('精度等级')
+    cutting_tool_tool_shim = fields.Char('适配刀垫型号', size=50)
+    cutting_tool_cotter_pin = fields.Char('适配销钉型号', size=50)
+    cutting_tool_pressing_plate = fields.Char('适配压板型号', size=50)
+    cutting_tool_screw = fields.Char('适配螺钉型号', size=50)
+    cutting_tool_wrench = fields.Char('适配扳手型号')
+    cutting_tool_cooling_hole = fields.Selection([('有', '有'), ('无', '无')], string='有无冷却孔')
+    cutting_tool_locating_slot_code = fields.Char('定位槽代号', size=20)
+
+    # 刀盘参数
+    cutting_tool_cutter_head_diameter = fields.Char('刀盘直径(mm)', size=20)
+    cutting_tool_interface_diameter = fields.Char('接口直径(mm)', size=20)
+
     # 刀柄参数
-    cutting_tool_head_diameter = fields.Float('头部直径')
-    cutting_tool_diameter_max = fields.Float('最大直径(mm)')
-    cutting_tool_clamping_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('最大夹持直径')
@@ -305,47 +395,32 @@ class ResProductMo(models.Model):
     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_dynamic_balance_class = fields.Char('动平衡等级')
     cutting_tool_change_time = fields.Integer('换刀时间(s)')
     cutting_tool_clamping_way = 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_body_accuracy = fields.Float('本体精度(mm)')
     apply_lock_nut_model = fields.Char('适用锁紧螺母型号')
     apply_lock_wrench_model = fields.Char('适用锁紧扳手型号')
-    cutting_tool_detection_accuracy_max = fields.Float('最大检测精度(mm)')
-    cutting_tool_detection_accuracy_min = fields.Float('最小检测精度(mm)')
+
     # 夹头参数
     cutting_tool_taper = fields.Integer('锥度(°)')
+    cutting_tool_top_diameter = fields.Float('顶部直径')
     cutting_tool_outer_diameter = fields.Float('外径(mm)')
     cutting_tool_inner_diameter = fields.Float('内径(mm)')
     cooling_suit_type_ids = fields.Char('适用冷却套型号')
-    # cooling_suit_type_ids = fields.Many2many('冷却类型')
+    cutting_tool_max_load_capacity = fields.Float('最大负载能力(kg)')
     cutting_tool_er_size_model = fields.Char('ER尺寸型号')
-    # cutting_tool_handle_ids = fields.Many2many(
-    #     'sf.cutting.tool.model',
-    #     relation='product_cutting_tool_model_chuck_handle_rel',
-    #     column1='model_id_1',
-    #     column2='model_id_2',
-    #     domain="[('cutting_tool_type', '=', '刀柄')]",
-    #     string='适用刀柄型号'
-    # )
+    cutting_tool_handle_ids = fields.Many2many(
+        'sf.cutting_tool.standard.library',
+        relation='product_cutting_tool_library_chuck_handle_rel',
+        column1='model_id_1',
+        column2='model_id_2',
+        domain="[('cutting_tool_type', '=', '刀柄')]",
+        string='适用刀柄型号'
+    )
+
 
-    # @api.onchange('cutting_tool_model_id')
-    # def onchange_method(self):
-    #     if self.cutting_tool_model_id:
-    #         return {
-    #             'name': 'Import your first bill',
-    #             'view_mode': 'form',
-    #             'target': 'new',
-    #             'view_type': 'form',
-    #             'res_model': 'sf.cutting_tool.standard.library',
-    #             'context': {'default_res_id': self.cutting_tool_model_id.id},
-    #             'views': [[False, 'form']],
-    #             'res_id': self.cutting_tool_model_id.id,
-    #             'type': 'ir.actions.act_window',
-    #         }
     # 夹具参数
     fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料")
     fixture_model_id = fields.Many2one('sf.fixture.model', string="夹具型号")
@@ -474,9 +549,6 @@ class ResProductMo(models.Model):
             self.detailed_type = 'product'
             self.sale_ok = False
 
-    # @api.onchange('cutting_tool_material_id')
-    # def _onchange_cutting_tool_material_id(self):
-    #     if self.cutting_tool_material_id:
 
     @api.onchange('fixture_material_id')
     def _onchange_fixture_material_id(self):

From 2a9c5276abd7d13ffdc431169d525e3c6303aec3 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 30 Oct 2023 17:32:16 +0800
Subject: [PATCH 15/21] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/tool_other_features.py       |   3 +-
 sf_dlm/views/product_template_view.xml      |  98 +++---
 sf_manufacturing/models/product_template.py | 325 ++++++++++----------
 3 files changed, 204 insertions(+), 222 deletions(-)

diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py
index f365b4f3..4e02a92c 100644
--- a/sf_base/models/tool_other_features.py
+++ b/sf_base/models/tool_other_features.py
@@ -55,13 +55,14 @@ class ToolMaterialsBasicParameters(models.Model):
     blade_tip_dip_angle = fields.Integer('刀尖倾角(°)')
     side_cutting_edge_angle = fields.Integer('侧切削角(°)')
     thread_model = fields.Selection([('外螺纹', '外螺纹'), ('内螺纹', '内螺纹')], string='螺纹类型')
-    thread_num = fields.Char('每英寸螺纹数(TPI)', size=20)
+    thread_num = fields.Char('每英寸螺纹数(tpi)', size=20)
     blade_tip_height_tolerance = fields.Char('刀尖高度公差(mm)', size=20)
     inscribed_circle_tolerance = fields.Char('内接圆公差(mm)', size=20)
     thickness_tolerance = fields.Char('厚度公差(mm)', size=20)
     # 刀杆参数
     height = fields.Char('高度(mm)', size=20)
     blade_height = fields.Char('刃部高度(mm)', size=20)
+    cut_depth_max = fields.Char('最大切削深度(mm)', size=20)
     cutter_arbor_diameter = fields.Char('刀杆直径(mm)', size=20)
     min_machining_aperture = fields.Char('最小加工孔径(mm)', size=20)
     install_blade_tip_num = fields.Char('可装刀片数/齿数(个)', size=20)
diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index a19a0e59..eda7f88b 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -129,6 +129,8 @@
                             <group attrs="{'invisible': [('categ_type', '!=', '刀具')]}" col="1">
                                 <field name="cutting_tool_type_id" options="{'no_create': True}" placeholder="请选择"/>
                                 <field name="brand_id" options="{'no_create': True}" placeholder="请选择"/>
+                                <field name="cutting_tool_total_length"
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','夹头','刀柄'))]}"/>
                                 <field name="tool_hardness" string="硬度(hrc)"/>
                                 <label for="cutting_tool_run_out_accuracy_min" string="端跳精度"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
@@ -152,7 +154,7 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
                                 <field name="cutting_tool_flange_length"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
-                                 <field name="cutting_tool_shank_outer_diameter"
+                                <field name="cutting_tool_shank_outer_diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
                                 <field name="cutting_tool_shank_inner_diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
@@ -177,23 +179,21 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
                                 <field name="cutting_tool_blade_length"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_blade_width"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_blade_depth"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_blade_helix_angle"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
                                 <field name="cutting_tool_blade_number" placeholder="请选择"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="cutting_tool_shank_length"
+                                <field name="cutting_tool_blade_tip_working_size"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="cutting_tool_neck_length" string="颈部长度(mm)"
+                                <field name="cutting_tool_blade_tip_diameter" string="刀尖直径(mm)" class="diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="cutting_tool_neck_diameter" string="颈部直径(mm)" class="diameter"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="cutting_tool_shank_diameter" string="柄部直径(mm)" class="diameter"
+                                <field name="cutting_tool_blade_tip_taper" string="刀尖锥度(°)"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
                                 <!--刀片-->
-                                <field name="cutting_tool_cutter_bar_ids" widget="many2many_tags"
-                                       options="{'no_create': True}"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
-                                <field name="cutting_tool_cutter_pad_ids" widget="many2many_tags"
-                                       options="{'no_create': True}"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
                                 <label for="tool_length" string="尺寸(mm)"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
                                 <div class="test_model"
@@ -212,26 +212,24 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
                                 <field name="cutting_tool_blade_tip_circular_arc_radius"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
-                                <!--                                <field name="cutting_tool_top_angle"-->
-                                <!--                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>-->
+                                <field name="cutting_tool_blade_tip_height_tolerance"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
                                 <field name="cutting_tool_inscribed_circle_diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_inscribed_circle_tolerance"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
                                 <field name="cutting_tool_install_aperture_diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
                                 <field name="cutting_tool_chip_breaker_groove"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
-
-                                <field name="cutting_tool_bladed_teeth_model"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
                                 <field name="cutting_tool_cut_depth_max"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
-                                <field name="cutting_tool_blade_blade_number"
+                                <field name="cutting_tool_blade_blade_number" string="刃数"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
-                                <field name="cutting_tool_blade_width"
+                                <field name="cutting_tool_blade_width" string="刃宽"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
                                 <!--刀杆-->
-                                <field name="cutting_tool_total_length"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘','夹头','刀柄'))]}"/>
+
                                 <label for="cutting_tool_knife_head_length" string="刀头尺寸(mm)"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
                                 <div class="test_model"
@@ -262,17 +260,12 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
                                 <field name="cutting_tool_install_blade_tip_num"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
-                                <field name="cutting_tool_main_included_angle"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
-                                <field name="cutting_tool_rear_angle"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
                                 <!--刀盘-->
                                 <field name="cutting_tool_cutter_head_diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}"/>
                                 <field name="cutting_tool_interface_diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}"/>
-                                <field name="cutting_tool_clamping_way"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
+
                                 <!--夹头-->
                                 <field name="cutting_tool_clamping_length"
                                        attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
@@ -294,14 +287,14 @@
                                     <span>(mm)&amp;nbsp;</span>
                                 </div>
                                 <field name="cutting_tool_clamping_way"
-                                       attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
+                                       attrs="{'required': [('cutting_tool_type','not in',('夹头','刀柄'))]}"/>
                                 <field name="cutting_tool_top_diameter" class="diameter"
                                        attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
                                 <field name="cutting_tool_outer_diameter" class="diameter"
                                        attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
                                 <field name="cutting_tool_inner_diameter" class="diameter"
                                        attrs='{"invisible": [("cutting_tool_type","!=","夹头")]}'/>
-   <!--夹头-->
+                                <!--夹头-->
 
                                 <field name="cutting_tool_standard_speed"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
@@ -321,35 +314,28 @@
                                 <field name="cutting_tool_coarse_medium_fine" string="粗/中/精" placeholder="请选择"
                                        attrs="{'required': [('cutting_tool_type','=','整体式刀具')],'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}"/>
                                 <!--整体式刀具-->
-                                <field name="cutting_tool_blade_tip_working_size" string="刀尖直径(mm)" class="diameter"
+                                <field name="cutting_tool_shank_diameter" string="柄部直径(mm)" class="diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="cutting_tool_blade_tip_diameter" string="刀尖直径(mm)" class="diameter"
+                                <field name="cutting_tool_shank_length"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="cutting_tool_blade_tip_taper" string="刀尖锥度(°)"
+                                <field name="cutting_tool_neck_diameter" string="颈部直径(mm)" class="diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="cutting_tool_blade_helix_angle"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="cutting_tool_pitch"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="cutting_tool_blade_width"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-                                <field name="cutting_tool_blade_depth"
+                                <field name="cutting_tool_neck_length" string="颈部长度(mm)"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
                                 <field name="cutting_tool_cut_depth"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
-
-
+                                <field name="cutting_tool_pitch"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}"/>
                                 <field name="tool_weight"
                                        attrs='{"invisible": [("cutting_tool_type","not in",("夹头","刀柄"))]}'/>
                                 <field name="cutting_tool_taper"
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('夹头','刀柄'))]}"/>
-
                                 <field name="cutting_tool_jump_accuracy"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
                                 <field name="cutting_tool_rear_angle"
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
                                 <field name="cutting_tool_main_included_angle"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片','刀杆'))]}"/>
                                 <!--                                <field name="cutting_tool_front_angle"-->
                                 <!--                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀片'))]}"/>-->
                                 <field name="cutting_tool_top_angle"
@@ -358,17 +344,21 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
                                 <field name="cutting_tool_side_cutting_edge_angle"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
-                                <field name="cutting_tool_thread_model"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
                                 <field name="cutting_tool_pitch"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_bladed_teeth_model"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_thickness_tolerance"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_thread_model"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
                                 <field name="cutting_tool_thread_num"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
-                                <field name="cutting_tool_blade_tip_height_tolerance"
+                                <field name="cutting_tool_cutter_bar_ids" widget="many2many_tags"
+                                       options="{'no_create': True}"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
-                                <field name="cutting_tool_inscribed_circle_tolerance"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
-                                <field name="cutting_tool_thickness_tolerance"
+                                <field name="cutting_tool_cutter_pad_ids" widget="many2many_tags"
+                                       options="{'no_create': True}"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀片')]}"/>
                                 <!--刀柄-->
                                 <field name="cutting_tool_is_rough_finish"
@@ -394,11 +384,9 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
                                 <field name="cooling_suit_type_ids"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '夹头')]}"/>
-                                <field name="apply_lock_nut_model"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
-                                <field name="apply_lock_wrench_model"
-                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀柄')]}"/>
                                 <!-- 刀杆 -->
+                                <field name="cutting_tool_rear_angle"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
                                 <field name="cutting_tool_installing_structure"
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
                                 <field name="cutting_tool_cooling_hole"
@@ -414,9 +402,9 @@
                                 <field name="cutting_tool_pressing_plate"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
                                 <field name="cutting_tool_screw"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀柄'))]}"/>
                                 <field name="cutting_tool_wrench"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
+                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀柄'))]}"/>
                                 <!-- 刀盘 -->
                                 <field name="cutting_tool_blade_ids" widget="many2many_tags"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀盘')]}"/>
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 9118c0aa..50c17ab6 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -119,47 +119,49 @@ class ResProductMo(models.Model):
                                           '压紧方式', domain=[('type', '=', '压紧方式')])\
 
 
-    @api.onchange('cutting_tool_material_id')
-    def _onchange_cutting_tool_material_id(self):
-        for item in self:
-            if item.cutting_tool_material_id.id != item.cutting_tool_model_id.cutting_tool_material_id.id:
-                item.cutting_tool_model_id = False
-                item.specification_id = False
-                item.cutting_tool_type_id = False
-                item.brand_id = False
-                item.tool_hardness = False
-                item.cutting_tool_run_out_accuracy_max = False
-                item.cutting_tool_run_out_accuracy_min = False
-                item.materials_type_id = False
-                item.cutting_tool_blade_type = False
-                item.cutting_tool_total_length = False
-                item.cutting_tool_shank_length = False
-                item.cutting_tool_blade_length = False
-                item.cutting_tool_blade_number = False
-                item.cutting_tool_neck_length = False
-                item.cutting_tool_neck_diameter = False
-                item.cutting_tool_shank_diameter = False
-                item.cutting_tool_blade_tip_diameter = False
-                item.cutting_tool_blade_tip_taper = False
-                item.cutting_tool_blade_helix_angle = False
-                item.cutting_tool_blade_type = False
-                item.cutting_tool_pitch = False
-                item.cutting_tool_blade_width = False
-                item.cutting_tool_blade_depth = False
-                item.cutting_tool_cut_depth = False
-                item.cutting_tool_coarse_medium_fine = False
-                item.cutting_tool_run_out_accuracy_max = False
-                item.cutting_tool_run_out_accuracy_min = False
-                item.cutting_tool_blade_tip_working_size = False
-                item.fit_blade_shape_ids = False
-                item.suitable_machining_method_ids = False
-                item.blade_tip_characteristics_ids = False
-                item.handle_type_ids = False
-                item.cutting_direction_ids = False
-                item.suitable_coolant_ids = False
-                item.compaction_way_ids = False
-                item.cutting_speed_ids = False
-                item.feed_per_tooth_ids = False
+    # @api.onchange('cutting_tool_material_id')
+    # def _onchange_cutting_tool_material_id(self):
+    #     for item in self:
+    #         if item.cutting_tool_material_id.id != item.cutting_tool_model_id.cutting_tool_material_id.id:
+    #             item.cutting_tool_model_id = False
+    #             item.specification_id = False
+    #             item.cutting_tool_type_id = False
+    #             item.brand_id = False
+    #             item.tool_hardness = False
+    #             item.cutting_tool_run_out_accuracy_max = False
+    #             item.cutting_tool_run_out_accuracy_min = False
+    #             item.materials_type_id = False
+    #             item.cutting_tool_blade_type = False
+    #             item.cutting_tool_total_length = False
+    #             item.cutting_tool_shank_length = False
+    #             item.cutting_tool_blade_length = False
+    #             item.cutting_tool_blade_number = False
+    #             item.cutting_tool_neck_length = False
+    #             item.cutting_tool_neck_diameter = False
+    #             item.cutting_tool_shank_diameter = False
+    #             item.cutting_tool_blade_tip_diameter = False
+    #             item.cutting_tool_blade_tip_taper = False
+    #             item.cutting_tool_blade_helix_angle = False
+    #             item.cutting_tool_blade_type = False
+    #             item.cutting_tool_pitch = False
+    #             item.cutting_tool_blade_width = False
+    #             item.cutting_tool_blade_depth = False
+    #             item.cutting_tool_cut_depth = False
+    #             item.cutting_tool_coarse_medium_fine = False
+    #             item.cutting_tool_run_out_accuracy_max = False
+    #             item.cutting_tool_run_out_accuracy_min = False
+    #             item.cutting_tool_blade_tip_working_size = False
+    #             item.fit_blade_shape_ids = False
+    #             item.suitable_machining_method_ids = False
+    #             item.blade_tip_characteristics_ids = False
+    #             item.handle_type_ids = False
+    #             item.cutting_direction_ids = False
+    #             item.suitable_coolant_ids = False
+    #             item.compaction_way_ids = False
+    #             item.cutting_speed_ids = False
+    #             item.feed_per_tooth_ids = False
+
+
 
     @api.onchange('specification_id')
     def _onchange_specification(self):
@@ -167,16 +169,113 @@ class ResProductMo(models.Model):
             self.cutting_tool_type_id = self.cutting_tool_model_id.cutting_tool_type_id.id
             self.brand_id = self.cutting_tool_model_id.brand_id.id
             self.tool_hardness = self.cutting_tool_model_id.tool_hardness
-            self.materials_type_id = self.cutting_tool_model_id.material_model_id.id
-            if self.cutting_tool_type == '整体式刀具':
-                self.cutting_tool_run_out_accuracy_max = self.cutting_tool_model_id.integral_run_out_accuracy_max
-                self.cutting_tool_run_out_accuracy_min = self.cutting_tool_model_id.integral_run_out_accuracy_min
-            elif self.cutting_tool_type == '刀片':
-                self.cutting_tool_cutter_bar_ids = self.cutting_tool_model_id.cutting_tool_cutter_bar_ids.ids,
-                self.cutting_tool_cutter_pad_ids = self.cutting_tool_model_id.cutting_tool_cutter_pad_ids.ids,
             self.cutting_tool_blade_type = self.cutting_tool_model_id.blade_type
             self.cutting_tool_coarse_medium_fine = self.cutting_tool_model_id.integral_coarse_medium_fine
+            self.materials_type_id = self.cutting_tool_model_id.material_model_id.id
             self.coating_material = self.cutting_tool_model_id.coating_material
+            if self.cutting_tool_type == '整体式刀具':
+                self.cutting_tool_total_length = self.specification_id.total_length
+                self.cutting_tool_run_out_accuracy_max = self.cutting_tool_model_id.integral_run_out_accuracy_max
+                self.cutting_tool_run_out_accuracy_min = self.cutting_tool_model_id.integral_run_out_accuracy_min
+                self.cutting_tool_blade_diameter = self.specification_id.blade_diameter
+                self.cutting_tool_blade_length = self.specification_id.blade_length
+                self.cutting_tool_blade_number = self.specification_id.blade_number
+                self.cutting_tool_blade_type = self.cutting_tool_model_id.blade_type
+                self.cutting_tool_shank_diameter = self.specification_id.handle_diameter
+                self.cutting_tool_blade_tip_diameter = self.specification_id.blade_tip_diameter
+                self.cutting_tool_blade_tip_taper = self.specification_id.blade_tip_taper
+                self.cutting_tool_blade_helix_angle = self.specification_id.blade_helix_angle
+                self.cutting_tool_pitch = self.specification_id.pitch
+                self.cutting_tool_blade_width = self.specification_id.blade_width
+                self.cutting_tool_blade_depth = self.specification_id.blade_depth
+                self.cutting_tool_cut_depth = self.specification_id.cutting_depth
+            elif self.cutting_tool_type == '刀杆1':
+                self.cutting_tool_total_length = self.specification_id.total_length
+                self.tool_height = self.specification_id.height
+                self.tool_width = self.specification_id.width
+                self.cutting_tool_knife_head_length = self.specification_id.cutting_blade_length
+                self.cutting_tool_knife_head_width = self.specification_id.blade_tip_circular_arc_radius
+                self.cutting_tool_knife_head_height = self.cutting_tool_model_id.blade_tip_height_tolerance
+                self.cutting_tool_blade_diameter = self.specification_id.inscribed_circle_diameter
+                self.cutting_tool_cutter_arbor_diameter = self.specification_id.cutter_arbor_diameter
+                self.cutting_tool_cut_blade_length = self.specification_id.install_aperture_diameter
+                self.cutting_tool_cut_depth_max = self.specification_id.cut_depth_max
+                self.cutting_tool_min_machining_aperture = self.specification_id.min_machining_aperture
+                self.cutting_tool_install_blade_tip_num = self.specification_id.install_blade_tip_num
+                self.cutting_tool_main_included_angle = self.specification_id.main_included_angle
+                self.cutting_tool_rear_angle = self.specification_id.main_included_angle
+                self.cutting_tool_installing_structure = self.specification_id.installing_structure
+                self.cutting_tool_cooling_hole = self.specification_id.cooling_hole
+                self.cutting_tool_locating_slot_code = self.specification_id.locating_slot_code
+                self.cutting_tool_blade_ids = self.cutting_tool_model_id.blade_ids
+                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
+                self.cutting_tool_screw = self.specification_id.screw
+                self.cutting_tool_wrench = self.specification_id.wrench
+            elif self.cutting_tool_type == '刀片':
+                self.cutting_tool_total_length = self.specification_id.total_length
+                self.tool_length = self.specification_id.length
+                self.tool_thickness = self.specification_id.thickness
+                self.tool_width = self.specification_id.width
+                self.cutting_tool_cut_blade_length = self.specification_id.cutting_blade_length
+                self.cutting_tool_blade_tip_circular_arc_radius = self.specification_id.blade_tip_circular_arc_radius
+                self.cutting_tool_blade_tip_height_tolerance = self.cutting_tool_model_id.blade_tip_height_tolerance
+                self.cutting_tool_inscribed_circle_diameter = self.specification_id.inscribed_circle_diameter
+                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_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.cutting_tool_model_id.pitch
+                self.cutting_tool_bladed_teeth_model = self.specification_id.blade_teeth_model
+                self.cutting_tool_thickness_tolerance = self.specification_id.thickness_tolerance
+                self.cutting_tool_thread_model = self.specification_id.thread_model
+                self.cutting_tool_thread_num = self.specification_id.thread_num
+                self.cutting_tool_cutter_bar_ids = self.cutting_tool_model_id.cutting_tool_cutter_bar_ids.ids
+                self.cutting_tool_cutter_pad_ids = self.cutting_tool_model_id.cutting_tool_cutter_pad_ids.ids
+            elif self.cutting_tool_type in ('刀盘','刀杆'):
+                self.cutting_tool_total_length = self.specification_id.total_length
+                self.tool_length = self.specification_id.length
+                self.tool_thickness = self.specification_id.thickness
+                self.tool_width = self.specification_id.width
+                self.cutting_tool_cut_blade_length = self.specification_id.cutting_blade_length
+                self.cutting_tool_blade_tip_circular_arc_radius = self.specification_id.blade_tip_circular_arc_radius
+                self.cutting_tool_blade_tip_height_tolerance = self.cutting_tool_model_id.blade_tip_height_tolerance
+                self.cutting_tool_inscribed_circle_diameter = self.specification_id.inscribed_circle_diameter
+                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_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
+                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
+                    self.cutting_tool_interface_diameter = self.specification_id.interface_diameter
+            elif self.cutting_tool_type == '刀柄':
+                self.cutting_tool_total_length = self.specification_id.total_length
+                self.cutting_tool_standard_speed = self.specification_id.standard_speed
+                self.cutting_tool_speed_max = self.specification_id.speed_max
+                self.cutting_tool_change_time = self.specification_id.change_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.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)]
@@ -334,7 +433,7 @@ class ResProductMo(models.Model):
     cutting_tool_inscribed_circle_tolerance = fields.Char('内接圆公差(mm)', size=20)
     cutting_tool_thickness_tolerance = fields.Char('厚度公差(mm)', size=20)
 
-    cutting_tool_jump_accuracy = fields.Float('径跳精度(mm)')
+    cutting_tool_jump_accuracy = fields.Char('径跳精度(mm)')
     cutting_tool_working_hardness = fields.Char('加工硬度(hrc)')
     cutting_tool_cutter_bar_ids = fields.Many2many(
         'sf.cutting_tool.standard.library',
@@ -400,16 +499,13 @@ class ResProductMo(models.Model):
     cutting_tool_standard_speed = fields.Integer('标准转速(n/min)')
     cutting_tool_speed_max = fields.Integer('最大转速(n/min)')
     cutting_tool_cooling_type = fields.Char('冷却类型')
-    apply_lock_nut_model = fields.Char('适用锁紧螺母型号')
-    apply_lock_wrench_model = fields.Char('适用锁紧扳手型号')
-
     # 夹头参数
     cutting_tool_taper = fields.Integer('锥度(°)')
     cutting_tool_top_diameter = fields.Float('顶部直径')
     cutting_tool_outer_diameter = fields.Float('外径(mm)')
     cutting_tool_inner_diameter = fields.Float('内径(mm)')
     cooling_suit_type_ids = fields.Char('适用冷却套型号')
-    cutting_tool_max_load_capacity = fields.Float('最大负载能力(kg)')
+    cutting_tool_max_load_capacity = fields.Char('最大负载能力(kg)')
     cutting_tool_er_size_model = fields.Char('ER尺寸型号')
     cutting_tool_handle_ids = fields.Many2many(
         'sf.cutting_tool.standard.library',
@@ -586,119 +682,16 @@ class ResProductMo(models.Model):
                     item.fixture_apply_machine_tool_type_ids = self._get_ids(
                         item.fixture_model_id.apply_machine_tool_type_ids)
 
-    # @api.onchange('cutting_tool_model_id')
-    # def _onchange_cutting_tool_model_id(self):
-    #     for item in self:
-    #         if self.cutting_tool_type is not False:
-    #             item.brand_id = item.cutting_tool_model_id.brand_id.id
-    #             item.cutting_tool_type_id = item.cutting_tool_model_id.cutting_tool_type_id.id
-    #             item.tool_length = item.cutting_tool_model_id.tool_length
-    #             item.tool_width = item.cutting_tool_model_id.tool_width
-    #             item.tool_height = item.cutting_tool_model_id.tool_height
-    #             item.tool_thickness = item.cutting_tool_model_id.tool_thickness
-    #             item.tool_weight = item.cutting_tool_model_id.tool_weight
-    #             item.coating_material = item.cutting_tool_model_id.coating_material
-    #             item.cutting_tool_total_length = item.cutting_tool_model_id.total_length
-    #             item.cutting_tool_shank_length = item.cutting_tool_model_id.shank_length
-    #             item.cutting_tool_neck_length = item.cutting_tool_model_id.cutting_tool_neck_length
-    #             item.cutting_tool_shank_diameter = item.cutting_tool_model_id.cutting_tool_shank_diameter
-    #             item.cutting_tool_blade_diameter = item.cutting_tool_model_id.cutting_tool_blade_diameter
-    #             item.cutting_tool_neck_diameter = item.cutting_tool_model_id.cutting_tool_neck_diameter
-    #             item.cutting_tool_blade_tip_diameter = item.cutting_tool_model_id.cutting_tool_blade_tip_diameter
-    #             item.cutting_tool_blade_tip_taper = item.cutting_tool_model_id.cutting_tool_blade_tip_taper
-    #             item.cutting_tool_blade_helix_angle = item.cutting_tool_model_id.cutting_tool_blade_helix_angle
-    #             item.cutting_tool_blade_type = item.cutting_tool_model_id.cutting_tool_blade_type
-    #             item.cutting_tool_coarse_medium_fine = item.cutting_tool_model_id.cutting_tool_coarse_medium_fine
-    #             item.tool_hardness = item.cutting_tool_model_id.tool_hardness
-    #             item.cutting_tool_run_out_accuracy_max = item.cutting_tool_model_id.cutting_tool_run_out_accuracy_max
-    #             item.cutting_tool_run_out_accuracy_min = item.cutting_tool_model_id.cutting_tool_run_out_accuracy_min
-    #             item.suitable_machining_method_ids = self._get_ids(
-    #                 item.cutting_tool_model_id.suitable_machining_method_ids)
-    #             item.blade_tip_characteristics_ids = self._get_ids(
-    #                 item.cutting_tool_model_id.blade_tip_characteristics_ids)
-    #             item.handle_type_ids = self._get_ids(item.cutting_tool_model_id.handle_type_ids)
-    #             item.cutting_direction_ids = self._get_ids(item.cutting_tool_model_id.cutting_direction_ids)
-    #             item.suitable_coolant_ids = self._get_ids(item.cutting_tool_model_id.suitable_coolant_ids)
-    #             item.cutting_tool_diameter = item.cutting_tool_model_id.diameter
-    #             item.cutting_tool_blade_number = item.cutting_tool_model_id.blade_number
-    #             item.cutting_tool_front_angle = item.cutting_tool_model_id.front_angle
-    #             item.cutting_tool_rear_angle = item.cutting_tool_model_id.rear_angle
-    #             item.cutting_tool_main_included_angle = item.cutting_tool_model_id.main_included_angle
-    #             item.materials_type_id = item.cutting_tool_model_id.material_model_id.id
-    #             item.cutting_tool_nut = item.cutting_tool_model_id.nut
-    #             item.cutting_tool_top_angle = item.cutting_tool_model_id.top_angle
-    #             item.cutting_tool_jump_accuracy = item.cutting_tool_model_id.jump_accuracy
-    #             item.cutting_tool_working_hardness = item.cutting_tool_model_id.working_hardness
-    #             item.cutting_tool_blade_diameter = item.cutting_tool_model_id.blade_diameter
-    #             item.cutting_tool_wrench = item.cutting_tool_model_id.wrench
-    #             # item.cutting_tool_screw = item.cutting_tool_model_id.screw
-    #             item.cutting_tool_accuracy_level = item.cutting_tool_model_id.accuracy_level
-    #             item.cutting_tool_diameter_max = item.cutting_tool_model_id.diameter_max
-    #             item.cutting_tool_clamping_diameter = item.cutting_tool_model_id.clamping_diameter
-    #             item.cutting_tool_flange_length = item.cutting_tool_model_id.flange_length
-    #             item.cutting_tool_flange_diameter = item.cutting_tool_model_id.flange_diameter
-    #             item.cutting_tool_outer_diameter = item.cutting_tool_model_id.outer_diameter
-    #             item.cutting_tool_inner_diameter = item.cutting_tool_model_id.inner_diameter
-    #             item.cutting_tool_chuck_ids = self._get_ids(item.cutting_tool_model_id.chuck_ids)
-    #             item.cutting_tool_cutter_bar_ids = self._get_ids(item.cutting_tool_model_id.cutter_bar_ids)
-    #             item.cutting_tool_cutter_pad_ids = self._get_ids(item.cutting_tool_model_id.cutter_pad_ids)
-    #             item.cutting_tool_blade_ids = self._get_ids(item.cutting_tool_model_id.blade_ids)
-    #             item.cutting_tool_handle_ids = self._get_ids(item.cutting_tool_model_id.handle_ids)
-    #         else:
-    #             item.brand_id = False
-    #             item.cutting_tool_type_id = False
-    #             item.brand_id = False
-    #             item.tool_length = False
-    #             item.tool_width = False
-    #             item.tool_height = False
-    #             item.tool_thickness = False
-    #             item.tool_weight = False
-    #             item.coating_material = False
-    #             item.cutting_tool_total_length = False
-    #             item.cutting_tool_shank_length = False
-    #             item.cutting_tool_blade_length = False
-    #             item.cutting_tool_neck_length = False
-    #             item.cutting_tool_shank_diameter = False
-    #             item.cutting_tool_blade_diameter = False
-    #             item.cutting_tool_neck_diameter = False
-    #             item.cutting_tool_blade_tip_diameter = False
-    #             item.cutting_tool_blade_tip_taper = False
-    #             item.cutting_tool_blade_helix_angle = False
-    #             item.cutting_tool_blade_type = False
-    #             item.cutting_tool_coarse_medium_fine = False
-    #             item.tool_hardness = False
-    #             item.cutting_tool_run_out_accuracy_max = False
-    #             item.cutting_tool_run_out_accuracy_min = False
-    #             item.suitable_machining_method_ids = False
-    #             item.blade_tip_characteristics_ids = False
-    #             item.handle_type_ids = False
-    #             item.cutting_direction_ids = False
-    #             item.suitable_coolant_ids = False
-    #             item.cutting_tool_diameter = False
-    #             item.cutting_tool_blade_number = False
-    #             item.cutting_tool_front_angle = False
-    #             item.cutting_tool_rear_angle = False
-    #             item.cutting_tool_main_included_angle = False
-    #             item.materials_type_id = False
-    #             item.cutting_tool_nut = False
-    #             item.cutting_tool_top_angle = False
-    #             item.cutting_tool_jump_accuracy = False
-    #             item.cutting_tool_working_hardness = False
-    #             item.cutting_tool_blade_diameter = False
-    #             item.cutting_tool_wrench = False
-    #             # item.cutting_tool_screw = False
-    #             item.cutting_tool_accuracy_level = False
-    #             item.cutting_tool_diameter_max = False
-    #             item.cutting_tool_clamping_diameter = False
-    #             item.cutting_tool_flange_length = False
-    #             item.cutting_tool_flange_diameter = False
-    #             item.cutting_tool_outer_diameter = False
-    #             item.cutting_tool_inner_diameter = False
-    #             item.cutting_tool_chuck_ids = False
-    #             item.cutting_tool_cutter_bar_ids = False
-    #             item.cutting_tool_cutter_pad_ids = False
-    #             item.cutting_tool_blade_ids = False
-    #             item.cutting_tool_handle_ids = False
+    @api.onchange('cutting_tool_model_id')
+    def _onchange_cutting_tool_model_id(self):
+        if self.cutting_tool_model_id:
+            if self.cutting_tool_type == '刀片':
+                self.env['sf.tool.materials.basic.parameters'].search([('standard_library_id',=)])
+                self.specification_id = self.cutting_tool_model_id.
+
+
+
+
 
     def _get_volume_uom_id_from_ir_config_parameter(self):
         product_length_in_feet_param = self.env['ir.config_parameter'].sudo().get_param('product.volume_in_cubic_feet')

From cbc9264b2c7957a807aca57855b006ea0609665a Mon Sep 17 00:00:00 2001
From: "JIKIMO-YXH\\xianghui" <3437689193@qq.com>
Date: Wed, 1 Nov 2023 17:26:23 +0800
Subject: [PATCH 16/21] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96CAM=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E7=9A=84=E7=BB=84=E8=A3=85=E5=8D=95=E4=B8=AD=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=88=80=E5=85=B7=E5=90=8D=E7=A7=B0=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=BB=84=E8=A3=85=E5=8D=95=E7=AD=89=E7=9A=84form?=
 =?UTF-8?q?=E8=A1=A8=E5=90=8D=E7=A7=B0=E9=97=AE=E9=A2=98=EF=BC=9B2?=
 =?UTF-8?q?=E3=80=81=E5=8E=BB=E9=99=A4=E7=BB=84=E8=A3=85=E5=8D=95=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E8=BE=93=E5=87=BA=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_tool_management/models/base.py   | 7 +++----
 sf_tool_management/wizard/wizard.py | 5 -----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 11811657..b657184b 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -14,7 +14,7 @@ class FunctionalCuttingToolEntity(models.Model):
 
     # code = fields.Char('序列号')
     barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
-    name = fields.Char('名称', size=20)
+    name = fields.Char(related='barcode_id.name')
     functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True)
     mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', string='刀具型号')
     mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型',
@@ -623,7 +623,7 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
         """
         record = self.env['sf.functional.tool.assembly'].create({
             'barcode_id': self.barcode_id.id,
-            'name': self.functional_tool_name_id.id,
+            'functional_tool_name_id': self.functional_tool_name_id.id,
             'functional_tool_type_id': self.functional_tool_type_id.id,
             'functional_tool_diameter': self.diameter,
             'functional_tool_length': self.tool_loading_length,
@@ -664,7 +664,6 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
             })
 
 
-
 class FunctionalToolAssembly(models.Model):
     _name = 'sf.functional.tool.assembly'
     _description = '功能刀具组装单'
@@ -673,7 +672,7 @@ class FunctionalToolAssembly(models.Model):
     assembly_order_code = fields.Char(string='编码', readonly=True)
     barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
     functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True)
-    name = fields.Char( string='功能刀具名称', readonly=True)
+    name = fields.Char(string='名称', readonly=True)
     functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True,
                                               group_expand='_read_group_functional_tool_type_ids')
 
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index 2e2bc17f..0c554ca9 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -273,7 +273,6 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
         stock_lot = self.create_assemble_warehouse_receipt()
         # 创建刀具组装入库单
         self.create_stocking_picking(stock_lot)
-        print('已运行1')
         desc_1 = {
             'barcode_id': stock_lot.id,
             'integral_code_id': self.integral_code_id.id,
@@ -293,13 +292,11 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
             'tool_loading_person': self.env.user.name,
             'tool_loading_time': fields.Datetime.now()
         }
-        print('已运行2')
         functional_tool_assembly = self.env['sf.functional.tool.assembly'].search([
             ('machine_tool_name_id', '=', self.machine_tool_name_id.id),
             ('cutter_spacing_code', '=', self.cutter_spacing_code),
             ('assemble_status', '=', '0'),
         ])
-        print('已运行3')
         # 封装功能刀具数据
         desc_2 = {
             'barcode_id': stock_lot.id,
@@ -323,10 +320,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
             'applicable_range': None,
             'image': None,
         }
-        print('已运行4')
         # 创建功能刀具列表、功能刀具预警、功能刀具实时分布、功能刀具出入库记录
         record_1 = self.env['sf.functional.cutting.tool.entity'].create(desc_2)
-        print('已运行5')
         self.env['sf.functional.tool.warning'].create({
             'functional_cutting_tool_id': record_1.id,
             'functional_tool_assembly_id': functional_tool_assembly.id,

From 0c788df2f225943a5bb0416b6452b1738adefa90 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Wed, 1 Nov 2023 17:33:50 +0800
Subject: [PATCH 17/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=9D?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=A4=9A=E5=9B=BE=E7=89=87=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/src/scss/custom_style.scss         |   1 +
 .../sf_equipment_maintenance_standards.py     |   5 +-
 sf_maintenance/models/sf_maintenance.py       |  20 ++--
 .../models/sf_maintenance_requests.py         |   2 +-
 .../views/maintenance_request_views.xml       | 106 +++++++++++-------
 5 files changed, 79 insertions(+), 55 deletions(-)

diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss
index 00db5f3b..c9b53c68 100644
--- a/jikimo_frontend/static/src/scss/custom_style.scss
+++ b/jikimo_frontend/static/src/scss/custom_style.scss
@@ -17,6 +17,7 @@ div:has(.o_required_modifier) > label::before {
 }
 
 .my-image div {
+
   width: 110px !important;
   height: 110px !important;
 }
diff --git a/sf_maintenance/models/sf_equipment_maintenance_standards.py b/sf_maintenance/models/sf_equipment_maintenance_standards.py
index 55fea8b0..80ec2ba3 100644
--- a/sf_maintenance/models/sf_equipment_maintenance_standards.py
+++ b/sf_maintenance/models/sf_equipment_maintenance_standards.py
@@ -48,8 +48,8 @@ class SfEquipmentSaintenanceStandards(models.Model):
         string='适用设备',
         domain="[('category_id', '=', maintenance_equipment_category_id)]"
     )
-
-    maintenance_standards_ids = fields.One2many('maintenance.standards', 'equipment_maintenance_standards_id', string='维保项目')
+    maintenance_standards_ids = fields.One2many('maintenance.standards', 'equipment_maintenance_standards_id',
+                                                string='维保项目', widget='one2many_list')
     eq_maintenance_ids = fields.One2many('maintenance.equipment', 'eq_maintenance_id', string='保养设备')
     overhaul_ids = fields.One2many('maintenance.equipment', 'overhaul_id', string='检修设备')
 
@@ -81,6 +81,7 @@ class SfSaintenanceStandards(models.Model):
         [('电气类', '电气类'), ('机械类', '机械类'), ('程序类', '程序类'), ('系统类', '系统类')], string='类别')
     equipment_maintenance_standards_id = fields.Many2one('equipment.maintenance.standards', string='设备维保标准')
     images = fields.One2many('maintenance.standard.image', 'standard_id', string='反馈图片')
+    maintenance_request_ids = fields.Many2many('maintenance.request', string='维保计划')
     Period = fields.Integer('周期/频次(天)')
     remark = fields.Char('备注说明')
 
diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py
index 5c916387..91688c35 100644
--- a/sf_maintenance/models/sf_maintenance.py
+++ b/sf_maintenance/models/sf_maintenance.py
@@ -237,9 +237,9 @@ class SfMaintenanceEquipment(models.Model):
             item.brand_id = item.type_id.brand_id.id
 
     # AGV小车设备参数
-    AGV_L = fields.Char('设备尺寸(长)')
-    AGV_W = fields.Char('设备尺寸(宽)')
-    AGV_H = fields.Char('设备尺寸(高)')
+    AGV_L = fields.Char('AGV尺寸(长)')
+    AGV_W = fields.Char('AGV尺寸(宽)')
+    AGV_H = fields.Char('AGV尺寸(高)')
     AGV_goods_L = fields.Char('载货尺寸(长)')
     AGV_goods_W = fields.Char('载货尺寸(宽)')
     AGV_goods_H = fields.Char('载货尺寸(高)')
@@ -276,9 +276,9 @@ class SfMaintenanceEquipment(models.Model):
     detect_L = fields.Char('设备尺寸(长)')
     detect_W = fields.Char('设备尺寸(宽)')
     detect_H = fields.Char('设备尺寸(高)')
-    detect_x_axis = fields.Char('X轴')
-    detect_y_axis = fields.Char('Y轴')
-    detect_z_axis = fields.Char('Z轴')
+    detect_x_axis = fields.Char('检测X轴')
+    detect_y_axis = fields.Char('检测Y轴')
+    detect_z_axis = fields.Char('检测Z轴')
     detect_precision = fields.Char('测量精度')
     detect_measurement_mode = fields.Selection([('光栅尺', '光栅尺'), ('容栅', '容栅'), ('磁栅', '磁栅'), ('激光干涉仪', '激光干涉仪')], string='测量方式')
     detect_resolution = fields.Char('分辨率')
@@ -295,8 +295,8 @@ class SfMaintenanceEquipment(models.Model):
     detect_object_field_of_view_max = fields.Char('物方视场(最大)')
     detect_object_field_of_view_min = fields.Char('物方视场(最小)')
     detect_power_requirements = fields.Char('电源要求')
-    detect_operating_temperature = fields.Char('环境温度')
-    detect_operating_humidity = fields.Char('环境湿度')
+    detect_operating_temperature = fields.Char('检测设备环境温度')
+    detect_operating_humidity = fields.Char('检测设备环境湿度')
 
     # 机器人设备参数
     robot_gripping_of_workpieces_L = fields.Char('可抓取工件(长)')
@@ -313,8 +313,8 @@ class SfMaintenanceEquipment(models.Model):
     robot_track_dimensions_H = fields.Char('轨道尺寸(高)')
     robot_drive_mode = fields.Char('驱动方式')
     robot_installation_method = fields.Selection([('置地式', '置地式'), ('壁挂式', '壁挂式'), ('倒挂式', '倒挂式')], string='安装方式')
-    robot_operating_temperature = fields.Char('环境温度')
-    robot_operating_humidity = fields.Char('环境湿度')
+    robot_operating_temperature = fields.Char('机器人环境温度')
+    robot_operating_humidity = fields.Char('机器人环境湿度')
 
     # 其他参数(所有设备)
     date_of_purchase = fields.Date('采购日期')
diff --git a/sf_maintenance/models/sf_maintenance_requests.py b/sf_maintenance/models/sf_maintenance_requests.py
index fad9e55f..330c1ece 100644
--- a/sf_maintenance/models/sf_maintenance_requests.py
+++ b/sf_maintenance/models/sf_maintenance_requests.py
@@ -25,7 +25,7 @@ class SfMaintenanceEquipmentCategory(models.Model):
             if not record.equipment_maintenance_id:
                 record.equipment_maintenance_id = False
 
-    maintenance_standards = fields.Many2many('maintenance.standards', string='维保标准')
+    maintenance_standards = fields.Many2many('maintenance.standards', string='维保项目')
 
     @api.constrains('equipment_maintenance_id')
     def _check_equipment_maintenance_id(self):
diff --git a/sf_maintenance/views/maintenance_request_views.xml b/sf_maintenance/views/maintenance_request_views.xml
index 83bd6e44..1ad030b8 100644
--- a/sf_maintenance/views/maintenance_request_views.xml
+++ b/sf_maintenance/views/maintenance_request_views.xml
@@ -1,5 +1,63 @@
 <?xml version="1.0"?>
 <odoo>
+
+    <!--    维保项目表单视图-->
+
+    <record id="view_maintenance_standards_form" model="ir.ui.view">
+        <field name="name">maintenance.standards.form</field>
+        <field name="model">maintenance.standards</field>
+        <field name="arch" type="xml">
+            <form string="设备维保项目">
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="maintenance_standards"/>
+                        </group>
+                        <group>
+                            <field name="remark"/>
+                            <field name="maintenance_request_ids" invisible="1"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="上传图片" autofocus="autofocus">
+                            <field name="images" mode="kanban">
+                                <kanban quick_create="1" create="1">
+                                    <field name="image"/>
+                                    <templates>
+                                        <t t-name="kanban-box">
+                                            <div class="oe_kanban_global_click">
+                                                <!-- 在这里定义每个卡片的内容 -->
+                                                <span>
+                                                    <image>
+                                                        <field name="image" preview_image="image_128" widget="image"/>
+                                                    </image>
+                                                </span>
+                                            </div>
+                                        </t>
+                                    </templates>
+                                </kanban>
+                                <form>
+                                    <sheet>
+                                        <field name="image" preview_image="image_128" widget="image"/>
+                                        <field name="standard_id"/>
+                                    </sheet>
+                                </form>
+                            </field>
+                        </page>
+
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_view_maintenance_standards_tree" model="ir.actions.act_window">
+        <field name="name">Maintenance Standards</field>
+        <field name="res_model">maintenance.standards</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_maintenance_standards_form"/>
+    </record>
     <!-- equiment.request : actions -->
 
     <record model="ir.ui.view" id="sf_hr_equipment_request_view_form">
@@ -21,17 +79,16 @@
             <sheet>
 
                 <notebook>
-                    <page string="维保标准" attrs="{'invisible': [('equipment_maintenance_id', '=', False)]}">
-                        <field name="maintenance_standards" widget="ony2many">
-                            <tree>
-                                <field name="sequence"/>
-                                <field name="name"/>
+                    <page string="维保标准" attrs="{'invisible': [('equipment_maintenance_id', '=', False)]}" context="{'default_standard_id': 'id'}">
+                        <field name="maintenance_standards" widget="one2many_list">
+                            <tree multi_edit="" editable="">
+                                <field name="name" />
                                 <field name="maintenance_standards"/>
-                                <field name="images"/>
+                                <field name="images" force_save="1" required="1">
+                                </field>
                                 <field name="remark"/>
                             </tree>
                         </field>
-
                     </page>
                 </notebook>
 
@@ -71,40 +128,5 @@
         <field name="active" eval="False"/>
     </record>
 
-    <!--    维保项目表单视图-->
-
-    <record id="view_maintenance_standards_form" model="ir.ui.view">
-        <field name="name">maintenance.standards.form</field>
-        <field name="model">maintenance.standards</field>
-        <field name="arch" type="xml">
-            <form string="设备维保项目">
-                <sheet>
-                    <group>
-                        <group>
-                             <field name="sequence"/>
-                             <field name="name"/>
-                        </group>
-                        <group>
-                            <field name="maintenance_standards"/>
-                            <field name="remark"/>
-                        </group>
-
-
-                    </group>
-                    <notebook>
-                        <page string="上传图片">
-                             <field name="images" widget="one2many">
-                        <tree editable="bottom">
-                            <field name="image" widget="image" options="{'size': [100, 100], 'click enlarge': True}"/>
-                        </tree>
-                    </field>
-                        </page>
-                    </notebook>
-
-                </sheet>
-            </form>
-        </field>
-    </record>
-
 
 </odoo>
\ No newline at end of file

From 108cb96ca58f1b11eeaab6b0e5c4cf319ea124de Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 1 Nov 2023 17:45:54 +0800
Subject: [PATCH 18/21] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=8F=8A=E5=90=8C=E6=AD=A5=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/__manifest__.py                       |   1 +
 sf_base/models/tool_base_new.py               |   4 +-
 sf_base/models/tool_other_features.py         |  19 +-
 sf_base/views/tool_basic_param.xml            | 134 +++++++++++
 sf_base/views/tool_views.xml                  |  85 +++----
 sf_dlm/views/product_template_view.xml        |  16 +-
 sf_manufacturing/models/product_template.py   | 215 +++++++++---------
 sf_mrs_connect/models/sync_common.py          |  16 +-
 sf_tool_management/models/base.py             |   4 +-
 .../models/tool_material_search.py            |   2 +-
 sf_tool_management/views/tool_base_views.xml  |   4 +-
 .../views/tool_material_search.xml            |   2 +-
 12 files changed, 308 insertions(+), 194 deletions(-)
 create mode 100644 sf_base/views/tool_basic_param.xml

diff --git a/sf_base/__manifest__.py b/sf_base/__manifest__.py
index a34868b9..1fb1daa6 100644
--- a/sf_base/__manifest__.py
+++ b/sf_base/__manifest__.py
@@ -20,6 +20,7 @@
         'views/functional_fixture_view.xml',
         'views/menu_view.xml',
         'views/tool_views.xml',
+        'views/tool_basic_param.xml',
         'views/tool_menu.xml',
         'views/menu_fixture_view.xml',
 
diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py
index b4660948..e2839763 100644
--- a/sf_base/models/tool_base_new.py
+++ b/sf_base/models/tool_base_new.py
@@ -140,12 +140,12 @@ class CuttingToolModel(models.Model):
     integral_run_out_accuracy_max = fields.Char('整体式刀具端跳精度max')
     integral_run_out_accuracy_min = fields.Char('整体式刀具端跳精度min')
 
-    fit_blade_shape_ids = fields.Many2many('maintenance.equipment.image', 'fit_blade_shape_library_rel',
+    fit_blade_shape_id = fields.Many2many('maintenance.equipment.image', 'fit_blade_shape_library_rel',
                                            '适配刀片形状', domain=[('type', '=', '刀片形状')])
     suitable_machining_method_ids = fields.Many2many('maintenance.equipment.image',
                                                      'suitable_machining_method_library_rel',
                                                      '适合加工方式', domain=[('type', '=', '加工能力')])
-    blade_tip_characteristics_ids = fields.Many2many('maintenance.equipment.image',
+    blade_tip_characteristics_id = fields.Many2many('maintenance.equipment.image',
                                                      'blade_tip_character_library_rel',
                                                      '刀尖特征', domain=[('type', '=', '刀尖特征')])
     handle_type_ids = fields.Many2many('maintenance.equipment.image', 'handle_type_library_rel',
diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py
index 4e02a92c..f97c9a9f 100644
--- a/sf_base/models/tool_other_features.py
+++ b/sf_base/models/tool_other_features.py
@@ -11,7 +11,6 @@ class ToolMaterialsBasicParameters(models.Model):
                                     store=True)
 
     # 整体式刀具参数
-    # code = fields.Char('物料号', size=50)
     total_length = fields.Char('总长度(mm)', size=20)
     blade_number = fields.Selection(
         [('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8')],
@@ -124,15 +123,9 @@ class ToolMaterialsBasicParameters(models.Model):
         string='适用刀柄型号'
     )
 
-    def name_get(self):
-        res = []
-        for obj in self:
-            res.append((obj.id, obj.blade_diameter))
-        return res
-
     def _json_integral_tool_basic_param(self, obj):
         integral_tool_basic_param_str = (0, '', {
-            'name': obj['code'],
+            'name': obj['name'],
             'cutting_tool_type': obj['cutting_tool_type'],
             'total_length': obj['total_length'],
             'blade_diameter': obj['blade_diameter'],
@@ -155,7 +148,7 @@ class ToolMaterialsBasicParameters(models.Model):
 
     def _json_blade_basic_param(self, obj):
         blade_basic_param_str = (0, '', {
-            'name': obj['code'],
+            'name': obj['name'],
             'cutting_tool_type': obj['cutting_tool_type'],
             'length': obj['length'],
             'thickness': obj['thickness'],
@@ -185,7 +178,7 @@ class ToolMaterialsBasicParameters(models.Model):
 
     def _json_cutter_arbor_basic_param(self, obj):
         cutter_arbor_basic_param_str = (0, '', {
-            'name': obj['code'],
+            'name': obj['name'],
             'cutting_tool_type': obj['cutting_tool_type'],
             'height': obj['height'],
             'width': obj['width'],
@@ -216,7 +209,7 @@ class ToolMaterialsBasicParameters(models.Model):
 
     def _json_cutter_head_basic_param(self, obj):
         cutter_head_basic_param_str = (0, '', {
-            'name': obj['code'],
+            'name': obj['name'],
             'cutting_tool_type': obj['cutting_tool_type'],
             'install_blade_tip_num': obj['install_blade_tip_num'],
             'blade_diameter': obj['blade_diameter'],
@@ -239,7 +232,7 @@ class ToolMaterialsBasicParameters(models.Model):
 
     def _json_knife_handle_basic_param(self, obj):
         knife_handle_basic_param_str = (0, '', {
-            'name': obj['code'],
+            'name': obj['name'],
             'cutting_tool_type': obj['cutting_tool_type'],
             'total_length': obj['total_length'],
             'flange_shank_length': obj['flange_shank_length'],
@@ -267,7 +260,7 @@ class ToolMaterialsBasicParameters(models.Model):
 
     def _json_chuck_basic_param(self, obj):
         chuck_basic_param_str = (0, '', {
-            'name': obj['code'],
+            'name': obj['name'],
             'cutting_tool_type': obj['cutting_tool_type'],
             'er_size_model': obj['er_size_model'],
             'min_clamping_diameter': obj['min_clamping_diameter'],
diff --git a/sf_base/views/tool_basic_param.xml b/sf_base/views/tool_basic_param.xml
new file mode 100644
index 00000000..1cc631f0
--- /dev/null
+++ b/sf_base/views/tool_basic_param.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <data>
+      <!-- ================================================刀具基础参数================================================ -->
+    <record id="view_sf_tool_materials_basic_parameters_integral_tree" model="ir.ui.view">
+        <field name="name">sf.tool.materials.basic.parameters.tree</field>
+        <field name="model">sf.tool.materials.basic.parameters</field>
+        <field name="arch" type="xml">
+            <tree string="基础参数"  delete="0" create="0" edit="0" sample="1">
+                <field name="total_length" />
+                <field name="blade_number" />
+                <field name="neck_diameter"/>
+                <field name="neck_length"/>
+                 <field name="handle_diameter" />
+                <field name="handle_length" />
+                <field name="blade_tip_diameter"/>
+                <field name="blade_tip_working_size"/>
+                 <field name="blade_tip_taper" />
+                <field name="blade_diameter" />
+                <field name="blade_length"/>
+                <field name="blade_helix_angle"/>
+                <field name="blade_width" />
+                <field name="blade_width" />
+                <field name="pitch"/>
+                <field name="cutting_depth"/>
+            </tree>
+        </field>
+    </record>
+
+         <record id="view_sf_tool_materials_basic_parameters_blade_tree" model="ir.ui.view">
+        <field name="name">sf.tool.materials.basic.parameters.tree</field>
+        <field name="model">sf.tool.materials.basic.parameters</field>
+        <field name="arch" type="xml">
+            <tree string="基础参数"  delete="0" create="0">
+                <field name="total_length" />
+                <field name="length" />
+                <field name="thickness"/>
+                <field name="width"/>
+                 <field name="cutting_blade_length" />
+                <field name="relief_angle" />
+                <field name="blade_tip_circular_arc_radius"/>
+                <field name="inscribed_circle_diameter"/>
+                 <field name="install_aperture_diameter" />
+                <field name="chip_breaker_groove" />
+                <field name="blade_teeth_model"/>
+                <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" />
+                <field name="inscribed_circle_tolerance"/>
+                <field name="thickness_tolerance"/>
+            </tree>
+        </field>
+    </record>
+
+        <record id="view_sf_tool_materials_basic_parameters_cutter_bar_tree" model="ir.ui.view">
+        <field name="name">sf.tool.materials.basic.parameters.tree</field>
+        <field name="model">sf.tool.materials.basic.parameters</field>
+        <field name="arch" type="xml">
+            <tree string="基础参数"  delete="0" create="0">
+                <field name="total_length" />
+                <field name="height" />
+                <field name="blade_height"/>
+                <field name="cut_depth_max"/>
+                 <field name="cutter_arbor_diameter" />
+                <field name="min_machining_aperture" />
+                <field name="install_blade_tip_num"/>
+                <field name="cutting_blade_model"/>
+                 <field name="cooling_hole" />
+                <field name="locating_slot_code" />
+                <field name="installing_structure"/>
+                <field name="blade_ids"/>
+                <field name="tool_shim" />
+                <field name="cotter_pin" />
+                <field name="pressing_plate"/>
+                 <field name="screw"/>
+                <field name="spanner" />
+            </tree>
+        </field>
+    </record>
+
+
+         <record id="view_sf_tool_materials_basic_parameters_tree" model="ir.ui.view">
+        <field name="name">sf.tool.materials.basic.parameters.tree</field>
+        <field name="model">sf.tool.materials.basic.parameters</field>
+        <field name="arch" type="xml">
+            <tree string="基础参数"  delete="0" create="0">
+                <field name="total_length" />
+                <field name="blade_number" />
+                <field name="neck_diameter"/>
+                <field name="neck_length"/>
+                 <field name="handle_diameter" />
+                <field name="handle_length" />
+                <field name="blade_tip_diameter"/>
+                <field name="blade_tip_working_size"/>
+                 <field name="blade_tip_taper" />
+                <field name="blade_diameter" />
+                <field name="blade_length"/>
+                <field name="blade_helix_angle"/>
+                <field name="blade_width" />
+                <field name="blade_width" />
+                <field name="pitch"/>
+                <field name="cutting_depth"/>
+            </tree>
+        </field>
+    </record>
+
+
+    <record model="ir.ui.view" id="view_sf_tool_materials_basic_parameters_search">
+        <field name="name">sf.tool.materials.basic.parameters.search</field>
+        <field name="model">sf.tool.materials.basic.parameters</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="name"/>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_sf_tool_materials_basic_parameters" model="ir.actions.act_window">
+        <field name="name">基础参数</field>
+        <field name="res_model">sf.tool.materials.basic.parameters</field>
+        <field name="view_mode">tree</field>
+
+<!--        <field name="context">{'selection_mode': 'single'}</field>-->
+        <field name="domain">[]</field>
+<!--        <field name="multi">false</field>-->
+    </record>
+
+    </data>
+</odoo>
diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index bfaac129..fe2fcf5c 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -35,13 +35,6 @@
                     <field name="code"/>
                     <field name="name" string="名称"/>
                     <field name="mrs_cutting_tool_type_id"/>
-                    <!--                    <field name="mrs_cutting_tool_integral_model_ids" optional="hide"/>-->
-                    <!--                    <field name="mrs_cutting_tool_blade_model_ids" optional="hide"/>-->
-                    <!--                    <field name="mrs_cutting_tool_cutterbar_model_ids" optional="hide"/>-->
-                    <!--                    <field name="mrs_cutting_tool_cutterpad_model_ids" optional="hide"/>-->
-                    <!--                    <field name="mrs_cutting_tool_cutterhandle_model_ids" optional="hide"/>-->
-                    <!--                    <field name="mrs_cutting_tool_cutterhead_model_ids" optional="hide"/>-->
-                    <!--                    <field name="image" widget='image'/>-->
                 </tree>
             </field>
         </record>
@@ -60,52 +53,9 @@
                                     <field name="mrs_cutting_tool_type_id"
                                            options="{'no_create': True, 'no_quick_create': True}"/>
                                     <field name="mrs_cutting_tool_model_id"
-                                           options="{'no_create': True, 'no_quick_create': True}"
-                                           attrs="{'invisible': True}"/>
-                                    <!--                                    <field name="mrs_cutting_tool_integral_model_ids"-->
-                                    <!--                                           options="{'no_create': True, 'no_quick_create': True}"-->
-                                    <!--                                           widget="many2many_tags"/>-->
-                                    <!--                                    <field name="mrs_cutting_tool_blade_model_ids"-->
-                                    <!--                                           options="{'no_create': True, 'no_quick_create': True}"-->
-                                    <!--                                           widget="many2many_tags"/>-->
-                                    <!--                                    <field name="mrs_cutting_tool_cutterbar_model_ids"-->
-                                    <!--                                           options="{'no_create': True, 'no_quick_create': True}"-->
-                                    <!--                                           widget="many2many_tags"/>-->
-                                    <!--                                    <field name="mrs_cutting_tool_cutterpad_model_ids"-->
-                                    <!--                                           options="{'no_create': True, 'no_quick_create': True}"-->
-                                    <!--                                           widget="many2many_tags"/>-->
-                                    <!--                                    <field name="mrs_cutting_tool_cutterhandle_model_ids"-->
-                                    <!--                                           options="{'no_create': True, 'no_quick_create': True}"-->
-                                    <!--                                           widget="many2many_tags"/>-->
-                                    <!--                                    <field name="mrs_cutting_tool_cutterhead_model_ids"-->
-                                    <!--                                           options="{'no_create': True, 'no_quick_create': True}"-->
-                                    <!--                                           widget="many2many_tags"/>-->
+                                           options="{'no_create': True, 'no_quick_create': True}"/>
                                 </group>
-                                <!--                                <group>-->
-                                <!--                                    <field name="image" nolabel="1" widget="image"/>-->
-                                <!--                                </group>-->
-
                             </group>
-                            <!--                            <group string='参数信息'>-->
-                            <!--                                <group>-->
-                            <!--                                    <field name="diameter"/>-->
-                            <!--                                    <field name="tool_grade"/>-->
-                            <!--                                    <field name="machining_accuracy"/>-->
-                            <!--                                    <field name="tool_length"/>-->
-                            <!--                                    <field name="blade_number"/>-->
-                            <!--                                </group>-->
-                            <!--                                <group>-->
-                            <!--                                    <field name="integral_blade_length"/>-->
-                            <!--                                    <field name="effective_blade_length"/>-->
-                            <!--                                    <field name="max_life"/>-->
-                            <!--                                    <field name="is_standard"/>-->
-                            <!--                                </group>-->
-                            <!--                            </group>-->
-                            <!--                            <group string='其他信息'>-->
-                            <!--                                <group>-->
-                            <!--                                    <field name="applicable_range"/>-->
-                            <!--                                </group>-->
-                            <!--                            </group>-->
                         </group>
                     </sheet>
                 </form>
@@ -220,7 +170,7 @@
                         </group>
                         <group string="适配刀片形状"
                                attrs="{'invisible': [('cutting_tool_type', 'in', ('刀柄','夹头','整体式刀具',False))]}">
-                            <field name="fit_blade_shape_ids" string="" widget="custom_many2many_checkboxes"/>
+                            <field name="fit_blade_shape_id" string="" widget="custom_many2many_checkboxes"/>
                         </group>
                         <group string="适合加工方式"
                                attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
@@ -229,7 +179,7 @@
                         </group>
                         <group string="刀尖特征"
                                attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
-                            <field name="blade_tip_characteristics_ids" string=""
+                            <field name="blade_tip_characteristics_id" string=""
                                    widget="custom_many2many_checkboxes"/>
                         </group>
                         <group attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
@@ -558,5 +508,34 @@
         <field name="domain">[]</field>
     </record>
 
+      <!-- ================================================刀具基础参数================================================ -->
+<!--    <record id="view_sf_tool_materials_basic_parameters_tree" model="ir.ui.view">-->
+<!--        <field name="name">sf.tool.materials.basic.parameters.tree</field>-->
+<!--        <field name="model">sf.tool.materials.basic.parameters</field>-->
+<!--        <field name="arch" type="xml">-->
+<!--            <tree string="基础参数"  delete="0" create="0">-->
+<!--                <field name="total_length" />-->
+<!--                <field name="blade_number" />-->
+<!--                <field name="neck_diameter"/>-->
+<!--                <field name="neck_length"/>-->
+<!--                 <field name="handle_diameter" />-->
+<!--                <field name="handle_length" />-->
+<!--                <field name="blade_tip_diameter"/>-->
+<!--                <field name="blade_tip_working_size"/>-->
+<!--                 <field name="blade_tip_taper" />-->
+<!--                <field name="blade_diameter" />-->
+<!--                <field name="blade_length"/>-->
+<!--                <field name="blade_helix_angle"/>-->
+<!--                <field name="blade_width" />-->
+<!--                <field name="blade_width" />-->
+<!--                <field name="pitch"/>-->
+<!--                <field name="cutting_depth"/>-->
+<!--            </tree>-->
+<!--        </field>-->
+<!--    </record>-->
+
+
+
+
 
 </odoo>
diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index eda7f88b..130be2c4 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -54,9 +54,13 @@
                     <field name="cutting_tool_model_id" placeholder="请选择"
                            attrs="{'invisible': [('categ_type', '!=', '刀具')]}"
                            domain="[('cutting_tool_material_id','=',cutting_tool_material_id)]"/>
-                    <field name="specification_id" placeholder="请选择" class="diameter"
+                    <!--                    <lable for="specification_id" class="type_label">规格</lable>-->
+                    <!--                    <div class="button_width">-->
+                    <field name="specification_id" placeholder="请选择"
                            attrs="{'invisible': [('categ_type', '!=', '刀具')]}"
                            domain="[('standard_library_id','=',cutting_tool_model_id)]"/>
+                    <!--                        <button name="choice" type="object" class="oe_highlight">选择</button>-->
+                    <!--                    </div>-->
                     <field name="fixture_material_id" attrs="{'invisible': [('categ_type', '!=', '夹具')]}"
                            placeholder="请选择"/>
                     <!--                    <field name="fixture_model_id" string="型号" placeholder="请选择"-->
@@ -415,7 +419,7 @@
                         </group>
                         <group string="适配刀片形状"
                                attrs="{'invisible': [('cutting_tool_type', 'in', ('刀柄','夹头','整体式刀具',False))]}">
-                            <field name="fit_blade_shape_ids" string="" widget="custom_many2many_checkboxes"/>
+                            <field name="fit_blade_shape_id" string="" widget="custom_many2many_checkboxes"/>
                         </group>
                         <group string="适合加工方式"
                                attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
@@ -424,7 +428,7 @@
                         </group>
                         <group string="刀尖特征"
                                attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
-                            <field name="blade_tip_characteristics_ids" string=""
+                            <field name="blade_tip_characteristics_id" string=""
                                    widget="custom_many2many_checkboxes"/>
                         </group>
                         <group attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀杆','刀盘','刀片'))]}">
@@ -445,7 +449,8 @@
                             </group>
                         </group>
                         <notebook>
-                            <page string="切削速度Vc">
+                            <page string="切削速度Vc"
+                                  attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}">
                                 <field name="cutting_speed_ids" string="" widget="one2many">
                                     <tree editable="bottom">
                                         <!--                <field name="order"/>-->
@@ -466,7 +471,8 @@
                                     </tree>
                                 </field>
                             </page>
-                            <page string="每齿走刀量fz">
+                            <page string="每齿走刀量fz"
+                                  attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))]}">
                                 <field name="feed_per_tooth_ids" string="" widget="one2many">
                                     <tree editable="bottom">
                                         <field name="cutting_speed"
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 50c17ab6..8c6546c3 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -1,4 +1,4 @@
-from odoo import models, fields, api
+from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
 from odoo.modules import get_resource_path
 from odoo.addons.sf_base.commons.common import Common
@@ -101,12 +101,12 @@ class ResProductMo(models.Model):
     cutting_tool_run_out_accuracy_max = fields.Float('端跳精度max', digits=(6, 1))
     cutting_tool_run_out_accuracy_min = fields.Float('端跳精度min', digits=(6, 1))
     cutting_tool_blade_tip_working_size = fields.Char('刀尖处理尺寸(R半径mm/倒角)', size=20)
-    fit_blade_shape_ids = fields.Many2many('maintenance.equipment.image', 'rel_fit_blade_shape_product_template',
+    fit_blade_shape_id = fields.Many2many('maintenance.equipment.image', 'rel_fit_blade_shape_product_template',
                                            '适配刀片形状', domain=[('type', '=', '刀片形状')])
     suitable_machining_method_ids = fields.Many2many('maintenance.equipment.image',
                                                      'rel_machining_product_template', '适合加工方式',
                                                      domain=[('type', '=', '加工能力')])
-    blade_tip_characteristics_ids = fields.Many2many('maintenance.equipment.image',
+    blade_tip_characteristics_id = fields.Many2many('maintenance.equipment.image',
                                                      'rel_blade_tip_product_template', '刀尖特征',
                                                      domain=[('type', '=', '刀尖特征')])
     handle_type_ids = fields.Many2many('maintenance.equipment.image', 'rel_handle_product_template', '柄部类型',
@@ -116,52 +116,75 @@ class ResProductMo(models.Model):
     suitable_coolant_ids = fields.Many2many('maintenance.equipment.image', 'rel_coolant_product_template',
                                             '适合冷却液', domain=[('type', '=', '冷却液')])
     compaction_way_ids = fields.Many2many('maintenance.equipment.image', 'rel_compaction_product_template',
-                                          '压紧方式', domain=[('type', '=', '压紧方式')])\
-
-
-    # @api.onchange('cutting_tool_material_id')
-    # def _onchange_cutting_tool_material_id(self):
-    #     for item in self:
-    #         if item.cutting_tool_material_id.id != item.cutting_tool_model_id.cutting_tool_material_id.id:
-    #             item.cutting_tool_model_id = False
-    #             item.specification_id = False
-    #             item.cutting_tool_type_id = False
-    #             item.brand_id = False
-    #             item.tool_hardness = False
-    #             item.cutting_tool_run_out_accuracy_max = False
-    #             item.cutting_tool_run_out_accuracy_min = False
-    #             item.materials_type_id = False
-    #             item.cutting_tool_blade_type = False
-    #             item.cutting_tool_total_length = False
-    #             item.cutting_tool_shank_length = False
-    #             item.cutting_tool_blade_length = False
-    #             item.cutting_tool_blade_number = False
-    #             item.cutting_tool_neck_length = False
-    #             item.cutting_tool_neck_diameter = False
-    #             item.cutting_tool_shank_diameter = False
-    #             item.cutting_tool_blade_tip_diameter = False
-    #             item.cutting_tool_blade_tip_taper = False
-    #             item.cutting_tool_blade_helix_angle = False
-    #             item.cutting_tool_blade_type = False
-    #             item.cutting_tool_pitch = False
-    #             item.cutting_tool_blade_width = False
-    #             item.cutting_tool_blade_depth = False
-    #             item.cutting_tool_cut_depth = False
-    #             item.cutting_tool_coarse_medium_fine = False
-    #             item.cutting_tool_run_out_accuracy_max = False
-    #             item.cutting_tool_run_out_accuracy_min = False
-    #             item.cutting_tool_blade_tip_working_size = False
-    #             item.fit_blade_shape_ids = False
-    #             item.suitable_machining_method_ids = False
-    #             item.blade_tip_characteristics_ids = False
-    #             item.handle_type_ids = False
-    #             item.cutting_direction_ids = False
-    #             item.suitable_coolant_ids = False
-    #             item.compaction_way_ids = False
-    #             item.cutting_speed_ids = False
-    #             item.feed_per_tooth_ids = False
+                                          '压紧方式', domain=[('type', '=', '压紧方式')]) \
 
+    @api.onchange('cutting_tool_material_id')
+    def _onchange_cutting_tool_material_id(self):
+        for item in self:
+            if item.cutting_tool_material_id.id != item.cutting_tool_model_id.cutting_tool_material_id.id:
+                item.cutting_tool_model_id = False
+                item.specification_id = False
+                item.cutting_tool_type_id = False
+                item.brand_id = False
+                item.tool_hardness = False
+                item.cutting_tool_run_out_accuracy_max = False
+                item.cutting_tool_run_out_accuracy_min = False
+                item.materials_type_id = False
+                item.cutting_tool_blade_type = False
+                item.cutting_tool_total_length = False
+                item.cutting_tool_clamping_way = False
+                item.cutting_tool_blade_diameter = False
+                item.cutting_tool_shank_length = False
+                item.cutting_tool_blade_length = False
+                item.cutting_tool_blade_number = False
+                item.cutting_tool_neck_length = False
+                item.cutting_tool_neck_diameter = False
+                item.cutting_tool_shank_diameter = False
+                item.cutting_tool_blade_tip_diameter = False
+                item.cutting_tool_blade_tip_taper = False
+                item.cutting_tool_blade_helix_angle = False
+                item.cutting_tool_blade_type = False
+                item.cutting_tool_pitch = False
+                item.cutting_tool_blade_width = False
+                item.cutting_tool_blade_depth = False
+                item.cutting_tool_cut_depth = False
+                item.cutting_tool_coarse_medium_fine = False
+                item.cutting_tool_run_out_accuracy_max = False
+                item.cutting_tool_run_out_accuracy_min = False
+                item.cutting_tool_blade_tip_working_size = False
+                item.fit_blade_shape_id = False
+                item.suitable_machining_method_ids = False
+                item.blade_tip_characteristics_id = False
+                item.handle_type_ids = False
+                item.cutting_direction_ids = False
+                item.suitable_coolant_ids = False
+                item.compaction_way_ids = False
+                item.cutting_speed_ids = False
+                item.feed_per_tooth_ids = False
 
+    # def choice(self):
+    #     if self.cutting_tool_type == '整体式刀具':
+    #         tree_view = self.env.ref('sf_base.view_sf_tool_materials_basic_parameters_integral_tree')
+    #     elif self.cutting_tool_type == '刀片':
+    #         tree_view = self.env.ref('sf_base.view_sf_tool_materials_basic_parameters_blade_tree')
+    #     elif self.cutting_tool_type == '刀杆':
+    #         tree_view = self.env.ref('sf_base.view_sf_tool_materials_basic_parameters_cutter_bar_tree')
+    #     elif self.cutting_tool_type == '刀盘':
+    #         tree_view = self.env.ref('sf_base.view_sf_tool_materials_basic_parameters_tree')
+    #     elif self.cutting_tool_type == '刀柄':
+    #         tree_view = self.env.ref('sf_base.view_sf_tool_materials_basic_parameters_tree')
+    #     else :
+    #         tree_view = self.env.ref('sf_base.view_sf_tool_materials_basic_parameters_tree')
+    #     return {
+    #         'name': _('规格'),
+    #         'view_mode': 'list',
+    #         'view_id': tree_view.id,
+    #         'type': 'ir.actions.act_window',
+    #         'res_model': 'sf.tool.materials.basic.parameters',
+    #         'target': 'new',
+    #         'domain': [('cutting_tool_type', '=', self.cutting_tool_type),
+    #                    ('standard_library_id', '=', self.cutting_tool_model_id.id)],
+    #     }
 
     @api.onchange('specification_id')
     def _onchange_specification(self):
@@ -189,30 +212,30 @@ class ResProductMo(models.Model):
                 self.cutting_tool_blade_width = self.specification_id.blade_width
                 self.cutting_tool_blade_depth = self.specification_id.blade_depth
                 self.cutting_tool_cut_depth = self.specification_id.cutting_depth
-            elif self.cutting_tool_type == '刀杆1':
-                self.cutting_tool_total_length = self.specification_id.total_length
-                self.tool_height = self.specification_id.height
-                self.tool_width = self.specification_id.width
-                self.cutting_tool_knife_head_length = self.specification_id.cutting_blade_length
-                self.cutting_tool_knife_head_width = self.specification_id.blade_tip_circular_arc_radius
-                self.cutting_tool_knife_head_height = self.cutting_tool_model_id.blade_tip_height_tolerance
-                self.cutting_tool_blade_diameter = self.specification_id.inscribed_circle_diameter
-                self.cutting_tool_cutter_arbor_diameter = self.specification_id.cutter_arbor_diameter
-                self.cutting_tool_cut_blade_length = self.specification_id.install_aperture_diameter
-                self.cutting_tool_cut_depth_max = self.specification_id.cut_depth_max
-                self.cutting_tool_min_machining_aperture = self.specification_id.min_machining_aperture
-                self.cutting_tool_install_blade_tip_num = self.specification_id.install_blade_tip_num
-                self.cutting_tool_main_included_angle = self.specification_id.main_included_angle
-                self.cutting_tool_rear_angle = self.specification_id.main_included_angle
-                self.cutting_tool_installing_structure = self.specification_id.installing_structure
-                self.cutting_tool_cooling_hole = self.specification_id.cooling_hole
-                self.cutting_tool_locating_slot_code = self.specification_id.locating_slot_code
-                self.cutting_tool_blade_ids = self.cutting_tool_model_id.blade_ids
-                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
-                self.cutting_tool_screw = self.specification_id.screw
-                self.cutting_tool_wrench = self.specification_id.wrench
+                self.cutting_speed_ids = self.cutting_tool_model_id.cutting_speed_ids
+                self.feed_per_tooth_ids = [(0, 0, {'product_template_id': product_template.id,
+                                                   'cutting_speed': product_template.cutting_speed,
+                                                   'machining_method': product_template.machining_method,
+                                                   'blade_diameter': product_template.blade_diameter,
+                                                   'materials_type_id': product_template.materials_type_id.id}) for
+                                           product_template in
+                                           self.cutting_tool_model_id.feed_per_tooth_ids.filtered(
+                                               lambda r: r.blade_diameter == 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
+                self.cutting_tool_clamping_way = self.specification_id.clamping_mode
+                self.cutting_tool_top_diameter = self.cutting_tool_model_id.top_diameter
+                self.cutting_tool_outer_diameter = self.specification_id.outer_diameter
+                self.cutting_tool_inner_diameter = self.specification_id.inner_diameter
+                self.tool_weight = self.specification_id.weight
+                self.cutting_tool_jump_accuracy = self.specification_id.run_out_accuracy
+                self.cutting_tool_max_load_capacity = self.specification_id.max_load_capacity
+                self.cutting_tool_er_size_model = self.specification_id.er_size_model
+                self.cutting_tool_handle_ids = self.cutting_tool_model_id.handle_ids
+                self.cooling_suit_type_ids = self.specification_id.cooling_jacket
             elif self.cutting_tool_type == '刀片':
                 self.cutting_tool_total_length = self.specification_id.total_length
                 self.tool_length = self.specification_id.length
@@ -220,7 +243,7 @@ class ResProductMo(models.Model):
                 self.tool_width = self.specification_id.width
                 self.cutting_tool_cut_blade_length = self.specification_id.cutting_blade_length
                 self.cutting_tool_blade_tip_circular_arc_radius = self.specification_id.blade_tip_circular_arc_radius
-                self.cutting_tool_blade_tip_height_tolerance = self.cutting_tool_model_id.blade_tip_height_tolerance
+                self.cutting_tool_blade_tip_height_tolerance = self.specification_id.blade_tip_height_tolerance
                 self.cutting_tool_inscribed_circle_diameter = self.specification_id.inscribed_circle_diameter
                 self.cutting_tool_inscribed_circle_tolerance = self.specification_id.inscribed_circle_tolerance
                 self.cutting_tool_install_aperture_diameter = self.specification_id.install_aperture_diameter
@@ -233,21 +256,23 @@ class ResProductMo(models.Model):
                 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.cutting_tool_model_id.pitch
+                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
                 self.cutting_tool_thread_model = self.specification_id.thread_model
                 self.cutting_tool_thread_num = self.specification_id.thread_num
-                self.cutting_tool_cutter_bar_ids = self.cutting_tool_model_id.cutting_tool_cutter_bar_ids.ids
-                self.cutting_tool_cutter_pad_ids = self.cutting_tool_model_id.cutting_tool_cutter_pad_ids.ids
-            elif self.cutting_tool_type in ('刀盘','刀杆'):
+                self.cutting_tool_cutter_bar_ids = self.cutting_tool_model_id.cutter_bar_ids.ids
+                self.cutting_tool_cutter_pad_ids = self.cutting_tool_model_id.cutter_pad_ids.ids
+                self.cutting_speed_ids = self.cutting_tool_model_id.cutting_speed_ids
+                self.feed_per_tooth_ids = self.cutting_tool_model_id.feed_per_tooth_ids
+            elif self.cutting_tool_type in ('刀盘', '刀杆'):
                 self.cutting_tool_total_length = self.specification_id.total_length
                 self.tool_length = self.specification_id.length
                 self.tool_thickness = self.specification_id.thickness
                 self.tool_width = self.specification_id.width
                 self.cutting_tool_cut_blade_length = self.specification_id.cutting_blade_length
                 self.cutting_tool_blade_tip_circular_arc_radius = self.specification_id.blade_tip_circular_arc_radius
-                self.cutting_tool_blade_tip_height_tolerance = self.cutting_tool_model_id.blade_tip_height_tolerance
+                self.cutting_tool_blade_tip_height_tolerance = self.specification_id.blade_tip_height_tolerance
                 self.cutting_tool_inscribed_circle_diameter = self.specification_id.inscribed_circle_diameter
                 self.cutting_tool_inscribed_circle_tolerance = self.specification_id.inscribed_circle_tolerance
                 self.cutting_tool_install_aperture_diameter = self.specification_id.install_aperture_diameter
@@ -274,14 +299,12 @@ class ResProductMo(models.Model):
                 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.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)]
-            self.blade_tip_characteristics_ids = [(6, 0,
-                                                   [])] if not self.cutting_tool_model_id.blade_tip_characteristics_ids else [
-                (6, 0, self.cutting_tool_model_id.blade_tip_characteristics_ids.ids)]
+            self.blade_tip_characteristics_id = [(6, 0,
+                                                   [])] if not self.cutting_tool_model_id.blade_tip_characteristics_id else [
+                (6, 0, self.cutting_tool_model_id.blade_tip_characteristics_id.ids)]
 
             self.handle_type_ids = [(6, 0,
                                      [])] if not self.cutting_tool_model_id.handle_type_ids else [
@@ -297,17 +320,6 @@ class ResProductMo(models.Model):
             self.compaction_way_ids = [(6, 0,
                                         [])] if not self.cutting_tool_model_id.compaction_way_ids else [
                 (6, 0, self.cutting_tool_model_id.compaction_way_ids.ids)]
-            if self.cutting_tool_type == '整体式刀具':
-                self.cutting_speed_ids = self.cutting_tool_model_id.cutting_speed_ids
-                self.feed_per_tooth_ids = [(0, 0, {'product_template_id': product_template.id,
-                                                   'cutting_speed': product_template.cutting_speed,
-                                                   'machining_method': product_template.machining_method,
-                                                   'blade_diameter': product_template.blade_diameter,
-                                                   'materials_type_id': product_template.materials_type_id.id}) for
-                                           product_template in
-                                           self.cutting_tool_model_id.feed_per_tooth_ids.filtered(
-                                               lambda r: r.blade_diameter == self.specification_id.blade_diameter)]
-
 
 
     # @api.constrains('suitable_machining_method_ids')
@@ -413,7 +425,7 @@ class ResProductMo(models.Model):
     cutting_tool_inscribed_circle_diameter = fields.Char('内接圆直径(mm)', size=20)
     cutting_tool_install_aperture_diameter = fields.Char('安装孔直径(mm)', size=20)
     cutting_tool_chip_breaker_groove = fields.Selection([('无', '无'), ('单面', '单面'), ('双面', '双面')],
-                                           string='有无断屑槽')
+                                                        string='有无断屑槽')
     cutting_tool_bladed_teeth_model = fields.Selection(
         [('无', '无'), ('V牙型', 'V牙型'), ('米制全牙型', '米制全牙型'), ('美制全牙型', '美制全牙型'),
          ('惠氏全牙型', '惠氏全牙型'), ('BSPT全牙型', 'BSPT全牙型'), ('NPT全牙型', 'NPT全牙型'),
@@ -427,7 +439,8 @@ class ResProductMo(models.Model):
 
     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_model = fields.Selection([('无', '无'), ('外螺纹', '外螺纹'), ('内螺纹', '内螺纹')],
+                                                 string='螺纹类型')
     cutting_tool_thread_num = fields.Char('每英寸螺纹数(tpi)', size=20)
     cutting_tool_blade_tip_height_tolerance = fields.Char('刀尖高度公差(mm)', size=20)
     cutting_tool_inscribed_circle_tolerance = fields.Char('内接圆公差(mm)', size=20)
@@ -516,7 +529,6 @@ class ResProductMo(models.Model):
         string='适用刀柄型号'
     )
 
-
     # 夹具参数
     fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料")
     fixture_model_id = fields.Many2one('sf.fixture.model', string="夹具型号")
@@ -645,7 +657,6 @@ class ResProductMo(models.Model):
             self.detailed_type = 'product'
             self.sale_ok = False
 
-
     @api.onchange('fixture_material_id')
     def _onchange_fixture_material_id(self):
         for item in self:
@@ -682,16 +693,6 @@ class ResProductMo(models.Model):
                     item.fixture_apply_machine_tool_type_ids = self._get_ids(
                         item.fixture_model_id.apply_machine_tool_type_ids)
 
-    @api.onchange('cutting_tool_model_id')
-    def _onchange_cutting_tool_model_id(self):
-        if self.cutting_tool_model_id:
-            if self.cutting_tool_type == '刀片':
-                self.env['sf.tool.materials.basic.parameters'].search([('standard_library_id',=)])
-                self.specification_id = self.cutting_tool_model_id.
-
-
-
-
 
     def _get_volume_uom_id_from_ir_config_parameter(self):
         product_length_in_feet_param = self.env['ir.config_parameter'].sudo().get_param('product.volume_in_cubic_feet')
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index f8febd9f..c3679969 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -1818,12 +1818,12 @@ class Cutting_tool_standard_library(models.Model):
                             'sf.cutting.tool.type']._get_ids(item['cutter_bar_codes']),
                         "cutter_pad_ids": [(6, 0, [])] if not item.get('cutter_pad_codes') else self.env[
                             'sf.cutting.tool.type']._get_ids(item['cutter_pad_codes']),
-                        "fit_blade_shape_ids": [(6, 0, [])] if not item.get('fit_blade_shape') else self.env[
+                        "fit_blade_shape_id": [(6, 0, [])] if not item.get('fit_blade_shape') else self.env[
                             'maintenance.equipment.image']._get_ids(item['fit_blade_shape']),
                         "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']),
-                        "blade_tip_characteristics_ids": [(6, 0, [])] if not item.get('blade_tip_characteristics') else
+                        "blade_tip_characteristics_id": [(6, 0, [])] if not item.get('blade_tip_characteristics') else
                         self.env['maintenance.equipment.image']._get_ids(item['blade_tip_characteristics']),
                         "handle_type_ids": [(6, 0, [])] if not item.get('handle_type') else self.env[
                             'maintenance.equipment.image']._get_ids(item['handle_type']),
@@ -1864,12 +1864,12 @@ class Cutting_tool_standard_library(models.Model):
                              'sf.cutting.tool.type']._get_ids(item['cutter_bar_codes']),
                          "cutter_pad_ids": [(6, 0, [])] if not item.get('cutter_pad_codes') else self.env[
                              'sf.cutting.tool.type']._get_ids(item['cutter_pad_codes']),
-                         "fit_blade_shape_ids": [(6, 0, [])] if not item.get('fit_blade_shape') else self.env[
+                         "fit_blade_shape_id": [(6, 0, [])] if not item.get('fit_blade_shape') else self.env[
                              'maintenance.equipment.image']._get_ids(item['fit_blade_shape']),
                          "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']),
-                         "blade_tip_characteristics_ids": [(6, 0, [])] if not item.get('blade_tip_characteristics') else
+                         "blade_tip_characteristics_id": [(6, 0, [])] if not item.get('blade_tip_characteristics') else
                          self.env['maintenance.equipment.image']._get_ids(item['blade_tip_characteristics']),
                          "handle_type_ids": [(6, 0, [])] if not item.get('handle_type') else self.env[
                              'maintenance.equipment.image']._get_ids(item['handle_type']),
@@ -1979,12 +1979,12 @@ class Cutting_tool_standard_library(models.Model):
                             'sf.cutting.tool.type']._get_ids(item['cutter_bar_codes']),
                         "cutter_pad_ids": [(6, 0, [])] if not item.get('cutter_pad_codes') else self.env[
                             'sf.cutting.tool.type']._get_ids(item['cutter_pad_codes']),
-                        "fit_blade_shape_ids": [(6, 0, [])] if not item.get('fit_blade_shape') else self.env[
+                        "fit_blade_shape_id": [(6, 0, [])] if not item.get('fit_blade_shape') else self.env[
                             'maintenance.equipment.image']._get_ids(item['fit_blade_shape']),
                         "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']),
-                        "blade_tip_characteristics_ids": [(6, 0, [])] if not item.get('blade_tip_characteristics') else
+                        "blade_tip_characteristics_id": [(6, 0, [])] if not item.get('blade_tip_characteristics') else
                         self.env['maintenance.equipment.image']._get_ids(item['blade_tip_characteristics']),
                         "handle_type_ids": [(6, 0, [])] if not item.get('handle_type') else self.env[
                             'maintenance.equipment.image']._get_ids(item['handle_type']),
@@ -2025,12 +2025,12 @@ class Cutting_tool_standard_library(models.Model):
                              'sf.cutting.tool.type']._get_ids(item['cutter_bar_codes']),
                          "cutter_pad_ids": [(6, 0, [])] if not item.get('cutter_pad_codes') else self.env[
                              'sf.cutting.tool.type']._get_ids(item['cutter_pad_codes']),
-                         "fit_blade_shape_ids": [(6, 0, [])] if not item.get('fit_blade_shape') else self.env[
+                         "fit_blade_shape_id": [(6, 0, [])] if not item.get('fit_blade_shape') else self.env[
                              'maintenance.equipment.image']._get_ids(item['fit_blade_shape']),
                          "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']),
-                         "blade_tip_characteristics_ids": [(6, 0, [])] if not item.get('blade_tip_characteristics') else
+                         "blade_tip_characteristics_id": [(6, 0, [])] if not item.get('blade_tip_characteristics') else
                          self.env['maintenance.equipment.image']._get_ids(item['blade_tip_characteristics']),
                          "handle_type_ids": [(6, 0, [])] if not item.get('handle_type') else self.env[
                              'maintenance.equipment.image']._get_ids(item['handle_type']),
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index a55f4f17..142ab8d1 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -65,10 +65,10 @@ class FunctionalCuttingToolEntity(models.Model):
                                                      domain=[('type', '=', '加工能力')],
                                                      related='cutting_tool_integral_model_id.suitable_machining_method_ids')
 
-    blade_tip_characteristics_ids = fields.Many2many('maintenance.equipment.image',
+    blade_tip_characteristics_id = fields.Many2many('maintenance.equipment.image',
                                                      'rel_blade_tip_product_template_tool_entity', '刀尖特征',
                                                      domain=[('type', '=', '刀尖特征')],
-                                                     related='cutting_tool_integral_model_id.blade_tip_characteristics_ids')
+                                                     related='cutting_tool_integral_model_id.blade_tip_characteristics_id')
 
     handle_type_ids = fields.Many2many('maintenance.equipment.image',
                                        'rel_handle_product_template_tool_entity', '柄部类型',
diff --git a/sf_tool_management/models/tool_material_search.py b/sf_tool_management/models/tool_material_search.py
index 91782faf..f03738b6 100644
--- a/sf_tool_management/models/tool_material_search.py
+++ b/sf_tool_management/models/tool_material_search.py
@@ -97,7 +97,7 @@ class SfToolMaterialSearch(models.Model):
     suitable_machining_method_ids = fields.Many2many('maintenance.equipment.image',
                                                      'rel_machining_product_template_material_search', '适合加工方式',
                                                      domain=[('type', '=', '加工能力')])
-    blade_tip_characteristics_ids = fields.Many2many('maintenance.equipment.image',
+    blade_tip_characteristics_id = fields.Many2many('maintenance.equipment.image',
                                                      'rel_blade_tip_product_template_material_search', '刀尖特征',
                                                      domain=[('type', '=', '刀尖特征')])
     handle_type_ids = fields.Many2many('maintenance.equipment.image',
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 0e9f7386..2396af30 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -100,8 +100,8 @@
                             </group>
                             <group>
                                 <group string="刀尖特征">
-                                    <field name="blade_tip_characteristics_ids" string="" widget="custom_many2many_checkboxes"
-                                           domain="[('id','in',blade_tip_characteristics_ids)]"/>
+                                    <field name="blade_tip_characteristics_id" string="" widget="custom_many2many_checkboxes"
+                                           domain="[('id','in',blade_tip_characteristics_id)]"/>
                                 </group>
                                 <group string="柄部类型">
                                     <field name="handle_type_ids" string="" widget="custom_many2many_checkboxes"
diff --git a/sf_tool_management/views/tool_material_search.xml b/sf_tool_management/views/tool_material_search.xml
index 383fb0e5..768786e6 100644
--- a/sf_tool_management/views/tool_material_search.xml
+++ b/sf_tool_management/views/tool_material_search.xml
@@ -231,7 +231,7 @@
                                 </group>
                                 <group>
                                     <group string="刀尖特征">
-                                        <field name="blade_tip_characteristics_ids" string="" widget="custom_many2many_checkboxes"/>
+                                        <field name="blade_tip_characteristics_id" string="" widget="custom_many2many_checkboxes"/>
                                     </group>
                                     <group string="柄部类型">
                                         <field name="handle_type_ids" string="" widget="custom_many2many_checkboxes"/>

From 401103f17b2ccc201661b118becf1c688d746848 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 1 Nov 2023 17:51:46 +0800
Subject: [PATCH 19/21] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BD=AC=E6=8D=A2=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/product_template.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 8c6546c3..bcd32b08 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -2,8 +2,8 @@ from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
 from odoo.modules import get_resource_path
 from odoo.addons.sf_base.commons.common import Common
-# from OCC.Extend.DataExchange import read_step_file
-# from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 import logging
 import base64
 import hashlib

From 36270477d5e7125752ed23f284e4affee5dbe688 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Thu, 2 Nov 2023 17:17:34 +0800
Subject: [PATCH 20/21] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=88=80=E5=85=B7=E6=A0=87=E5=87=86=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/tool_base_new.py               | 29 ++++++-------
 sf_base/models/tool_other_features.py         | 42 +++++++++----------
 sf_base/views/tool_basic_param.xml            |  2 +-
 sf_base/views/tool_views.xml                  | 14 +++----
 sf_dlm/views/product_template_view.xml        |  2 +-
 sf_manufacturing/models/product_template.py   | 17 ++++----
 sf_mrs_connect/__manifest__.py                |  1 +
 sf_mrs_connect/models/res_config_setting.py   |  4 +-
 sf_mrs_connect/models/sync_common.py          | 24 +++++++----
 sf_mrs_connect/security/ir.model.access.csv   |  7 ++++
 sf_tool_management/models/base.py             |  4 +-
 .../models/tool_material_search.py            | 12 +++---
 12 files changed, 85 insertions(+), 73 deletions(-)
 create mode 100644 sf_mrs_connect/security/ir.model.access.csv

diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py
index e2839763..4d4c702a 100644
--- a/sf_base/models/tool_base_new.py
+++ b/sf_base/models/tool_base_new.py
@@ -26,7 +26,7 @@ class FunctionalCuttingTool(models.Model):
     name = fields.Char('名称')
     active = fields.Boolean('有效', default=True)
     mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型')
-    mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', string='刀具型号')
+    mrs_cutting_tool_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀具型号')
 
     # # 整体式刀具型号
     # mrs_cutting_tool_integral_model_ids = fields.Many2many('sf.cutting.tool.model', 'rel_integral_model_functional_sf',
@@ -103,14 +103,6 @@ class CuttingToolType(models.Model):
     remark = fields.Char('备注')
     active = fields.Boolean('有效', default=True)
 
-    def _get_ids(self, cutting_tool_type_code):
-        cutting_tool_type_ids = []
-        for item in cutting_tool_type_code:
-            cutting_tool_type = self.search([('code', '=', item)])
-            if cutting_tool_type:
-                cutting_tool_type_ids.append(cutting_tool_type.id)
-        return [(6, 0, cutting_tool_type_ids)]
-
 
 # 刀具标准库
 class CuttingToolModel(models.Model):
@@ -180,14 +172,14 @@ class CuttingToolModel(models.Model):
     material_model_id = fields.Many2one('sf.materials.model', '材料型号')
     # 适用夹头型号可以多选
     chuck_ids = fields.Many2many(
-        'sf.cutting.tool.type',
+        '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(
-        'sf.cutting.tool.type',
+        'sf.cutting_tool.standard.library',
         relation='cutting_tool_type_library_cutter_bar_rel',
         column1='model_id_1',
         column2='model_id_2',
@@ -195,7 +187,7 @@ class CuttingToolModel(models.Model):
         string='适用刀杆型号'
     )
     cutter_pad_ids = fields.Many2many(
-        'sf.cutting.tool.type',
+        'sf.cutting_tool.standard.library',
         relation='cutting_tool_type_library_cutter_pad_rel',
         column1='model_id_1',
         column2='model_id_2',
@@ -204,7 +196,7 @@ class CuttingToolModel(models.Model):
     )
     # 刀杆/参数
     blade_ids = fields.Many2many(
-        'sf.cutting.tool.type',
+        'sf.cutting_tool.standard.library',
         relation='cutting_tool_type_library_pad_blade_rel',
         column1='model_id_1',
         column2='model_id_2',
@@ -212,7 +204,7 @@ class CuttingToolModel(models.Model):
         string='适用刀片型号'  # 使用空列表作为默认值
     )
     handle_ids = fields.Many2many(
-        'sf.cutting.tool.type',
+        'sf.cutting_tool.standard.library',
         relation='cutting_tool_type_library_chuck_handle_rel',
         column1='model_id_1',
         column2='model_id_2',
@@ -222,8 +214,13 @@ class CuttingToolModel(models.Model):
     active = fields.Boolean('有效', default=True)
     is_cloud = fields.Boolean('云端数据', default=False)
 
-    # def get_cutter_bar_ids(self):
-    #     return self.cutter_bar_ids
+    def _get_ids(self, cutting_tool_type_code, factory_short_name):
+        cutting_tool_type_ids = []
+        for item in cutting_tool_type_code:
+            cutting_tool_type = self.search([('code', '=', item.replace("JKM", factory_short_name))])
+            if cutting_tool_type:
+                cutting_tool_type_ids.append(cutting_tool_type.id)
+        return [(6, 0, cutting_tool_type_ids)]
 
 
 class MaintenanceStandardImage(models.Model):
diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py
index f97c9a9f..9d7c57ea 100644
--- a/sf_base/models/tool_other_features.py
+++ b/sf_base/models/tool_other_features.py
@@ -41,11 +41,11 @@ class ToolMaterialsBasicParameters(models.Model):
     chip_breaker_groove = fields.Selection([('无', '无'), ('单面', '单面'), ('双面', '双面')],
                                            string='有无断屑槽')
     blade_teeth_model = fields.Selection(
-        [('V牙型', 'V牙型'), ('米制全牙型', '米制全牙型'), ('美制全牙型', '美制全牙型'),
+        [('无', '无'), ('V牙型', 'V牙型'), ('米制全牙型', '米制全牙型'), ('美制全牙型', '美制全牙型'),
          ('惠氏全牙型', '惠氏全牙型'), ('BSPT全牙型', 'BSPT全牙型'), ('NPT全牙型', 'NPT全牙型'),
          ('UNJ全牙型', 'UNJ全牙型'), ('DIN405圆牙型', 'DIN405圆牙型'), ('ACME梯形', 'ACME梯形'),
          ('石油管螺纹刀片', '石油管螺纹刀片'), ('矮牙ACME梯形', '矮牙ACME梯形'),
-         ('Trapeze30° 103', 'Trapeze30° 103')], string='刀片牙型')
+         ('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='刀片的刃数(个)')
@@ -53,7 +53,7 @@ class ToolMaterialsBasicParameters(models.Model):
     top_angle = fields.Integer('顶角(°)')
     blade_tip_dip_angle = fields.Integer('刀尖倾角(°)')
     side_cutting_edge_angle = fields.Integer('侧切削角(°)')
-    thread_model = fields.Selection([('外螺纹', '外螺纹'), ('内螺纹', '内螺纹')], string='螺纹类型')
+    thread_model = fields.Selection([('无', '无'), ('外螺纹', '外螺纹'), ('内螺纹', '内螺纹')], string='螺纹类型', default='无')
     thread_num = fields.Char('每英寸螺纹数(tpi)', size=20)
     blade_tip_height_tolerance = fields.Char('刀尖高度公差(mm)', size=20)
     inscribed_circle_tolerance = fields.Char('内接圆公差(mm)', size=20)
@@ -66,7 +66,7 @@ class ToolMaterialsBasicParameters(models.Model):
     min_machining_aperture = fields.Char('最小加工孔径(mm)', size=20)
     install_blade_tip_num = fields.Char('可装刀片数/齿数(个)', size=20)
     cutting_blade_model = fields.Char('切削类型', size=20)
-    cooling_hole = fields.Selection([('有', '有'), ('无', '无')], string='有无冷却孔')
+    is_cooling_hole = fields.Boolean('有无冷却孔', default=False)
     locating_slot_code = fields.Char('定位槽代号', size=20)
     installing_structure = fields.Char('安装结构', size=20)
     blade_ids = fields.Many2many(
@@ -99,11 +99,11 @@ class ToolMaterialsBasicParameters(models.Model):
     max_rotate_speed = fields.Char('最大转速(n/min)', size=20)
     diameter_slip_accuracy = fields.Char('径跳精度(mm)', size=20)
     cooling_model = fields.Char('冷却类型', size=20)
-    is_rough_machining = fields.Selection([('是', '是'), ('否', '否')], string='是否可粗加工')
-    is_finish_machining = fields.Selection([('是', '是'), ('否', '否')], string='是否可精加工')
-    is_quick_cutting = fields.Selection([('是', '是'), ('否', '否')], string='是否可高速切削')
-    is_drill_hole = fields.Selection([('是', '是'), ('否', '否')], string='是否可钻孔')
-    is_safe_lock = fields.Selection([('是', '是'), ('否', '否')], string='有无安全锁')
+    is_rough_machining = fields.Boolean('可粗加工', default=False)
+    is_finish_machining = fields.Boolean('可精加工', default=False)
+    is_quick_cutting = fields.Boolean('可高速切削', default=False)
+    is_drill_hole = fields.Boolean('可钻孔', default=False)
+    is_safe_lock = fields.Boolean('有无安全锁', default=False)
     # 夹头参数
     er_size_model = fields.Char('ER尺寸型号', size=20)
     outer_diameter = fields.Char('外径(mm)', size=20)
@@ -160,7 +160,7 @@ class ToolMaterialsBasicParameters(models.Model):
             'install_aperture_diameter': obj['install_aperture_diameter'],
             'pitch': obj['pitch'],
             'chip_breaker_groove': obj['chip_breaker_groove'],
-            'blade_teeth_model': obj['bladed_teeth_model'],
+            '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'],
@@ -168,7 +168,7 @@ class ToolMaterialsBasicParameters(models.Model):
             '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': obj['thread_model'],
+            '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'],
@@ -194,10 +194,10 @@ class ToolMaterialsBasicParameters(models.Model):
             'min_machining_aperture': obj['min_machining_aperture'],
             'install_blade_tip_num': obj['install_blade_tip_num'],
             'cutting_blade_model': obj['cutting_blade_model'],
-            'cooling_hole': obj['cooling_hole'],
+            '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.type']._get_ids(
+            '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'],
@@ -220,12 +220,12 @@ class ToolMaterialsBasicParameters(models.Model):
             '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.type']._get_ids(
+            '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'],
-            'cooling_hole': obj['cooling_hole'],
+            'is_cooling_hole': obj['is_cooling_hole'],
             'locating_slot_code': obj['locating_slot_code'],
         })
         return cutter_head_basic_param_str
@@ -248,11 +248,11 @@ class ToolMaterialsBasicParameters(models.Model):
             'max_rotate_speed': obj['max_rotate_speed'],
             'diameter_slip_accuracy': obj['diameter_slip_accuracy'],
             'cooling_model': obj['cooling_model'],
-            'is_rough_machining': obj['whether_rough_machining'],
-            'is_finish_machining': obj['whether_finish_machining'],
-            'is_quick_cutting': obj['whether_quick_cutting'],
-            'is_drill_hole': obj['whether_drill_hole'],
-            'is_safe_lock': obj['whether_safe_lock'],
+            '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'],
         })
@@ -278,7 +278,7 @@ class ToolMaterialsBasicParameters(models.Model):
             '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.type']._get_ids(obj['handle_codes']),
+                '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
diff --git a/sf_base/views/tool_basic_param.xml b/sf_base/views/tool_basic_param.xml
index 1cc631f0..a512de10 100644
--- a/sf_base/views/tool_basic_param.xml
+++ b/sf_base/views/tool_basic_param.xml
@@ -70,7 +70,7 @@
                 <field name="min_machining_aperture" />
                 <field name="install_blade_tip_num"/>
                 <field name="cutting_blade_model"/>
-                 <field name="cooling_hole" />
+                 <field name="is_cooling_hole" />
                 <field name="locating_slot_code" />
                 <field name="installing_structure"/>
                 <field name="blade_ids"/>
diff --git a/sf_base/views/tool_views.xml b/sf_base/views/tool_views.xml
index fe2fcf5c..c1e03123 100644
--- a/sf_base/views/tool_views.xml
+++ b/sf_base/views/tool_views.xml
@@ -274,7 +274,7 @@
                                         <field name="min_machining_aperture" class="diameter"/>
                                         <field name="install_blade_tip_num"/>
                                         <field name="cutting_blade_model"/>
-                                        <field name="cooling_hole" placeholder="请选择"/>
+                                        <field name="is_cooling_hole" />
                                         <field name="locating_slot_code"/>
                                         <field name="installing_structure"/>
                                         <field name="blade_ids" widget="many2many_tags" placeholder="请选择"/>
@@ -304,7 +304,7 @@
                                         <field name="screw"/>
                                         <field name="spanner"/>
                                         <field name="cutting_blade_model"/>
-                                        <field name="cooling_hole" placeholder="请选择"/>
+                                        <field name="is_cooling_hole" />
                                         <field name="locating_slot_code"/>
                                     </tree>
                                 </field>
@@ -328,11 +328,11 @@
                                         <field name="max_rotate_speed"/>
                                         <field name="diameter_slip_accuracy"/>
                                         <field name="cooling_model"/>
-                                        <field name="is_rough_machining" placeholder="请选择"/>
-                                        <field name="is_finish_machining" placeholder="请选择"/>
-                                        <field name="is_quick_cutting" placeholder="请选择"/>
-                                        <field name="is_drill_hole" placeholder="请选择"/>
-                                        <field name="is_safe_lock" placeholder="请选择"/>
+                                        <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>
diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index 130be2c4..b212ddef 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -393,7 +393,7 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '刀杆')]}"/>
                                 <field name="cutting_tool_installing_structure"
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
-                                <field name="cutting_tool_cooling_hole"
+                                <field name="cutting_tool_is_cooling_hole"
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
                                 <field name="cutting_tool_locating_slot_code"
                                        attrs="{'invisible': [('cutting_tool_type', 'not in', ('刀杆','刀盘'))]}"/>
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index bcd32b08..6981103d 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -73,7 +73,7 @@ class ResProductMo(models.Model):
     tool_length = fields.Float('长度(mm)')
     tool_width = fields.Float('宽度(mm)')
     tool_height = fields.Float('高度(mm)')
-    tool_thickness = fields.Integer('厚度(mm)')
+    tool_thickness = fields.Float('厚度(mm)')
     tool_weight = fields.Float('重量(kg)')
     tool_hardness = fields.Integer('硬度(hrc)')
 
@@ -81,7 +81,7 @@ class ResProductMo(models.Model):
     # 整体式刀具特有字段
     cutting_tool_total_length = fields.Float('总长度(mm)', digits=(6, 1))
     cutting_tool_shank_length = fields.Float('柄部长度(mm)', digits=(6, 1))
-    cutting_tool_blade_length = fields.Float('刃部长度(mm)', digits=(6, 1))
+    cutting_tool_blade_length = fields.Char('刃部长度(mm)')
     cutting_tool_blade_number = fields.Selection(
         [('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8')], '刃数(个)')
     # 整体式刀具新增字段
@@ -227,7 +227,7 @@ class ResProductMo(models.Model):
                 self.cutting_tool_clamping_diameter_min = self.specification_id.min_clamping_diameter
                 self.cutting_tool_clamping_diameter_min = self.specification_id.max_clamping_diameter
                 self.cutting_tool_clamping_way = self.specification_id.clamping_mode
-                self.cutting_tool_top_diameter = self.cutting_tool_model_id.top_diameter
+                self.cutting_tool_top_diameter = self.specification_id.top_diameter
                 self.cutting_tool_outer_diameter = self.specification_id.outer_diameter
                 self.cutting_tool_inner_diameter = self.specification_id.inner_diameter
                 self.tool_weight = self.specification_id.weight
@@ -290,7 +290,7 @@ class ResProductMo(models.Model):
                     self.cutting_tool_interface_diameter = self.specification_id.interface_diameter
             elif self.cutting_tool_type == '刀柄':
                 self.cutting_tool_total_length = self.specification_id.total_length
-                self.cutting_tool_standard_speed = self.specification_id.standard_speed
+                self.cutting_tool_standard_speed = self.specification_id.standard_rotate_speed
                 self.cutting_tool_speed_max = self.specification_id.speed_max
                 self.cutting_tool_change_time = self.specification_id.change_time
                 self.cutting_tool_total_length = self.specification_id.total_length
@@ -431,7 +431,7 @@ class ResProductMo(models.Model):
          ('惠氏全牙型', '惠氏全牙型'), ('BSPT全牙型', 'BSPT全牙型'), ('NPT全牙型', 'NPT全牙型'),
          ('UNJ全牙型', 'UNJ全牙型'), ('DIN405圆牙型', 'DIN405圆牙型'), ('ACME梯形', 'ACME梯形'),
          ('石油管螺纹刀片', '石油管螺纹刀片'), ('矮牙ACME梯形', '矮牙ACME梯形'),
-         ('Trapeze30° 103', 'Trapeze30° 103')], string='刀片牙型')
+         ('Trapeze30° 103', 'Trapeze30° 103')], string='刀片牙型', default='无')
     cutting_tool_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')],
@@ -486,9 +486,8 @@ class ResProductMo(models.Model):
     cutting_tool_pressing_plate = fields.Char('适配压板型号', size=50)
     cutting_tool_screw = fields.Char('适配螺钉型号', size=50)
     cutting_tool_wrench = fields.Char('适配扳手型号')
-    cutting_tool_cooling_hole = fields.Selection([('有', '有'), ('无', '无')], string='有无冷却孔')
+    cutting_tool_is_cooling_hole = fields.Boolean('有无冷却孔', default=False)
     cutting_tool_locating_slot_code = fields.Char('定位槽代号', size=20)
-
     # 刀盘参数
     cutting_tool_cutter_head_diameter = fields.Char('刀盘直径(mm)', size=20)
     cutting_tool_interface_diameter = fields.Char('接口直径(mm)', size=20)
@@ -505,11 +504,11 @@ class ResProductMo(models.Model):
     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_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_standard_speed = fields.Integer('标准转速(n/min)')
+    cutting_tool_standard_speed = fields.Char('标准转速(n/min)')
     cutting_tool_speed_max = fields.Integer('最大转速(n/min)')
     cutting_tool_cooling_type = fields.Char('冷却类型')
     # 夹头参数
diff --git a/sf_mrs_connect/__manifest__.py b/sf_mrs_connect/__manifest__.py
index b1955012..3ccd3ac4 100644
--- a/sf_mrs_connect/__manifest__.py
+++ b/sf_mrs_connect/__manifest__.py
@@ -13,6 +13,7 @@
     'depends': ['sf_base', 'base_setup'],
     'data': [
         'data/ir_cron_data.xml',
+        'security/ir.model.access.csv',
         'views/res_config_settings_views.xml'
     ],
     'demo': [
diff --git a/sf_mrs_connect/models/res_config_setting.py b/sf_mrs_connect/models/res_config_setting.py
index 549e3ce1..91bd52c6 100644
--- a/sf_mrs_connect/models/res_config_setting.py
+++ b/sf_mrs_connect/models/res_config_setting.py
@@ -48,7 +48,7 @@ class ResConfigSettings(models.TransientModel):
             self.env['sf.cutting.tool.material'].sync_all_cutting_tool_material()
             _logger.info("同步刀具类型完成")
             self.env['sf.cutting.tool.type'].sync_all_tool_type()
-            _logger.info("同步所有刀具型号完成")
+            _logger.info("同步功能刀具类型完成")
             self.env['sf.functional.cutting.tool.model'].sync_all_functional_cutting_tool_model()
             _logger.info("同步夹具物料完成")
             self.env['sf.fixture.material'].sync_all_fixture_material()
@@ -56,7 +56,7 @@ class ResConfigSettings(models.TransientModel):
             self.env['sf.multi_mounting.type'].sync_all_multi_mounting_type()
             _logger.info("同步夹具型号完成")
             self.env['sf.fixture.model'].sync_all_fixture_model()
-            _logger.info("同步功能夹具类型完成")
+            _logger.info("同步夹具型号类型完成")
             self.env['sf.functional.fixture.type'].sync_all_functional_fixture_type()
             _logger.info("同步功能夹具类型完成")
             self.env['sf.machine_tool.type'].sync_all_machine_tool_type()
diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py
index c3679969..6d5a819c 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -1815,9 +1815,11 @@ class Cutting_tool_standard_library(models.Model):
                         "integral_run_out_accuracy_max": item['integral_run_out_accuracy_max'],
                         "integral_run_out_accuracy_min": item['integral_run_out_accuracy_min'],
                         "cutter_bar_ids": [(6, 0, [])] if not item.get('cutter_bar_codes') else self.env[
-                            'sf.cutting.tool.type']._get_ids(item['cutter_bar_codes']),
+                            'sf.cutting_tool.standard.library']._get_ids(item['cutter_bar_codes'],
+                                                                         result['factory_short_name']),
                         "cutter_pad_ids": [(6, 0, [])] if not item.get('cutter_pad_codes') else self.env[
-                            'sf.cutting.tool.type']._get_ids(item['cutter_pad_codes']),
+                            'sf.cutting_tool.standard.library']._get_ids(item['cutter_pad_codes'],
+                                                                         result['factory_short_name']),
                         "fit_blade_shape_id": [(6, 0, [])] if not item.get('fit_blade_shape') else self.env[
                             'maintenance.equipment.image']._get_ids(item['fit_blade_shape']),
                         "suitable_machining_method_ids": [(6, 0, [])] if not item.get(
@@ -1861,9 +1863,11 @@ class Cutting_tool_standard_library(models.Model):
                          "integral_run_out_accuracy_max": item['integral_run_out_accuracy_max'],
                          "integral_run_out_accuracy_min": item['integral_run_out_accuracy_min'],
                          "cutter_bar_ids": [(6, 0, [])] if not item.get('cutter_bar_codes') else self.env[
-                             'sf.cutting.tool.type']._get_ids(item['cutter_bar_codes']),
+                             'sf.cutting_tool.standard.library']._get_ids(item['cutter_bar_codes'],
+                                                                          result['factory_short_name']),
                          "cutter_pad_ids": [(6, 0, [])] if not item.get('cutter_pad_codes') else self.env[
-                             'sf.cutting.tool.type']._get_ids(item['cutter_pad_codes']),
+                             'sf.cutting_tool.standard.library']._get_ids(item['cutter_pad_codes'],
+                                                                          result['factory_short_name']),
                          "fit_blade_shape_id": [(6, 0, [])] if not item.get('fit_blade_shape') else self.env[
                              'maintenance.equipment.image']._get_ids(item['fit_blade_shape']),
                          "suitable_machining_method_ids": [(6, 0, [])] if not item.get(
@@ -1976,9 +1980,11 @@ class Cutting_tool_standard_library(models.Model):
                         "integral_run_out_accuracy_max": item['integral_run_out_accuracy_max'],
                         "integral_run_out_accuracy_min": item['integral_run_out_accuracy_min'],
                         "cutter_bar_ids": [(6, 0, [])] if not item.get('cutter_bar_codes') else self.env[
-                            'sf.cutting.tool.type']._get_ids(item['cutter_bar_codes']),
+                            'sf.cutting_tool.standard.library']._get_ids(item['cutter_bar_codes'],
+                                                                         result['factory_short_name']),
                         "cutter_pad_ids": [(6, 0, [])] if not item.get('cutter_pad_codes') else self.env[
-                            'sf.cutting.tool.type']._get_ids(item['cutter_pad_codes']),
+                            'sf.cutting_tool.standard.library']._get_ids(item['cutter_pad_codes'],
+                                                                         result['factory_short_name']),
                         "fit_blade_shape_id": [(6, 0, [])] if not item.get('fit_blade_shape') else self.env[
                             'maintenance.equipment.image']._get_ids(item['fit_blade_shape']),
                         "suitable_machining_method_ids": [(6, 0, [])] if not item.get(
@@ -2022,9 +2028,11 @@ class Cutting_tool_standard_library(models.Model):
                          "integral_run_out_accuracy_max": item['integral_run_out_accuracy_max'],
                          "integral_run_out_accuracy_min": item['integral_run_out_accuracy_min'],
                          "cutter_bar_ids": [(6, 0, [])] if not item.get('cutter_bar_codes') else self.env[
-                             'sf.cutting.tool.type']._get_ids(item['cutter_bar_codes']),
+                             'sf.cutting_tool.standard.library']._get_ids(item['cutter_bar_codes'],
+                                                                          result['factory_short_name']),
                          "cutter_pad_ids": [(6, 0, [])] if not item.get('cutter_pad_codes') else self.env[
-                             'sf.cutting.tool.type']._get_ids(item['cutter_pad_codes']),
+                             'sf.cutting_tool.standard.library']._get_ids(item['cutter_pad_codes'],
+                                                                          result['factory_short_name']),
                          "fit_blade_shape_id": [(6, 0, [])] if not item.get('fit_blade_shape') else self.env[
                              'maintenance.equipment.image']._get_ids(item['fit_blade_shape']),
                          "suitable_machining_method_ids": [(6, 0, [])] if not item.get(
diff --git a/sf_mrs_connect/security/ir.model.access.csv b/sf_mrs_connect/security/ir.model.access.csv
new file mode 100644
index 00000000..0ed43a62
--- /dev/null
+++ b/sf_mrs_connect/security/ir.model.access.csv
@@ -0,0 +1,7 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_sf_static_resource_datasync,sf_static_resource_datasync,model_sf_static_resource_datasync,base.group_user,1,1,1,1
+
+
+
+
+
diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 02d723ce..4b9edfe6 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -16,7 +16,7 @@ class FunctionalCuttingToolEntity(models.Model):
     barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
     name = fields.Char(related='barcode_id.name')
     functional_tool_name_id = fields.Many2one('product.product', string='功能刀具名称', readonly=True)
-    mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', string='刀具型号')
+    mrs_cutting_tool_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀具型号')
     mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型',
                                                group_expand='_read_group_mrs_cutting_tool_type_id', compute_sudo=True)
 
@@ -90,7 +90,7 @@ class FunctionalCuttingToolEntity(models.Model):
     def _get_functional_tool_model_ids(self, functional_tool_model_code):
         functional_tool_model_ids = []
         for item in functional_tool_model_code:
-            functional_tool_model = self.env['sf.cutting.tool.model'].search([('code', '=', item)])
+            functional_tool_model = self.env['sf.cutting_tool.standard.library'].search([('code', '=', item)])
             functional_tool_model_ids.append(functional_tool_model.id)
         return [(6, 0, functional_tool_model_ids)]
 
diff --git a/sf_tool_management/models/tool_material_search.py b/sf_tool_management/models/tool_material_search.py
index f03738b6..32b4d6a8 100644
--- a/sf_tool_management/models/tool_material_search.py
+++ b/sf_tool_management/models/tool_material_search.py
@@ -55,7 +55,7 @@ class SfToolMaterialSearch(models.Model):
     blade_radius = fields.Float('刀片刀尖半径(mm)')
     blade_nut = fields.Float('刀片配对螺母(mm)')
     mrs_cutting_tool_model_blade_cutter_bar_ids = fields.Many2many(
-        'sf.cutting.tool.model',
+        'sf.cutting_tool.standard.library',
         relation='sf_tool_material_search_blade_cutter_bar_rel',
         column1='model_id_1',
         column2='model_id_2',
@@ -64,7 +64,7 @@ class SfToolMaterialSearch(models.Model):
         default=lambda self: [],  # 使用空列表作为默认值
     )
     mrs_cutting_tool_model_blade_cutter_pad_ids = fields.Many2many(
-        'sf.cutting.tool.model',
+        'sf.cutting_tool.standard.library',
         relation='sf_tool_material_search_blade_cutter_pad_rel',
         column1='model_id_1',
         column2='model_id_2',
@@ -204,7 +204,7 @@ class SfToolMaterialSearch(models.Model):
     bar_blade_number = fields.Integer('刀杆刃数')
     bar_d_diameter = fields.Float('刀杆D刃径(mm)')
     mrs_cutting_tool_model_bar_blade_ids = fields.Many2many(
-        'sf.cutting.tool.model',
+        'sf.cutting_tool.standard.library',
         relation='sf_tool_material_search_bar_blade_rel',
         column1='model_id_1',
         column2='model_id_2',
@@ -226,7 +226,7 @@ class SfToolMaterialSearch(models.Model):
     pad_blade_number = fields.Integer('刀盘刃数')
     pad_d_diameter = fields.Float('刀盘D刃径(mm)')
     mrs_cutting_tool_model_pad_blade_ids = fields.Many2many(
-        'sf.cutting.tool.model',
+        'sf.cutting_tool.standard.library',
         relation='sf_tool_material_search_pad_blade_rel',
         column1='model_id_1',
         column2='model_id_2',
@@ -256,7 +256,7 @@ class SfToolMaterialSearch(models.Model):
     handle_body_accuracy = fields.Float('刀柄本体精度(mm)')
     handle_nut = fields.Float('刀柄配对螺母(mm)')
     mrs_cutting_tool_model_handle_chuck_model_ids = fields.Many2many(
-        'sf.cutting.tool.model',
+        'sf.cutting_tool.standard.library',
         relation='sf_tool_material_search_handle_chuck_rel',
         column1='model_id_1',
         column2='model_id_2',
@@ -280,7 +280,7 @@ class SfToolMaterialSearch(models.Model):
     chuck_height = fields.Float('夹头高度(mm)')
     chuck_nut = fields.Float('夹头配对螺母(mm)')
     mrs_cutting_tool_model_chuck_handle_model_ids = fields.Many2many(
-        'sf.cutting.tool.model',
+        'sf.cutting_tool.standard.library',
         relation='sf_tool_material_search_chuck_handle_rel',
         column1='model_id_1',
         column2='model_id_2',

From 686c049e52ec9a5e2cc4195f8188ff04c588cfe0 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Fri, 3 Nov 2023 10:42:09 +0800
Subject: [PATCH 21/21] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=80=E5=85=B7?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/tool_other_features.py       | 10 ++++++----
 sf_dlm/__manifest__.py                      |  2 +-
 sf_manufacturing/models/product_template.py |  4 ++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/sf_base/models/tool_other_features.py b/sf_base/models/tool_other_features.py
index 9d7c57ea..cb7e8eaf 100644
--- a/sf_base/models/tool_other_features.py
+++ b/sf_base/models/tool_other_features.py
@@ -61,6 +61,9 @@ class ToolMaterialsBasicParameters(models.Model):
     # 刀杆参数
     height = fields.Char('高度(mm)', size=20)
     blade_height = fields.Char('刃部高度(mm)', size=20)
+    knife_head_height = fields.Char('刀头高度(mm)', size=20)
+    knife_head_width = fields.Char('刀头宽度(mm)', size=20)
+    knife_head_length = fields.Char('刀头长度(mm)', size=20)
     cut_depth_max = fields.Char('最大切削深度(mm)', size=20)
     cutter_arbor_diameter = fields.Char('刀杆直径(mm)', size=20)
     min_machining_aperture = fields.Char('最小加工孔径(mm)', size=20)
@@ -182,11 +185,10 @@ class ToolMaterialsBasicParameters(models.Model):
             'cutting_tool_type': obj['cutting_tool_type'],
             'height': obj['height'],
             'width': obj['width'],
-            'blade_height': obj['blade_height'],
             'total_length': obj['total_length'],
-            'blade_width': obj['blade_width'],
-            'blade_length': obj['blade_length'],
-            'blade_height': obj['blade_height'],
+            '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'],
diff --git a/sf_dlm/__manifest__.py b/sf_dlm/__manifest__.py
index 5f692988..ed9e2053 100644
--- a/sf_dlm/__manifest__.py
+++ b/sf_dlm/__manifest__.py
@@ -10,7 +10,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['mrp', 'base', 'sale', 'sf_manufacturing', 'web_widget_model_viewer', 'mrp_subcontracting',
+    'depends': ['mrp', 'base', 'sf_manufacturing', 'web_widget_model_viewer', 'mrp_subcontracting',
                 'purchase_stock',
                 'uom', 'jikimo_frontend', 'product'],
     'data': [
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 6981103d..b1efb4a3 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -288,6 +288,10 @@ class ResProductMo(models.Model):
                     self.cutting_tool_blade_length = self.specification_id.blade_length
                     self.cutting_tool_cutter_head_diameter = self.specification_id.cutter_head_diameter
                     self.cutting_tool_interface_diameter = self.specification_id.interface_diameter
+                else:
+                    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
             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