From 018fecfc59ae2955547efe4d4d90f12d65426cf3 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Fri, 16 Jun 2023 10:02:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81?=
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/base.py                       |  27 -
 sf_base/models/fixture_base.py               | 240 ++++++
 sf_base/models/tool_base.py                  |  38 +-
 sf_base/security/ir.model.access.csv         |  20 +-
 sf_base/views/base_view.xml                  | 150 ----
 sf_base/views/fixture_base_view.xml          | 681 ++++++++++++++++
 sf_base/views/menu_fixture_view.xml          | 106 +++
 sf_base/views/menu_view.xml                  |  20 -
 sf_base/views/tool_base_menu.xml             |  44 +-
 sf_base/views/tool_base_views.xml            | 166 +++-
 sf_dlm/__manifest__.py                       |   7 +-
 sf_dlm/data/cutting_tool_data.xml            |  30 +
 sf_dlm/data/product_data.xml                 |  31 +-
 sf_dlm/models/__init__.py                    |   3 +-
 sf_dlm/models/product_template.py            | 356 ---------
 sf_dlm/views/product_template_view.xml       | 170 +++-
 sf_manufacturing/models/__init__.py          |   2 +
 sf_manufacturing/models/model_type.py        |  22 +-
 sf_manufacturing/models/product_template.py  | 684 ++++++++++++++++
 sf_manufacturing/models/product_workorder.py |  12 +
 sf_mrs_connect/data/ir_cron_data.xml         |  66 +-
 sf_mrs_connect/models/res_config_setting.py  | 109 +--
 sf_mrs_connect/models/sync_common.py         | 773 ++++++++++++++-----
 25 files changed, 2855 insertions(+), 905 deletions(-)
 create mode 100644 sf_base/models/fixture_base.py
 create mode 100644 sf_base/views/fixture_base_view.xml
 create mode 100644 sf_base/views/menu_fixture_view.xml
 create mode 100644 sf_dlm/data/cutting_tool_data.xml
 delete mode 100644 sf_dlm/models/product_template.py
 create mode 100644 sf_manufacturing/models/product_template.py
 create mode 100644 sf_manufacturing/models/product_workorder.py

diff --git a/sf_base/__manifest__.py b/sf_base/__manifest__.py
index 21f4d41d..2c05e1a2 100644
--- a/sf_base/__manifest__.py
+++ b/sf_base/__manifest__.py
@@ -19,6 +19,8 @@
         "views/menu_view.xml",
         "views/tool_base_views.xml",
         "views/tool_base_menu.xml",
+        'views/fixture_base_view.xml',
+        'views/menu_fixture_view.xml',
 
     ],
     'demo': [
diff --git a/sf_base/models/__init__.py b/sf_base/models/__init__.py
index f6e247d2..5b9136ae 100644
--- a/sf_base/models/__init__.py
+++ b/sf_base/models/__init__.py
@@ -1,5 +1,6 @@
 from . import base
 from . import common
 from . import tool_base
+from . import fixture_base
 
 
diff --git a/sf_base/models/base.py b/sf_base/models/base.py
index 4c77c114..aeb0c0ac 100644
--- a/sf_base/models/base.py
+++ b/sf_base/models/base.py
@@ -304,33 +304,6 @@ class MachineToolType(models.Model):
     code = fields.Char('编码')
 
 
-# 刀具
-class CuttingTool(models.Model):
-    _name = 'sf.cutting_tool.category'
-    _description = '刀具类别'
-    code = fields.Char('编码')
-    name = fields.Char('名称')
-    remark = fields.Text('备注')
-    active = fields.Boolean('有效', default=True)
-
-
-class CuttingToolType(models.Model):
-    _name = 'sf.cutting_tool.type'
-    _description = '刀具型号'
-    code = fields.Char('编码')
-    name = fields.Char('名称')
-    diameter = fields.Integer('直径')
-    long_blade = fields.Integer('避空长/刃长')
-    cone_angle_pitch = fields.Integer('锥角/节距')
-    shank_diameter = fields.Integer('柄径')
-    taper_shank_length = fields.Integer('锥柄长')
-    tool_length = fields.Integer('刀具总长')
-    blade_number = fields.Integer('刃数')
-    category_id = fields.Many2one('sf.cutting_tool.category', string='刀具类别')
-    brand_id = fields.Many2one('sf.machine.brand', string='品牌')
-    remark = fields.Text('备注')
-    active = fields.Boolean('有效', default=True)
-
 class MachineToolCategory(models.Model):
     _name = 'sf.machine_tool.category'
     _description = '机床类型'
diff --git a/sf_base/models/fixture_base.py b/sf_base/models/fixture_base.py
new file mode 100644
index 00000000..6ca48f71
--- /dev/null
+++ b/sf_base/models/fixture_base.py
@@ -0,0 +1,240 @@
+from odoo import models, fields
+
+'''============================定位元件型号====================================='''
+
+
+class FixtureSettingElement(models.Model):
+    _name = 'sf.fixture.setting.element'
+    _description = "定位元件型号"
+
+    code = fields.Char(string='编码', readonly=True)
+    name = fields.Char(string="型号名称", readonly=True)
+    setting_ele_type_id = fields.Many2one('sf.setting.element.type', string="定位元件类型", readonly=True)
+    brand_id = fields.Many2one('sf.machine.brand', string="品牌", readonly=True)
+
+    length = fields.Char(string='长度(mm)', readonly=True)
+    width = fields.Char(string='宽度(mm)', readonly=True)
+    height = fields.Char(string='高度(mm)', readonly=True)
+    diameter = fields.Char(string='直径(mm)', readonly=True)
+
+    material_type_id = fields.Many2one('sf.materials.model', string='材料型号', readonly=True)
+    hardness = fields.Char(string='硬度(°)', readonly=True)
+    chucking_power = fields.Char(string='夹持力', readonly=True)
+    surface_treatment = fields.Char(string='表面处理', readonly=True)
+    accuracy_grade = fields.Char(string='精度等级', readonly=True)
+
+    picture = fields.Binary(string="图片", readonly=True)
+    comment = fields.Text(string='备注', readonly=True)
+
+
+'''=============================定位原件类型============================================='''
+
+
+class SettingElementType(models.Model):
+    _name = 'sf.setting.element.type'
+    _description = "定位原件类型"
+
+    code = fields.Char(string='编码', readonly=True)
+    name = fields.Char(string='定位原件类型', readonly=True)
+    comment = fields.Text(string='备注', readonly=True)
+
+
+'''==============================夹紧元件型号=============================================='''
+
+
+class FixtureClampingElement(models.Model):
+    _name = 'sf.fixture.clamping.element'
+    _description = "夹紧元件型号"
+
+    code = fields.Char(string='编码', readonly=True)
+    name = fields.Char(string="型号名称", readonly=True)
+    clamping_ele_type_id = fields.Many2one('sf.clamping.element.type', string="夹紧元件类型", readonly=True)
+    brand_id = fields.Many2one('sf.machine.brand', string="品牌", readonly=True)
+
+    length = fields.Char(string='长度(mm)', readonly=True)
+    width = fields.Char(string='宽度(mm)', readonly=True)
+    height = fields.Char(string='高度(mm)', readonly=True)
+    diameter = fields.Char(string='直径(mm)', readonly=True)
+
+    material_type_id = fields.Many2one('sf.materials.model', string='材料型号', readonly=True)
+    hardness = fields.Char(string='硬度(°)', readonly=True)
+    chucking_power = fields.Char(string='夹持力', readonly=True)
+    surface_treatment = fields.Char(string='夹持方式', readonly=True)
+    accuracy_grade = fields.Char(string='精度等级', readonly=True)
+
+    picture = fields.Binary(string="图片", readonly=True)
+    comment = fields.Text(string='备注', readonly=True)
+
+
+'''============================夹紧元件类型======================================='''
+
+
+# 夹紧元件类型
+class ClampingElementType(models.Model):
+    _name = "sf.clamping.element.type"
+    _description = "夹紧元件类型"
+
+    code = fields.Char(string='编码', readonly=True)
+    name = fields.Char(name='夹紧元件类型', readonly=True)
+    comment = fields.Text(string='备注', readonly=True)
+
+
+'''=========================对刀夹具型号====================================='''
+
+
+class FixtureToolSetting(models.Model):
+    _name = 'sf.fixture.tool.setting'
+    _description = "对刀夹具型号"
+
+    code = fields.Char(string='编码', readonly=True)
+    name = fields.Char(string="型号名称", readonly=True)
+    tool_setting_type_id = fields.Many2one('sf.tool.setting.type', string="对刀夹具类型", readonly=True)
+    brand_id = fields.Many2one('sf.machine.brand', string="品牌", readonly=True)
+
+    length = fields.Char(string='长度(mm)', readonly=True)
+    width = fields.Char(string='宽度(mm)', readonly=True)
+    height = fields.Char(string='高度(mm)', readonly=True)
+    diameter = fields.Char(string='直径(mm)', readonly=True)
+
+    material_type_id = fields.Many2one('sf.materials.model', string='材料型号', readonly=True)
+    hardness = fields.Char(string='硬度(°)', readonly=True)
+    chucking_power = fields.Char(string='夹持力', readonly=True)
+    clamp_mode = fields.Char(string='夹持方式', readonly=True)
+    accuracy_grade = fields.Char(string='精度等级', readonly=True)
+    max_clamp_diameter = fields.Char('最大夹持直接(mm)', readonly=True)
+
+    picture = fields.Binary(string="图片", readonly=True)
+    comment = fields.Text(string='备注', readonly=True)
+
+
+'''===========================对刀夹具类型=========================================='''
+
+
+class ToolSettingType(models.Model):
+    _name = 'sf.tool.setting.type'
+    _description = "对刀夹具类型"
+
+    code = fields.Char('编码', readonly=True)
+    name = fields.Char(string='对刀夹具类型', readonly=True)
+    comment = fields.Text(string='备注', readonly=True)
+
+
+'''==========================定位装置型号======================================='''
+
+
+class FixtureLocatingDevice(models.Model):
+    _name = 'sf.fixture.locating.device'
+    _description = "定位装置型号"
+
+    code = fields.Char(string='编码', readonly=True)
+    name = fields.Char(string="型号名称", readonly=True)
+    locating_device_type_id = fields.Many2one('sf.locating.device.type', string="定位装置类型", readonly=True)
+    brand_id = fields.Many2one('sf.machine.brand', string="品牌", readonly=True)
+
+    length = fields.Char(string='长度(mm)', readonly=True)
+    width = fields.Char(string='宽度(mm)', readonly=True)
+    height = fields.Char(string='高度(mm)', readonly=True)
+    diameter = fields.Char(string='直径(mm)', readonly=True)
+
+    material_type_id = fields.Many2one('sf.materials.model', string='材料型号', readonly=True)
+    weight = fields.Char(string='重量(kg)', readonly=True)
+    accuracy_grade = fields.Char(string='精度等级', readonly=True)
+    locate_mode_ids = fields.Many2many('sf.locating.device.locate.mode', string='定位装置定位方式', readonly=True)
+    max_bearing_capacity = fields.Char(string='最大承载力', readonly=True)
+
+    picture = fields.Binary(string="图片", readonly=True)
+    comment = fields.Text(string='备注', readonly=True)
+
+
+'''==============================定位装置类型================================'''
+
+
+# 定位装置型号
+class LocatingDeviceType(models.Model):
+    _name = 'sf.locating.device.type'
+    _description = "定位装置类型"
+
+    code = fields.Char('编码', readonly=True)
+    name = fields.Char(string='定位装置类型', readonly=True)
+    comment = fields.Text(string='备注', readonly=True)
+
+
+'''============================定位装置定位方式========================================'''
+
+
+# 定位装置定位方式
+class LocatingDeviceLocateMode(models.Model):
+    _name = 'sf.locating.device.locate.mode'
+    _description = "定位装置定位方式"
+
+    code = fields.Char('编码', readonly=True)
+    name = fields.Char('定位方式', readonly=True)
+    name_id = fields.Many2many('sf.fixture.locating.device', string='定位装置', readonly=True)
+    comment = fields.Text(string='备注', readonly=True)
+
+
+'''===========================导向元件型号===================================='''
+
+
+class FixtureGuideElement(models.Model):
+    _name = 'sf.fixture.guide.element'
+    _description = "导向元件型号"
+
+    code = fields.Char(string='编码', readonly=True)
+    name = fields.Char(string="型号名称", readonly=True)
+    guide_ele_type_id = fields.Many2one('sf.guide.element.type', string="导向元件类型", readonly=True)
+    brand_id = fields.Many2one('sf.machine.brand', string="品牌", readonly=True)
+
+    length = fields.Char(string='长度(mm)', readonly=True)
+    width = fields.Char(string='宽度(mm)', readonly=True)
+    height = fields.Char(string='高度(mm)', readonly=True)
+    diameter = fields.Char(string='直径(mm)', readonly=True)
+
+    material_type_id = fields.Many2one('sf.materials.model', string='材料型号', readonly=True)
+    weight = fields.Char(string='重量', readonly=True)
+    accuracy_grade = fields.Char(string='精度等级', readonly=True)
+    guide_ele_guide_mode_id = fields.Many2many('sf.guide.element.guide.mode', string='导向元件导向方式', readonly=True)
+    scope_of_application = fields.Char(string='适用范围', readonly=True)
+    guide_ele_way_to_install_id = fields.Many2many('sf.guide.element.way.to.install', string='导向元件安装方式',
+                                                   readonly=True)
+
+    picture = fields.Binary(string="图片", readonly=True)
+    comment = fields.Text(string='备注', readonly=True)
+
+
+'''=============================导向元件类型============================================'''
+
+
+class GuideElementType(models.Model):
+    _name = 'sf.guide.element.type'
+    _description = "导向元件类型"
+
+    code = fields.Char(string='编码', readonly=True)
+    name = fields.Char(string="导向元件类型", readonly=True)
+    comment = fields.Text(string='备注', readonly=True)
+
+
+'''================================导向元件导向方式=========================================='''
+
+
+class GuideElementGuideMode(models.Model):
+    _name = 'sf.guide.element.guide.mode'
+    _description = "导向元件导向方式"
+
+    code = fields.Char(string='编码', readonly=True)
+    name = fields.Char(string="导向元件导向方式", readonly=True)
+    name_id = fields.Many2many('sf.fixture.guide.element', string='导向元件', readonly=True)
+    comment = fields.Text(string='备注', readonly=True)
+
+
+'''=============================导向元件安装方式==========================================='''
+
+
+class GuideElementWayToInstall(models.Model):
+    _name = 'sf.guide.element.way.to.install'
+    _description = '导向元件安装方式'
+
+    code = fields.Char(string='编码', readonly=True)
+    name = fields.Char(string="导向元件安装方式", readonly=True)
+    name_id = fields.Many2many('sf.fixture.guide.element', string='导向元件', readonly=True)
+    comment = fields.Text(string='备注', readonly=True)
diff --git a/sf_base/models/tool_base.py b/sf_base/models/tool_base.py
index b41a1075..33426cd4 100644
--- a/sf_base/models/tool_base.py
+++ b/sf_base/models/tool_base.py
@@ -7,6 +7,16 @@ from odoo.exceptions import UserError
 from datetime import datetime
 
 
+# 功能刀具物料
+class CuttingToolMaterial(models.Model):
+    _name = 'sf.cutting.tool.material'
+    _description = '刀具物料'
+
+    code = fields.Char('编码')
+    name = fields.Char('名称')
+    remark = fields.Char('备注')
+
+
 # 功能刀具
 class FunctionalCuttingTool(models.Model):
     _name = 'sf.functional.cutting.tool'
@@ -53,6 +63,8 @@ class IntegralCuttingTool(models.Model):
 
     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)、适用夹头型号、适用范围、图片、创建人、创建时间等字段
@@ -80,6 +92,8 @@ class IntegralCuttingToolModel(models.Model):
 
     code = fields.Char('编码')
     name = fields.Char('名称')
+    # 关联刀具物料
+    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
     remark = fields.Text('备注')
 
 
@@ -90,10 +104,12 @@ class Blade(models.Model):
 
     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', '品牌',)
+    brand = fields.Many2one('sf.machine.brand', '品牌', )
     length = fields.Float('长度L(mm)')
     width = fields.Float('宽度D(mm)')
     height = fields.Float('高度T(mm)')
@@ -120,6 +136,8 @@ class BladeModel(models.Model):
 
     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.Text('备注')
@@ -132,6 +150,8 @@ class CutterBar(models.Model):
 
     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)、刀尖圆角半径、精度等级、硬度(°)、适用范围、图片、创建人、创建时间
@@ -158,6 +178,8 @@ class CutterBarModel(models.Model):
 
     code = fields.Char('编码')
     name = fields.Char('名称')
+    # 关联刀具物料
+    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
     remark = fields.Text('备注')
 
 
@@ -168,6 +190,8 @@ class CutterPad(models.Model):
 
     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)、刀尖圆角半径、精度等级、硬度(°)、适用范围、图片、创建人、创建时间
@@ -194,6 +218,8 @@ class CutterPadModel(models.Model):
 
     code = fields.Char('编码')
     name = fields.Char('名称')
+    # 关联刀具物料
+    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
     remark = fields.Text('备注')
 
 
@@ -204,6 +230,8 @@ class Handle(models.Model):
 
     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)、检测精度、检测硬度、标准转速、图片、创建人、创建时间
@@ -230,6 +258,8 @@ class HandleModel(models.Model):
 
     code = fields.Char('编码')
     name = fields.Char('名称')
+    # 关联刀具物料
+    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
     remark = fields.Text('备注')
 
 
@@ -237,9 +267,12 @@ class HandleModel(models.Model):
 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)、特性、图片、创建人、创建时间
@@ -263,5 +296,6 @@ class ChuckModel(models.Model):
 
     code = fields.Char('编码')
     name = fields.Char('名称')
+    # 关联刀具物料
+    cutting_tool_material = fields.Many2one('sf.cutting.tool.material', '刀具物料')
     remark = fields.Text('备注')
-
diff --git a/sf_base/security/ir.model.access.csv b/sf_base/security/ir.model.access.csv
index b75eee63..ad1e2ff2 100644
--- a/sf_base/security/ir.model.access.csv
+++ b/sf_base/security/ir.model.access.csv
@@ -1,8 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_sf_machine_tool,sf_machine_tool,model_sf_machine_tool,base.group_user,1,1,1,1
-access_sf_cutting_tool_category,sf_cutting_tool_category,model_sf_cutting_tool_category,base.group_user,1,1,1,1
 access_sf_machine_tool_type,sf_machine_tool_type,model_sf_machine_tool_type,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_machine_brand,sf_machine_brand,model_sf_machine_brand,base.group_user,1,1,1,1
 access_sf_machine_brand_tags,sf_machine_brand_tags,model_sf_machine_brand_tags,base.group_user,1,1,1,1
 access_sf_machine_control_system,sf_machine_control_system,model_sf_machine_control_system,base.group_user,1,1,1,1
@@ -31,8 +29,20 @@ access_sf_handle,sf.handle,model_sf_handle,base.group_user,1,1,1,1
 access_sf_handle_model,sf.handle.model,model_sf_handle_model,base.group_user,1,1,1,1
 access_sf_chuck,sf.chuck,model_sf_chuck,base.group_user,1,1,1,1
 access_sf_chuck_model,sf.chuck.model,model_sf_chuck_model,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_fixture_setting_element,sf_fixture_setting_element,model_sf_fixture_setting_element,base.group_user,1,1,1,1
+access_sf_setting_element_type,sf_setting_element_type,model_sf_setting_element_type,base.group_user,1,1,1,1
+access_sf_fixture_clamping_element,sf_fixture_clamping_element,model_sf_fixture_clamping_element,base.group_user,1,1,1,1
+access_sf_clamping_element_type,sf_clamping_element_type,model_sf_clamping_element_type,base.group_user,1,1,1,1
+access_sf_fixture_tool_setting,sf_fixture_tool_setting,model_sf_fixture_tool_setting,base.group_user,1,1,1,1
+access_sf_tool_setting_type,sf_tool_setting_type,model_sf_tool_setting_type,base.group_user,1,1,1,1
+access_sf_fixture_locating_device,sf_fixture_locating_device,model_sf_fixture_locating_device,base.group_user,1,1,1,1
+access_sf_locating_device_type,sf_locating_device_type,model_sf_locating_device_type,base.group_user,1,1,1,1
+access_sf_locating_device_locate_mode,sf_locating_device_locate_mode,model_sf_locating_device_locate_mode,base.group_user,1,1,1,1
+access_sf_fixture_guide_element,sf_fixture_guide_element,model_sf_fixture_guide_element,base.group_user,1,1,1,1
+access_sf_guide_element_type,sf_guide_element_type,model_sf_guide_element_type,base.group_user,1,1,1,1
+access_sf_guide_element_guide_mode,sf_guide_element_guide_mode,model_sf_guide_element_guide_mode,base.group_user,1,1,1,1
+access_sf_guide_element_way_to_install,sf_guide_element_way_to_install,model_sf_guide_element_way_to_install,base.group_user,1,1,1,1
 
 
diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml
index 7aa192c1..75d481c8 100644
--- a/sf_base/views/base_view.xml
+++ b/sf_base/views/base_view.xml
@@ -255,156 +255,6 @@
             </p>
         </field>
     </record>
-    #------------------刀具型号------------------
-
-    <record model="ir.ui.view" id="search_sf_cutting_tool_type_view">
-        <field name="name">search.sf.cutting_tool.type</field>
-        <field name="model">sf.cutting_tool.type</field>
-        <field name="arch" type="xml">
-            <search string="刀具型号">
-                <field name="name" string="模糊搜索"
-                       filter_domain="['|',('name', 'ilike', self),('code', 'ilike', self)]"/>
-            </search>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="tree_cutting_tool_type_view">
-        <field name="name">tree.sf.cutting_tool.type</field>
-        <field name="model">sf.cutting_tool.type</field>
-        <field name="arch" type="xml">
-            <tree string="刀具型号">
-                <field name="code"/>
-                <field name="name"/>
-                <field name="remark"/>
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="form_sf_cutting_tool_type">
-        <field name="name">form.sf.cutting_tool.type</field>
-        <field name="model">sf.cutting_tool.type</field>
-        <field name="arch" type="xml">
-            <form string="刀具型号">
-                <group string="基本信息">
-                    <group>
-                        <field name="code" force_save="1" readonly="1"/>
-                        <field name="category_id" string="类别" required="1"/>
-                    </group>
-                    <group>
-                        <field name="name" required="1"/>
-                        <field name="brand_id" required="1"
-                               domain="[('tag_ids', '=', '机床')]"/>
-                    </group>
-                </group>
-                <group string="刀具参数">
-                    <group>
-                        <field name="taper_shank_length" required="1" options="{'format': false}"/>
-                        <field name="long_blade" required="1" options="{'format': false}"/>
-                        <field name="tool_length" required="1" options="{'format': false}"/>
-                    </group>
-                    <group>
-                        <field name="diameter" required="1" options="{'format': false}"/>
-                        <field name="shank_diameter" required="1" options="{'format': false}"/>
-                        <field name="cone_angle_pitch" required="1" options="{'format': false}"/>
-                        <field name="blade_number" required="1" options="{'format': false}"/>
-                    </group>
-                </group>
-                <group string="其它">
-                    <field name="remark"/>
-                </group>
-            </form>
-        </field>
-    </record>
-
-    <record id="action_sf_cutting_tool_type" model="ir.actions.act_window">
-        <field name="name">刀具型号</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.cutting_tool.type</field>
-        <field name="view_mode">tree,form</field>
-        <field name="help" type="html">
-            <p class="o_view_nocontent_smiling_face">
-                [刀具型号] 还没有哦！点左上角的[创建]按钮，沙发归你了!
-            </p>
-            <p>
-            </p>
-        </field>
-    </record>
-
-    #------------------刀具类别------------------
-
-    <record model="ir.ui.view" id="search_sf_cutting_tool_category_view">
-        <field name="name">search.sf.cutting_tool.category</field>
-        <field name="model">sf.cutting_tool.category</field>
-        <field name="arch" type="xml">
-            <search string="刀具类别">
-                <field name="name" string="模糊搜索"
-                       filter_domain="['|',('name', 'ilike', self),('remark', 'ilike', self)]"/>
-            </search>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="tree_sf_cutting_tool_category_view">
-        <field name="name">tree.sf.cutting_tool.category</field>
-        <field name="model">sf.cutting_tool.category</field>
-        <field name="arch" type="xml">
-            <tree string="刀具类别">
-                <field name="code"/>
-                <field name="name"/>
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="sf_cutting_tool_category_form">
-        <field name="name">form.sf.cutting_tool.category</field>
-        <field name="model">sf.cutting_tool.category</field>
-        <field name="arch" type="xml">
-            <form string="刀具类别">
-                <group string="基本信息">
-                    <group>
-                        <field name="code" readonly="1"/>
-                    </group>
-                    <group>
-                        <field name="name" required="1"/>
-                    </group>
-                </group>
-                <!--                <group string="参数">-->
-                <!--                    <field name="type_ids" string="刀具型号">-->
-                <!--                        <tree editable="bottom">-->
-                <!--                            <field name="category_id" invisible="True"/>-->
-                <!--                            <field name="code" string="编码" required="True"/>-->
-                <!--                            <field name="name" string="名称" required="True"/>-->
-                <!--                            <field name="diameter" string="直径" required="True"/>-->
-                <!--                            <field name="long_blade" string="避空长/刃长" required="True"/>-->
-                <!--                            <field name="cone_angle_pitch" string="锥角/节距" required="True"/>-->
-                <!--                            <field name="shank_diameter" string="柄径" required="True"/>-->
-                <!--                            <field name="taper_shank_length" string="锥柄" required="True"/>-->
-                <!--                            <field name="tool_length" string="刀具总长" required="True"/>-->
-                <!--                            <field name="blade_number" string="刃数" required="True"/>-->
-                <!--                            <field name="remark" string="备注"/>-->
-                <!--                            <field name="active" string="有效"/>-->
-                <!--                        </tree>-->
-                <!--                    </field>-->
-                <!--                </group>-->
-                <group string="其它">
-                    <field name="remark"/>
-                </group>
-            </form>
-        </field>
-    </record>
-
-    <record id="action_sf_cutting_tool_category" model="ir.actions.act_window">
-        <field name="name">刀具类别</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sf.cutting_tool.category</field>
-        <field name="view_mode">tree,form</field>
-        <field name="help" type="html">
-            <p class="o_view_nocontent_smiling_face">
-                [刀具类别] 还没有哦！点左上角的[创建]按钮，沙发归你了!
-            </p>
-            <p>
-            </p>
-        </field>
-    </record>
 
     #------------------机床注册------------------
 
diff --git a/sf_base/views/fixture_base_view.xml b/sf_base/views/fixture_base_view.xml
new file mode 100644
index 00000000..09cd4b86
--- /dev/null
+++ b/sf_base/views/fixture_base_view.xml
@@ -0,0 +1,681 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+
+<!-- ======================================定位元件型号view视图==================================================   -->
+    <record id="sf_fixture_setting_element_view_tree" model="ir.ui.view">
+        <field name="name">定位元件型号</field>
+        <field name="model">sf.fixture.setting.element</field>
+        <field name="arch" type="xml">
+            <tree string="定位元件型号">
+                <field name="code"/>
+                <field name="name"/>
+                <field name="setting_ele_type_id"/>
+                <field name="brand_id"/>
+                <field name="picture" widget="image"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="sf_fixture_setting_element_view_form" model="ir.ui.view">
+        <field name="name">定位元件型号</field>
+        <field name="model">sf.fixture.setting.element</field>
+        <field name="arch" type="xml">
+            <form string="定位元件型号">
+                <sheet>
+                    <group string="基本信息">
+                        <group>
+                            <field name="code"/>
+                            <field name="name"/>
+                            <field name="setting_ele_type_id"/>
+                           <field name="brand_id"/>
+                        </group>
+                        <group>
+                           <field name="picture" widget="image" nolabel="1"/>
+                        </group>
+                    </group>
+                    <group string="参数">
+                        <group>
+                            <field name="length"/>
+                            <field name="width"/>
+                            <field name="height"/>
+                            <field name="diameter"/>
+                        </group>
+                        <group>
+                            <field name="material_type_id"/>
+                            <field name="hardness"/>
+                            <field name="surface_treatment"/>
+                            <field name="accuracy_grade"/>
+                            <field name="chucking_power"/>
+                        </group>
+                    </group>
+                    <group string="其他">
+                        <group>
+                            <field name="comment"/>
+                        </group>
+                    </group>
+
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="sf_fixture_setting_element_view_act" model="ir.actions.act_window">
+        <field name="name">定位元件型号</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.fixture.setting.element</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+
+
+<!-- ======================================定位原件类型==================================================   -->
+    <record id="sf_setting_element_type_view_tree" model="ir.ui.view">
+        <field name="name">定位原件类型</field>
+        <field name="model">sf.setting.element.type</field>
+        <field name="arch" type="xml">
+            <tree string="定位原件类型">
+                <field name="code"/>
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="sf_setting_element_type_view_form" model="ir.ui.view">
+        <field name="name">定位元件类型</field>
+        <field name="model">sf.setting.element.type</field>
+        <field name="arch" type="xml">
+            <form string="定位元件类型">
+                <sheet>
+                    <group string="基本信息">
+                        <group>
+                            <field name="code"/>
+                        </group>
+                        <group>
+                            <field name="name"/>
+                        </group>
+                    </group>
+                    <group string="其他">
+                        <field name="comment"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="sf_setting_element_type_view_act" model="ir.actions.act_window">
+        <field name="name">定位元件类型</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.setting.element.type</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+
+
+
+    <!-- ======================================夹紧元件型号==================================================   -->
+    <record id="sf_fixture_clamping_element_view_tree" model="ir.ui.view">
+        <field name="name">夹紧元件型号</field>
+        <field name="model">sf.fixture.clamping.element</field>
+        <field name="arch" type="xml">
+            <tree string="夹紧元件型号">
+                <field name="code"/>
+                <field name="name"/>
+                <field name="clamping_ele_type_id"/>
+                <field name="brand_id"/>
+                <field name="picture" widget="image"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="sf_fixture_clamping_element_view_form" model="ir.ui.view">
+        <field name="name">夹紧元件型号</field>
+        <field name="model">sf.fixture.clamping.element</field>
+        <field name="arch" type="xml">
+            <form string="夹紧元件型号">
+                <sheet>
+                    <group string="基本信息">
+                        <group>
+                            <field name="code"/>
+                            <field name="name"/>
+                            <field name="clamping_ele_type_id"/>
+                            <field name="brand_id"/>
+                        </group>
+                        <group>
+                            <field name="picture" widget="image" nolabel="1"/>
+                        </group>
+                    </group>
+                    <group string="参数">
+                        <group>
+                            <field name="length"/>
+                            <field name="width"/>
+                            <field name="height"/>
+                            <field name="diameter"/>
+                        </group>
+                        <group>
+                            <field name="material_type_id"/>
+                            <field name="hardness"/>
+                            <field name="chucking_power"/>
+                            <field name="surface_treatment"/>
+                            <field name="accuracy_grade"/>
+                        </group>
+                    </group>
+                    <group string="其他">
+                        <group>
+                            <field name="comment"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="sf_fixture_clamping_element_view_act" model="ir.actions.act_window">
+        <field name="name">夹紧元件型号</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.fixture.clamping.element</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+
+
+
+    <!-- ======================================夹紧元件类型==================================================   -->
+    <record id="sf_clamping_element_type_view_tree" model="ir.ui.view">
+        <field name="name">夹紧元件类型</field>
+        <field name="model">sf.clamping.element.type</field>
+        <field name="arch" type="xml">
+            <tree string="夹紧元件类型">
+                <field name="code"/>
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="sf_clamping_element_type_view_form" model="ir.ui.view">
+        <field name="name">夹紧元件类型</field>
+        <field name="model">sf.clamping.element.type</field>
+        <field name="arch" type="xml">
+            <form string="夹紧元件类型">
+                <sheet>
+                    <group string="基本信息">
+                        <group>
+                            <field name="code"/>
+                        </group>
+                        <group>
+                            <field name="name"/>
+                        </group>
+                    </group>
+                    <group string="其他">
+                        <field name="comment"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="sf_clamping_element_type_view_act" model="ir.actions.act_window">
+        <field name="name">夹紧元件类型</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.clamping.element.type</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+
+
+     <!--  ===================================对刀夹具型号view视图============================================      -->
+    <record id="sf_fixture_tool_setting_view_tree" model="ir.ui.view">
+        <field name="name">对刀夹具型号</field>
+        <field name="model">sf.fixture.tool.setting</field>
+        <field name="arch" type="xml">
+            <tree string="对刀夹具型号">
+                <field name="code"/>
+                <field name="name"/>
+                <field name="tool_setting_type_id"/>
+                <field name="brand_id"/>
+                <field name="picture" widget="image"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="sf_fixture_tool_setting_view_form" model="ir.ui.view">
+        <field name="name">对刀夹具型号</field>
+        <field name="model">sf.fixture.tool.setting</field>
+        <field name="arch" type="xml">
+            <form string="对刀夹具型号">
+                <sheet>
+                    <group string="基本信息">
+                        <group>
+                            <field name="code"/>
+                            <field name="name"/>
+                            <field name="tool_setting_type_id"/>
+                            <field name="brand_id"/>
+                        </group>
+                        <group>
+                           <field name="picture" widget="image" nolabel="1"/>
+                        </group>
+                    </group>
+                    <group string="参数">
+                        <group>
+                            <field name="length"/>
+                            <field name="width"/>
+                            <field name="height"/>
+                            <field name="diameter"/>
+                            <field name="hardness"/>
+                        </group>
+                        <group>
+                            <field name="clamp_mode"/>
+                            <field name="accuracy_grade"/>
+                            <field name="max_clamp_diameter"/>
+                            <field name="material_type_id"/>
+                            <field name="chucking_power"/>
+                        </group>
+                    </group>
+                    <group string="其他">
+                        <group>
+                            <field name="comment"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="sf_fixture_tool_setting_view_act" model="ir.actions.act_window">
+        <field name="name">对刀夹具型号</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.fixture.tool.setting</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+
+    <!--  ==================================对刀夹具类型view视图===============================================  -->
+    <record id="sf_tool_setting_type_view_tree" model="ir.ui.view">
+        <field name="name">对刀夹具类型</field>
+        <field name="model">sf.tool.setting.type</field>
+        <field name="arch" type="xml">
+            <tree string="对刀夹具类型">
+                <field name="code"/>
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="sf_tool_setting_type_view_form" model="ir.ui.view">
+        <field name="name">对刀夹具类型</field>
+        <field name="model">sf.tool.setting.type</field>
+        <field name="arch" type="xml">
+            <form string="对刀夹具类型">
+                <sheet>
+                    <group string="基本信息">
+                        <group>
+                            <field name="code"/>
+                        </group>
+                        <group>
+                            <field name="name"/>
+                        </group>
+                    </group>
+                    <group string="其他">
+                        <field name="comment"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="sf_tool_setting_type_view_act" model="ir.actions.act_window">
+        <field name="name">对刀夹具类型</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.tool.setting.type</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+
+
+     <!--     =================================定位装置型号view视图====================================      -->
+    <record id="sf_fixture_locating_device_view_tree" model="ir.ui.view">
+        <field name="name">定位装置型号</field>
+        <field name="model">sf.fixture.locating.device</field>
+        <field name="arch" type="xml">
+            <tree string="定位装置型号">
+                <field name="code"/>
+                <field name="name"/>
+                <field name="locating_device_type_id"/>
+                <field name="brand_id"/>
+                <field name="picture" widget="image"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="sf_fixture_locating_device_view_form" model="ir.ui.view">
+        <field name="name">定位装置型号</field>
+        <field name="model">sf.fixture.locating.device</field>
+        <field name="arch" type="xml">
+            <form string="定位装置型号">
+                <sheet>
+                    <group string="基本信息">
+                        <group>
+                            <field name="code"/>
+                            <field name="name"/>
+                            <field name="locating_device_type_id"/>
+                            <field name="brand_id"/>
+                        </group>
+                        <group>
+                           <field name="picture" widget="image" nolabel="1"/>
+                        </group>
+                    </group>
+                    <group string="参数">
+                        <group>
+                            <field name="length"/>
+                            <field name="width"/>
+                            <field name="height"/>
+                            <field name="diameter"/>
+                        </group>
+                        <group>
+                            <field name="material_type_id"/>
+                            <field name="weight"/>
+                            <field name="max_bearing_capacity"/>
+                            <field name="accuracy_grade"/>
+                            <field name="locate_mode_ids"/>
+                        </group>
+                    </group>
+                    <group string="其他">
+                        <group>
+                            <field name="comment"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="sf_fixture_locating_device_view_act" model="ir.actions.act_window">
+        <field name="name">定位装置型号</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.fixture.locating.device</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+
+    <!--  ==========================================定位装置类型view视图===============================================  -->
+    <record id="sf_locating_device_type_view_tree" model="ir.ui.view">
+        <field name="name">定位装置类型</field>
+        <field name="model">sf.locating.device.type</field>
+        <field name="arch" type="xml">
+            <tree string="定位装置类型">
+                <field name="code"/>
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="sf_locating_device_type_view_form" model="ir.ui.view">
+        <field name="name">定位装置类型</field>
+        <field name="model">sf.locating.device.type</field>
+        <field name="arch" type="xml">
+            <form string="定位装置类型">
+                <sheet>
+                    <group string="基本信息">
+                        <group>
+                            <field name="code"/>
+                        </group>
+                        <group>
+                            <field name="name"/>
+                        </group>
+                    </group>
+                    <group string="其他">
+                        <field name="comment"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="sf_locating_device_type_view_act" model="ir.actions.act_window">
+        <field name="name">定位装置类型</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.locating.device.type</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+
+    <!--    ====================================定位装置定位方式view视图==========================================    -->
+    <record id="sf_locating_device_locate_mode_view_tree" model="ir.ui.view">
+        <field name="name">定位装置定位方式</field>
+        <field name="model">sf.locating.device.locate.mode</field>
+        <field name="arch" type="xml">
+            <tree string="定位装置定位方式">
+                <field name="code"/>
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="sf_locating_device_locate_mode_view_form" model="ir.ui.view">
+        <field name="name">定位装置定位方式</field>
+        <field name="model">sf.locating.device.locate.mode</field>
+        <field name="arch" type="xml">
+            <form string="定位装置定位方式">
+                <sheet>
+                    <group string="基本信息">
+                        <group>
+                            <field name="code"/>
+                            <field name="name_id"/>
+                        </group>
+                        <group>
+                            <field name="name"/>
+                        </group>
+                    </group>
+                    <group string="其他">
+                        <field name="comment"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="sf_locating_device_locate_mode_view_act" model="ir.actions.act_window">
+        <field name="name">定位装置定位方式</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.locating.device.locate.mode</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+
+    <!--    ======================================导向元件view视图===========================================      -->
+    <record id="sf_fixture_guide_element_view_tree" model="ir.ui.view">
+        <field name="name">导向元件型号</field>
+        <field name="model">sf.fixture.guide.element</field>
+        <field name="arch" type="xml">
+            <tree string="导向元件型号">
+                <field name="code"/>
+                <field name="name"/>
+                <field name="guide_ele_type_id"/>
+                <field name="brand_id"/>
+                <field name="picture" widget="image"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="sf_fixture_guide_element_view_form" model="ir.ui.view">
+        <field name="name">导向元件型号</field>
+        <field name="model">sf.fixture.guide.element</field>
+        <field name="arch" type="xml">
+            <form string="导向元件型号">
+                <sheet>
+                    <group string="基本信息">
+                        <group>
+                            <field name="code"/>
+                            <field name="name"/>
+                            <field name="guide_ele_type_id"/>
+                           <field name="brand_id"/>
+                        </group>
+                        <group>
+                           <field name="picture" widget="image" nolabel="1"/>
+                        </group>
+                    </group>
+                    <group string="参数">
+                        <group>
+                            <field name="length"/>
+                            <field name="width"/>
+                            <field name="height"/>
+                            <field name="diameter"/>
+                            <field name="guide_ele_way_to_install_id"/>
+                        </group>
+                        <group>
+                            <field name="material_type_id"/>
+                            <field name="accuracy_grade"/>
+                            <field name="weight"/>
+                            <field name="scope_of_application"/>
+                            <field name="guide_ele_guide_mode_id"/>
+                        </group>
+                    </group>
+                    <group string="其他">
+                        <group>
+                            <field name="comment"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="sf_fixture_guide_element_view_act" model="ir.actions.act_window">
+        <field name="name">导向元件型号</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.fixture.guide.element</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+
+    <!--  ========================================导向元件类型view视图====================================  -->
+    <record id="sf_guide_element_type_view_tree" model="ir.ui.view">
+        <field name="name">导向元件类型</field>
+        <field name="model">sf.guide.element.type</field>
+        <field name="arch" type="xml">
+            <tree string="定位原件类型">
+                <field name="code"/>
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="sf_guide_element_type_view_form" model="ir.ui.view">
+        <field name="name">导向元件类型</field>
+        <field name="model">sf.guide.element.type</field>
+        <field name="arch" type="xml">
+            <form string="定位元件类型">
+                <sheet>
+                    <group string="基本信息">
+                        <group>
+                            <field name="code"/>
+                        </group>
+                        <group>
+                            <field name="name"/>
+                        </group>
+                    </group>
+                    <group string="其他">
+                        <field name="comment"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="sf_guide_element_type_view_act" model="ir.actions.act_window">
+        <field name="name">导向元件类型</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.guide.element.type</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+
+
+    <!--  ==========================================导向元件导向方式view视图========================================  -->
+    <record id="sf_guide_element_guide_mode_view_tree" model="ir.ui.view">
+        <field name="name">导向元件导向方式</field>
+        <field name="model">sf.guide.element.guide.mode</field>
+        <field name="arch" type="xml">
+            <tree string="导向元件导向方式">
+                <field name="code"/>
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="sf_guide_element_guide_mode_view_form" model="ir.ui.view">
+        <field name="name">导向元件导向方式</field>
+        <field name="model">sf.guide.element.guide.mode</field>
+        <field name="arch" type="xml">
+            <form string="导向元件导向方式">
+                <sheet>
+                    <group string="基本信息">
+                        <group>
+                            <field name="code"/>
+                            <field name="name_id"/>
+                        </group>
+                        <group>
+                            <field name="name"/>
+                        </group>
+                    </group>
+                    <group string="其他">
+                        <field name="comment"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="sf_guide_element_guide_mode_view_act" model="ir.actions.act_window">
+        <field name="name">导向元件导向方式</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.guide.element.guide.mode</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+
+
+    <!--  ==========================================导向元件安装方式view视图==============================================  -->
+    <record id="sf_guide_element_way_to_install_view_tree" model="ir.ui.view">
+        <field name="name">导向元件安装方式</field>
+        <field name="model">sf.guide.element.way.to.install</field>
+        <field name="arch" type="xml">
+            <tree string="导向元件导向方式">
+                <field name="code"/>
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="sf_guide_element_way_to_install_view_form" model="ir.ui.view">
+        <field name="name">导向元件安装方式</field>
+        <field name="model">sf.guide.element.way.to.install</field>
+        <field name="arch" type="xml">
+            <form string="导向元件导向方式">
+                <sheet>
+                    <group string="基本信息">
+                        <group>
+                            <field name="code"/>
+                            <field name="name_id"/>
+                        </group>
+                        <group>
+                            <field name="name"/>
+                        </group>
+                    </group>
+                    <group string="其他">
+                        <field name="comment"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="sf_guide_element_way_to_install_view_act" model="ir.actions.act_window">
+        <field name="name">导向元件安装方式</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sf.guide.element.way.to.install</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+
+
+</odoo>
\ No newline at end of file
diff --git a/sf_base/views/menu_fixture_view.xml b/sf_base/views/menu_fixture_view.xml
new file mode 100644
index 00000000..4a5e1283
--- /dev/null
+++ b/sf_base/views/menu_fixture_view.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+<!--<menuitem id="menu_sf_functional_fixture_list_1"-->
+<!--              name="功能夹具列表"-->
+<!--              sequence="0"-->
+<!--            />-->
+
+    <menuitem id="menu_sf_functional_fixture_list_2"
+              name="夹具"
+              parent="menu_sf_base"
+              sequence="70"
+            />
+
+<!--    <menuitem id="menu_sf_functional_fixture_list_3"-->
+<!--              name="类型列表"-->
+<!--              parent="menu_sf_functional_fixture_list_1"-->
+<!--              sequence="0"-->
+<!--            />-->
+
+    <menuitem id="menu_sf_fixture_setting_element_1"
+              name="定位元件型号"
+              parent="menu_sf_functional_fixture_list_2"
+              sequence="0"
+              action="sf_fixture_setting_element_view_act"
+            />
+        <menuitem id="menu_sf_setting_element_type_1"
+              name="定位元件类型"
+              parent="menu_sf_functional_fixture_list_2"
+              sequence="10"
+              action="sf_setting_element_type_view_act"
+            />
+
+
+
+    <menuitem id="menu_sf_fixture_clamping_element_1"
+              name="夹紧元件型号"
+              parent="menu_sf_functional_fixture_list_2"
+              sequence="2"
+              action="sf_fixture_clamping_element_view_act"
+            />
+        <menuitem id="menu_sf_clamping_element_type_1"
+              name="夹紧元件类型"
+              parent="menu_sf_functional_fixture_list_2"
+              sequence="12"
+              action="sf_clamping_element_type_view_act"
+            />
+
+
+    <menuitem id="menu_sf_fixture_tool_setting_1"
+              name="对刀夹具型号"
+              parent="menu_sf_functional_fixture_list_2"
+              sequence="4"
+              action="sf_fixture_tool_setting_view_act"
+            />
+        <menuitem id="menu_sf_tool_setting_type_1"
+              name="对刀夹具类型"
+              parent="menu_sf_functional_fixture_list_2"
+              sequence="14"
+              action="sf_tool_setting_type_view_act"
+            />
+
+    <menuitem id="menu_sf_fixture_locating_device_1"
+              name="定位装置型号"
+              parent="menu_sf_functional_fixture_list_2"
+              sequence="6"
+              action="sf_fixture_locating_device_view_act"
+            />
+        <menuitem id="menu_sf_locating_device_type_1"
+              name="定位装置型号"
+              parent="menu_sf_functional_fixture_list_2"
+              sequence="16"
+              action="sf_locating_device_type_view_act"
+            />
+        <menuitem id="menu_sf_locating_device_locate_mode_1"
+              name="定位装置定位方式"
+              parent="menu_sf_functional_fixture_list_2"
+              sequence="18"
+              action="sf_locating_device_locate_mode_view_act"
+            />
+
+
+     <menuitem id="menu_sf_fixture_guide_element_1"
+              name="导向元件型号"
+              parent="menu_sf_functional_fixture_list_2"
+              sequence="8"
+              action="sf_fixture_guide_element_view_act"
+            />
+        <menuitem id="menu_sf_guide_element_type_1"
+              name="导向元件类型"
+              parent="menu_sf_functional_fixture_list_2"
+              sequence="20"
+              action="sf_guide_element_type_view_act"
+            />
+        <menuitem id="menu_sf_guide_element_guide_mode_1"
+              name="导向元件导向方式"
+              parent="menu_sf_functional_fixture_list_2"
+              sequence="22"
+              action="sf_guide_element_guide_mode_view_act"
+            />
+        <menuitem id="menu_sf_guide_element_way_to_install_1"
+              name="导向元件安装方式"
+              parent="menu_sf_functional_fixture_list_2"
+              sequence="24"
+              action="sf_guide_element_way_to_install_view_act"
+            />
+</odoo>
\ No newline at end of file
diff --git a/sf_base/views/menu_view.xml b/sf_base/views/menu_view.xml
index e011a29d..c9b8f1c1 100644
--- a/sf_base/views/menu_view.xml
+++ b/sf_base/views/menu_view.xml
@@ -127,26 +127,6 @@
                 sequence="1"
                 action="action_sf_machine_tool_category"/>
 
-        <menuitem
-                id="menu_sf_cutting_tool"
-                parent="mrp.menu_mrp_configuration"
-                name="刀具"
-                sequence="5"/>
-
-        <menuitem
-                id="menu_sf_cutting_tool_category"
-                parent="menu_sf_cutting_tool"
-                name="刀具类别"
-                sequence="1"
-                action="action_sf_cutting_tool_category"/>
-
-        <menuitem
-                id="menu_sf_cutting_tool_type"
-                parent="menu_sf_cutting_tool"
-                name="刀具型号"
-                sequence="1"
-                action="action_sf_cutting_tool_type"/>
-
         <menuitem
                 id="menu_sf_machine_control_system"
                 parent="menu_sf_base"
diff --git a/sf_base/views/tool_base_menu.xml b/sf_base/views/tool_base_menu.xml
index bde509e3..aef0c124 100644
--- a/sf_base/views/tool_base_menu.xml
+++ b/sf_base/views/tool_base_menu.xml
@@ -11,7 +11,7 @@
         </record>
         <!-- 功能刀具action -->
         <record id="action_sf_functional_cutting_tool" model="ir.actions.act_window">
-            <field name="name">功能刀具型号</field>
+            <field name="name">功能刀具</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.functional.cutting.tool</field>
             <field name="view_mode">tree,form</field>
@@ -100,17 +100,15 @@
             <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_cutting_tool" -->
-<!--                 parent="mrp.menu_mrp_configuration" -->
-<!--                 name="刀具" -->
-<!--                 sequence="3" -->
-<!--                 /> -->
-
-        <!-- 功能刀具 -->
-<!--         parent="menu_sf_cutting_tool" -->
+<!-- 功能刀具 -->
         <menuitem
                 id="menu_sf_functional_cutting_tool"
                 parent="menu_sf_base"
@@ -118,21 +116,15 @@
                 sequence="3"
                 action="action_sf_functional_cutting_tool"
                 />
-<!--          --><!-- 刀具物料 -->
-<!--         <menuitem -->
-<!--                 id="menu_sf_cutting_tool_material" -->
-<!--                 parent="menu_sf_cutting_tool" -->
-<!--                 name="刀具物料" -->
-<!--                 sequence="1" -->
-<!--                 /> -->
+<!-- 刀具物料 -->
+        <menuitem
+                id="menu_sf_cutting_tool_material"
+                parent="menu_sf_base"
+                name="刀具物料"
+                sequence="1"
+                action="action_sf_cutting_tool_material"
+                />
 
-<!--          --><!-- 刀头 -->
-<!--         <menuitem -->
-<!--                 id="menu_sf_cutting_tool_head" -->
-<!--                 parent="menu_sf_cutting_tool" -->
-<!--                 name="刀头" -->
-<!--                 sequence="2" -->
-<!--                 /> -->
 
         <!-- 整体式刀具 -->
         <menuitem
@@ -238,7 +230,5 @@
                 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
index 9da3b89c..382c4647 100644
--- a/sf_base/views/tool_base_views.xml
+++ b/sf_base/views/tool_base_views.xml
@@ -1,6 +1,52 @@
 <?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"/>
+                    <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"/>
+                                </group>
+                                <group>
+                                    <field name="remark"/>
+                                </group>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+<!--         刀具物料search view -->
+    <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>
@@ -82,6 +128,17 @@
                 </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">
@@ -113,6 +170,7 @@
                                 <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"/>
@@ -126,6 +184,8 @@
                                 <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"/>
@@ -137,17 +197,28 @@
                             <group string='其他信息'>
                                 <group>
                                 <field name="nut"/>
-                                <field name="chuck_model"/>
-                                </group>
-                                <group>
                                 <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>
@@ -176,6 +247,7 @@
                                 <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"/>
@@ -189,7 +261,8 @@
                                 <field name="height"/>
                                 <field name="top_angle"/>
                                 <field name="front_angle"/>
-                                <field name="rear_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"/>
@@ -197,15 +270,12 @@
                                 <field name="material_model"/>
                                 <field name="hardness"/>
                                 <field name="radius"/>
+                                <field name="rear_angle"/>
                                 </group>
                             </group>
                             <group string='其他信息'>
                                 <group>
                                 <field name="nut"/>
-                                <field name="cutter_bar" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
-                                </group>
-                                <group>
-                                <field name="cutter_pad" widget="many2many_tags" options="{'no_create': True, 'no_quick_create': True}"/>
                                 </group>
                             </group>
                         </group>
@@ -213,6 +283,17 @@
                 </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>
@@ -241,6 +322,9 @@
                                 <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"/>
@@ -269,7 +353,6 @@
                                 </group>
                                 <group>
                                 <field name="scope"/>
-                                <field name="blade"/>
 
                                 </group>
                             </group>
@@ -278,6 +361,17 @@
                 </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">
@@ -307,6 +401,9 @@
                                 <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"/>
@@ -334,7 +431,6 @@
                                 </group>
                                 <group>
                                 <field name="scope"/>
-                                <field name="blade"/>
                                 </group>
                             </group>
                         </group>
@@ -342,6 +438,17 @@
                 </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">
@@ -371,6 +478,9 @@
                                 <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"/>
@@ -396,7 +506,6 @@
                             <group string='其他信息'>
                                 <group>
                                 <field name="nut"/>
-                                <field name="chuck_model"/>
                                 </group>
 <!--                                 <group> -->
 <!--                                 <field name="scope"/> -->
@@ -408,6 +517,17 @@
                 </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">
@@ -437,6 +557,9 @@
                                 <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"/>
@@ -459,7 +582,6 @@
                             <group string='其他信息'>
                                 <group>
                                 <field name="nut"/>
-                                <field name="handle_model"/>
                                 </group>
 <!--                                 <group> -->
 <!--                                 <field name="scope"/> -->
@@ -471,6 +593,17 @@
                 </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">
@@ -529,6 +662,7 @@
                         <group>
                             <field name="code"/>
                             <field name="name"/>
+                            <field name="cutting_tool_material"/>
                         </group>
                         <group>
                             <field name="remark"/>
@@ -562,7 +696,7 @@
                         <group>
                             <field name="code"/>
                             <field name="name"/>
-                            <field name="blade_ids"/>
+                            <field name="cutting_tool_material"/>
                         </group>
                         <group>
                             <field name="remark"/>
@@ -596,6 +730,7 @@
                         <group>
                             <field name="code"/>
                             <field name="name"/>
+                            <field name="cutting_tool_material"/>
                         </group>
                         <group>
                             <field name="remark"/>
@@ -629,6 +764,7 @@
                         <group>
                             <field name="code"/>
                             <field name="name"/>
+                            <field name="cutting_tool_material"/>
                         </group>
                         <group>
                             <field name="remark"/>
@@ -663,6 +799,7 @@
                         <group>
                             <field name="code"/>
                             <field name="name"/>
+                            <field name="cutting_tool_material"/>
                         </group>
                         <group>
                             <field name="remark"/>
@@ -696,6 +833,7 @@
                         <group>
                             <field name="code"/>
                             <field name="name"/>
+                            <field name="cutting_tool_material"/>
                         </group>
                         <group>
                             <field name="remark"/>
@@ -705,7 +843,5 @@
                 </form>
             </field>
         </record>
-
-
     </data>
 </odoo>
diff --git a/sf_dlm/__manifest__.py b/sf_dlm/__manifest__.py
index ae978ecf..3fd71ad3 100644
--- a/sf_dlm/__manifest__.py
+++ b/sf_dlm/__manifest__.py
@@ -10,13 +10,14 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['mrp', 'base', 'sf_manufacturing', 'web_widget_model_viewer', 'mrp_subcontracting', 'purchase_stock',
+    'depends': ['mrp', 'base', 'sale', 'sf_manufacturing', 'web_widget_model_viewer', 'mrp_subcontracting', 'purchase_stock',
                 'uom'],
     'data': [
         'data/product_data.xml',
         'data/uom_data.xml',
-        # 'views/product_template_view.xml',
-        # 'views/product_workorder.xml'
+        'data/cutting_tool_data.xml',
+        'views/product_template_view.xml',
+        'views/product_workorder.xml'
     ],
     'demo': [
     ],
diff --git a/sf_dlm/data/cutting_tool_data.xml b/sf_dlm/data/cutting_tool_data.xml
new file mode 100644
index 00000000..80578737
--- /dev/null
+++ b/sf_dlm/data/cutting_tool_data.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <record id="product_category_cutting_tool_sf" model="product.category">
+            <field name="name">刀具</field>
+            <field name="type">刀具</field>
+        </record>
+
+        <record id="product_category_clamp_sf" model="product.category">
+            <field name="name">夹具</field>
+            <field name="type">夹具</field>
+        </record>
+
+        <record id="product_template_cutting_tool_sf" model="product.product">
+            <field name="name">刀具标准模板</field>
+            <field name="active" eval="False"/>
+            <field name="categ_id" ref="product_category_cutting_tool_sf"/>
+            <field name="route_ids"
+                   eval="[ ref('purchase_stock.route_warehouse0_buy')]"/>
+<!--            <field name="invoice_policy">delivery</field>-->
+            <field name="detailed_type">product</field>
+            <field name="purchase_ok">true</field>
+            <field name="uom_id" ref="uom.product_uom_unit"/>
+            <field name="uom_po_id" ref="uom.product_uom_unit"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="tracking">serial</field>
+<!--            <field name="is_bfm">false</field>-->
+        </record>
+    </data>
+</odoo>
diff --git a/sf_dlm/data/product_data.xml b/sf_dlm/data/product_data.xml
index 54a468ad..8cd8ecf7 100644
--- a/sf_dlm/data/product_data.xml
+++ b/sf_dlm/data/product_data.xml
@@ -20,21 +20,32 @@
             <field name="type">表面工艺</field>
         </record>
 
+
+<!--        <record id="product_category_cutting_tool_sf" model="product.category">-->
+<!--            <field name="name">刀具</field>-->
+<!--            <field name="type">刀具</field>-->
+<!--        </record>-->
+
+<!--        <record id="product_category_clamp_sf" model="product.category">-->
+<!--            <field name="name">夹具</field>-->
+<!--            <field name="type">夹具</field>-->
+<!--        </record>-->
+
         <record id="product_template_sf" model="product.product">
             <field name="name">CNC加工产品模板</field>
             <field name="active" eval="False"/>
             <field name="categ_id" ref="product_category_finished_sf"/>
             <field name="route_ids"
                    eval="[ref('stock.route_warehouse0_mto'), ref('mrp.route_warehouse0_manufacture')]"/>
-            <field name="invoice_policy">delivery</field>
+<!--            <field name="invoice_policy">delivery</field>-->
             <field name="detailed_type">product</field>
             <field name="purchase_ok">false</field>
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="single_manufacturing">true</field>
+<!--            <field name="single_manufacturing">true</field>-->
             <field name="tracking">serial</field>
-            <field name="is_bfm">false</field>
+<!--            <field name="is_bfm">false</field>-->
         </record>
         <record id="product_embryo_sf_self_machining" model="product.product">
             <field name="name">坯料自加工模板</field>
@@ -42,15 +53,15 @@
             <field name="categ_id" ref="product_category_embryo_sf"/>
             <field name="route_ids"
                    eval="[ref('stock.route_warehouse0_mto'), ref('mrp.route_warehouse0_manufacture')]"/>
-            <field name="invoice_policy">delivery</field>
+<!--            <field name="invoice_policy">delivery</field>-->
             <field name="detailed_type">product</field>
             <field name="purchase_ok">false</field>
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="single_manufacturing">true</field>
+<!--            <field name="single_manufacturing">true</field>-->
             <field name="tracking">serial</field>
-            <field name="is_bfm">false</field>
+<!--            <field name="is_bfm">false</field>-->
         </record>
 
         <record id="product_embryo_sf_outsource" model="product.product">
@@ -59,14 +70,14 @@
             <field name="categ_id" ref="product_category_embryo_sf"/>
             <field name="route_ids"
                    eval="[ref('stock.route_warehouse0_mto'), ref('purchase_stock.route_warehouse0_buy'),ref('mrp_subcontracting.route_resupply_subcontractor_mto')]"/>
-            <field name="invoice_policy">delivery</field>
+<!--            <field name="invoice_policy">delivery</field>-->
             <field name="detailed_type">product</field>
             <field name="purchase_ok">true</field>
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="tracking">serial</field>
-            <field name="is_bfm">false</field>
+<!--            <field name="is_bfm">false</field>-->
         </record>
         <record id="product_embryo_sf_purchase" model="product.product">
             <field name="name">坯料采购模板</field>
@@ -74,14 +85,14 @@
             <field name="categ_id" ref="product_category_embryo_sf"/>
             <field name="route_ids"
                    eval="[ref('stock.route_warehouse0_mto'), ref('purchase_stock.route_warehouse0_buy')]"/>
-            <field name="invoice_policy">delivery</field>
+<!--            <field name="invoice_policy">delivery</field>-->
             <field name="detailed_type">product</field>
             <field name="purchase_ok">true</field>
             <field name="uom_id" ref="uom.product_uom_unit"/>
             <field name="uom_po_id" ref="uom.product_uom_unit"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="tracking">serial</field>
-            <field name="is_bfm">false</field>
+<!--            <field name="is_bfm">false</field>-->
         </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/sf_dlm/models/__init__.py b/sf_dlm/models/__init__.py
index c6b96570..a8d31912 100644
--- a/sf_dlm/models/__init__.py
+++ b/sf_dlm/models/__init__.py
@@ -1,6 +1,5 @@
-from. import product_template
 from. import product_supplierinfo
-from. import product_workorder
+
 
 
 
diff --git a/sf_dlm/models/product_template.py b/sf_dlm/models/product_template.py
deleted file mode 100644
index 55bfc854..00000000
--- a/sf_dlm/models/product_template.py
+++ /dev/null
@@ -1,356 +0,0 @@
-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
-import logging
-import base64
-import hashlib
-import os
-
-
-class ResProductTemplate(models.Model):
-    _inherit = 'product.template'
-
-    # 模型的长,宽,高,体积,精度,材料
-    model_name = fields.Char('模型名称')
-    categ_type = fields.Selection(
-        [("成品", "成品"), ("坯料", "坯料"), ("原材料", "原材料"), ("表面工艺", "表面工艺")],
-        string='产品的类别', related='categ_id.type',
-        store=True)
-    model_long = fields.Float('模型长[mm]', digits=(16, 3))
-    model_width = fields.Float('模型宽[mm]', digits=(16, 3))
-    model_height = fields.Float('模型高[mm]', digits=(16, 3))
-    model_volume = fields.Float('模型体积[m³]')
-    model_machining_precision = fields.Selection([
-        ('0.10', '±0.10mm'),
-        ('0.05', '±0.05mm'),
-        ('0.03', '±0.03mm'),
-        ('0.02', '±0.02mm'),
-        ('0.01', '±0.01mm')], string='加工精度')
-    product_model_type_id = fields.Many2one('sf.model.type', string='产品模型类型')
-    embryo_model_type_id = fields.Many2one('sf.model.type', string='坯料模型类型')
-    model_processing_panel = fields.Char('模型加工面板')
-    # model_surface_process_category_id = fields.Many2one('sf.production.process.category', string='表面工艺类别')
-    # model_surface_process_ids = fields.Many2many('sf.production.process', 'rel_product_process', string='表面工艺')
-    server_product_process_parameters_id = fields.Many2one('sf.production.process.parameter',
-                                                           string='表面工艺参数(服务产品)')
-    model_process_parameters_ids = fields.Many2many('sf.production.process.parameter', 'process_parameter_rel',
-                                                    string='表面工艺参数')
-    # model_price = fields.Float('模型单价', digits=(16, 3))
-    model_remark = fields.Char('模型备注说明')
-    length = fields.Float('长[mm]', digits=(16, 3))
-    width = fields.Float('宽[mm]', digits=(16, 3))
-    height = fields.Float('高[mm]', digits=(16, 3))
-    materials_id = fields.Many2one('sf.production.materials', string='材料')
-    materials_type_id = fields.Many2one('sf.materials.model', string='材料型号')
-    single_manufacturing = fields.Boolean(string="单个制造")
-    upload_model_file = fields.Many2many('ir.attachment', 'upload_model_file_attachment_ref', string='上传模型文件')
-    model_code = fields.Char('模型编码')
-    is_bfm = fields.Boolean('业务平台是否自动创建', default=False)
-
-    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')
-        if product_length_in_feet_param == '1':
-            return self.env.ref('uom.product_uom_cubic_foot')
-        else:
-            return self.env.ref('sf_dlm.product_uom_cubic_millimeter')
-
-    # model_file = fields.Binary('模型文件')
-
-    # 坯料的库存路线设置
-    # def _get_routes(self, route_type):
-    #     route_manufacture = self.env.ref('mrp.route_warehouse0_manufacture', raise_if_not_found=False).sudo()
-    #     route_mto = self.env.ref('stock.route_warehouse0_mto', raise_if_not_found=False).sudo()
-    #     route_purchase = self.env.ref('purchase_stock.route_warehouse0_buy', raise_if_not_found=False).sudo()
-    #     if route_manufacture and route_mto:
-    #         # 外协
-    #         if route_type == 'subcontract':
-    #             route_subcontract = self.env.ref('mrp_subcontracting.route_resupply_subcontractor_mto',
-    #                                              raise_if_not_found=False).sudo()
-    #             return [route_mto.id, route_purchase.id, route_subcontract.id]
-    #         elif route_type == 'purchase':
-    #             # 采购
-    #             return [route_mto.id, route_purchase.id]
-    #         else:
-    #             return [route_mto.id, route_manufacture.id]
-    #     return []
-
-    # route_ids = fields.Many2many(default=lambda self: self._get_route())
-
-    # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品
-    def product_create(self, product_id, item, order_id, order_number, i):
-        copy_product_id = product_id.with_user(self.env.ref("base.user_admin")).copy()
-        copy_product_id.product_tmpl_id.active = True
-        model_type = self.env['sf.model.type'].search([], limit=1)
-        attachment = self.attachment_create(item['model_name'], item['model_data'])
-        vals = {
-            'name': '%s-%s-%s' % ('P', order_id.name, i),
-            'model_long': item['model_long'] + model_type.embryo_tolerance,
-            'model_width': item['model_width'] + model_type.embryo_tolerance,
-            'model_height': item['model_height'] + model_type.embryo_tolerance,
-            'model_volume': (item['model_long'] + model_type.embryo_tolerance) * (
-                    item['model_width'] + model_type.embryo_tolerance) * (
-                                    item['model_height'] + model_type.embryo_tolerance),
-            'product_model_type_id': model_type.id,
-            'model_processing_panel': 'R',
-            'model_machining_precision': item['model_machining_precision'],
-            'model_code': item['barcode'],
-            'length': item['model_long'],
-            'width': item['model_width'],
-            'height': item['model_height'],
-            'volume': item['model_long'] * item['model_width'] * item['model_height'],
-            'model_file': '' if not item['model_file'] else base64.b64decode(item['model_file']),
-            'model_name': attachment.name,
-            'upload_model_file': [(6, 0, [attachment.id])],
-            # 'tag_ids': [(6, 0, [t.id for t in account_template.tag_ids])],
-            # 'single_manufacturing': True,
-            # 'tracking': 'serial',
-            'list_price': item['price'],
-            # 'categ_id': self.env.ref('sf_dlm.product_category_finished_sf').id,
-            'materials_id': self.env['sf.production.materials'].search(
-                [('materials_no', '=', item['texture_code'])]).id,
-            'materials_type_id': self.env['sf.materials.model'].search(
-                [('materials_no', '=', item['texture_type_code'])]).id,
-            # 'model_surface_process_ids': self.get_production_process_id(item['surface_process_code']),
-            'model_process_parameters_ids': self.get_process_parameters_id(item['process_parameters_code']),
-            'model_remark': item['remark'],
-            'default_code': '%s-%s' % (order_number, i),
-            # 'barcode': item['barcode'],
-            'active': True,
-            # 'route_ids': self._get_routes('')
-        }
-        copy_product_id.sudo().write(vals)
-        # product_id.product_tmpl_id.active = False
-        return copy_product_id
-
-    # def get_production_process_id(self, surface_process_code):
-    #     production_process_ids = []
-    #     for item in surface_process_code:
-    #         production_process = self.env['sf.production.process'].search([('process_encode', '=', item)])
-    #         production_process_ids.append(production_process.id)
-    #     return [(6, 0, production_process_ids)]
-
-    def get_process_parameters_id(self, process_parameters_code):
-        process_parameters_ids = []
-        for item in process_parameters_code:
-            process_parameters = self.env['sf.production.process.parameter'].search([('code', '=', item)])
-            process_parameters_ids.append(process_parameters.id)
-        return [(6, 0, process_parameters_ids)]
-
-    def attachment_create(self, name, data):
-        attachment = self.env['ir.attachment'].create({
-            'datas': base64.b64decode(data),
-            'type': 'binary',
-            'public': True,
-            'description': '模型文件',
-            'name': name
-        })
-        return attachment
-
-    # 创建坯料
-    def no_bom_product_create(self, product_id, item, order_id, route_type, i):
-        no_bom_copy_product_id = product_id.with_user(self.env.ref("base.user_admin")).copy()
-        no_bom_copy_product_id.product_tmpl_id.active = True
-        materials_id = self.env['sf.production.materials'].search(
-            [('materials_no', '=', item['texture_code'])])
-        materials_type_id = self.env['sf.materials.model'].search(
-            [('materials_no', '=', item['texture_type_code'])])
-        model_type = self.env['sf.model.type'].search([], limit=1)
-        supplier = self.env['mrp.bom'].get_supplier(materials_type_id)
-        logging.info('no_bom_copy_product_supplier-vals:%s' % supplier)
-        vals = {
-            'name': '%s-%s-%s [%s %s-%s * %s * %s]' % ('R',
-                                                       order_id.name, i, materials_id.name, materials_type_id.name,
-                                                       item['model_long'] + model_type.embryo_tolerance,
-                                                       item['model_width'] + model_type.embryo_tolerance,
-                                                       item['model_height'] + model_type.embryo_tolerance),
-            'length': item['model_long'] + model_type.embryo_tolerance,
-            'width': item['model_width'] + model_type.embryo_tolerance,
-            'height': item['model_height'] + model_type.embryo_tolerance,
-            'volume': (item['model_long'] + model_type.embryo_tolerance) * (
-                    item['model_width'] + model_type.embryo_tolerance) * (
-                              item['model_height'] + model_type.embryo_tolerance),
-            'embryo_model_type_id': model_type.id,
-            'list_price': item['price'],
-            'materials_id': materials_id.id,
-            'materials_type_id': materials_type_id.id,
-            'is_bfm': True,
-            # 'route_ids': self._get_routes(route_type),
-            # 'categ_id': self.env.ref('sf_dlm.product_category_embryo_sf').id,
-            # 'model_surface_process_id': self.env['sf.production.process'].search(
-            #     [('process_encode', '=', item['surface_process_code'])]).id,
-            # 'model_process_parameters_id': self.env['sf.processing.technology'].search(
-            #     [('process_encode', '=', item['process_parameters_code'])]).id,
-            'active': True
-        }
-        # 外协和采购生成的坯料需要根据材料型号绑定供应商
-        if route_type == 'subcontract' or route_type == 'purchase':
-            no_bom_copy_product_id.purchase_ok = True
-            no_bom_copy_product_id.seller_ids = [
-                (0, 0, {'partner_id': supplier.partner_id.id, 'delay': 1.0})]
-            if route_type == 'subcontract':
-                partner = self.env['res.partner'].search([('id', '=', supplier.partner_id.id)])
-                partner.is_subcontractor = True
-        no_bom_copy_product_id.write(vals)
-        logging.info('no_bom_copy_product_id-vals:%s' % vals)
-        # product_id.product_tmpl_id.active = False
-        return no_bom_copy_product_id
-
-    @api.model_create_multi
-    def create(self, vals_list):
-        for vals in vals_list:
-            if vals.get('upload_model_file'):
-                if vals.get('is_bfm') is False and vals.get('categ_type') == '成品':
-                    for item in vals['upload_model_file']:
-                        logging.info('create-attachment:%s' % int(item[2][0]))
-                        attachment = self.env['ir.attachment'].sudo().search([('id', '=', int(item[2][0]))])
-                        base64_data = base64.b64encode(attachment.datas)
-                        base64_datas = base64_data.decode('utf-8')
-                        model_code = hashlib.sha1(base64_datas.encode('utf-8')).hexdigest()
-                        report_path = attachment._full_path(attachment.store_fname)
-                        vals['model_file'] = self.transition_glb_file(report_path, model_code)
-                        logging.info('create-model_file:%s' % len(vals['model_file']))
-            self._sanitize_vals(vals)
-        templates = super(ResProductTemplate, self).create(vals_list)
-        if "create_product_product" not in self._context:
-            templates._create_variant_ids()
-
-        # This is needed to set given values to first variant after creation
-        for template, vals in zip(templates, vals_list):
-            related_vals = {}
-            for field_name in self._get_related_fields_variant_template():
-                if vals.get(field_name):
-                    related_vals[field_name] = vals[field_name]
-            if related_vals:
-                template.write(related_vals)
-        logging.info('create-model_file:%s' % templates.model_file)
-        return templates
-
-    @api.onchange('upload_model_file')
-    def onchange_model_file(self):
-        for item in self:
-            if item.upload_model_file:
-                if len(item.upload_model_file) > 1:
-                    raise ValidationError('只允许上传一个文件')
-                manufacturing_order = self.env['mrp.production'].search([('product_id', '=', self.id)])
-                if manufacturing_order:
-                    raise ValidationError('该产品已生成制造订单，无法进行修改')
-                file_attachment_id = item.upload_model_file[0]
-                # 附件路径
-                report_path = file_attachment_id._full_path(file_attachment_id.store_fname)
-                base64_data = base64.b64encode(file_attachment_id.datas)
-                base64_datas = base64_data.decode('utf-8')
-                model_code = hashlib.sha1(base64_datas.encode('utf-8')).hexdigest()
-                item.model_file = self.transition_glb_file(report_path, model_code)
-
-    # 将attach的datas内容转为glb文件
-    def transition_glb_file(self, report_path, code):
-        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)
-        # 转化为glb
-        output_glb_file = os.path.join('/tmp', str(code) + '.glb')
-        util_path = get_resource_path('sf_dlm', 'static/util')
-        cmd = 'python3 %s/stl2gltf.py %s %s -b' % (util_path, output_file, output_glb_file)
-        os.system(cmd)
-        # 转base64
-        with open(output_glb_file, 'rb') as fileObj:
-            image_data = fileObj.read()
-            base64_data = base64.b64encode(image_data)
-        return base64_data
-
-
-class ResMrpBom(models.Model):
-    _inherit = 'mrp.bom'
-
-    subcontractor_id = fields.Many2one('res.partner', string='外包商')
-
-    def bom_create_line_has(self, embryo):
-        vals = {
-            'bom_id': self.id,
-            'product_id': embryo.id,
-            'product_tmpl_id': embryo.product_tmpl_id.id,
-            'product_qty': 1,
-            'product_uom_id': 1
-        }
-        return self.env['mrp.bom.line'].create(vals)
-
-    # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品后再次进行创建bom
-    def bom_create(self, product, bom_type, product_type):
-        bom_id = self.env['mrp.bom'].create({
-            'product_tmpl_id': product.product_tmpl_id.id,
-            'type': bom_type,
-            # 'subcontractor_id': '' or subcontract.partner_id.id,
-            'product_qty': 1,
-            'product_uom_id': 1
-        })
-        if bom_type == 'subcontract' and product_type is not False:
-            subcontract = self.get_supplier(product.materials_type_id)
-            bom_id.subcontractor_id = subcontract.partner_id.id
-        return bom_id
-
-    # 坯料BOM组件：选取当前坯料原材料，
-    # 然后根据当前的坯料的体积得出需要的原材料重量（立方米m³） *材料密度 * 1000 = 所需原材料重量KG（公斤）
-    # 坯料所需原材料公式：当前的坯料的体积（立方米m³） *材料密度 * 1000 = 所需原材料重量KG（公斤）
-    def bom_create_line(self, embryo):
-        # 选取当前坯料原材料
-        raw_bom_line = self.get_raw_bom(embryo)
-        if raw_bom_line:
-            bom_line = self.env['mrp.bom.line'].create({
-                'bom_id': self.id,
-                'product_id': raw_bom_line.id,
-                'product_tmpl_id': raw_bom_line.product_tmpl_id.id,
-                'product_qty': round(embryo.volume * raw_bom_line.materials_type_id.density / 1000000),
-                'product_uom_id': raw_bom_line.uom_id.id,
-            })
-            return bom_line
-        else:
-            return False
-
-    # 查询材料型号默认排第一的供应商
-    def get_supplier(self, materials_type):
-        seller_id = self.env['sf.supplier.sort'].search(
-            [('materials_model_id', '=', materials_type.id)],
-            limit=1,
-            order='sequence asc')
-        return seller_id
-
-    # 匹配bom
-    def get_bom(self, product):
-        embryo_has = self.env['product.product'].search(
-            [('categ_id.type', '=', '坯料'), ('materials_type_id', '=', product.materials_type_id.id),
-             ('length', '>', product.length), ('width', '>', product.width),
-             ('height', '>', product.height), ('is_bfm', '=', False)
-             ],
-            limit=1,
-            order='volume desc'
-        )
-        logging.info('get_bom-vals:%s' % embryo_has)
-        if embryo_has:
-            rate_of_waste = ((embryo_has.volume - product.model_volume) % embryo_has.volume) * 100
-            if rate_of_waste <= 20:
-                return embryo_has
-        else:
-            return
-
-    # 查bom的原材料
-    def get_raw_bom(self, product):
-        raw_bom = self.env['product.product'].search(
-            [('categ_id.type', '=', '原材料'), ('materials_type_id', '=', product.materials_type_id.id)])
-        return raw_bom
-
-
-class ResProductCategory(models.Model):
-    _inherit = "product.category"
-
-    type = fields.Selection(
-        [("成品", "成品"), ("坯料", "坯料"), ("原材料", "原材料"), ("表面工艺", "表面工艺")],
-        default="", string="类型")
-
-    # @api.constrains('type')
-    # def _check_type(self):
-    #     category = self.env['product.category'].search(
-    #         [('type', '=', self.type)])
-    #     if category:
-    #         raise ValidationError("该类别已存在,请选择其他类别")
diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml
index efcab98d..e499dc4b 100644
--- a/sf_dlm/views/product_template_view.xml
+++ b/sf_dlm/views/product_template_view.xml
@@ -4,13 +4,8 @@
         <record model="ir.ui.view" id="view_product_template_form_inherit_sf">
             <field name="name">product.template.form.inherit.sf</field>
             <field name="model">product.template</field>
-            <field name="inherit_id" ref="product.product_template_only_form_view"/>
+            <field name="inherit_id" ref="sale.product_template_form_view"/>
             <field name="arch" type="xml">
-                <!--                <field name="image_1920" position="replace">-->
-                <!--                    <field name='categ_type' invisible="1"/>-->
-                <!--                    <field name="upload_model_file" required="True"-->
-                <!--                           widget='many2many_binary'/>-->
-                <!--                </field>-->
                 <field name="detailed_type" position="before">
                     <field name='categ_type' invisible="1"/>
                     <field name="upload_model_file"
@@ -20,15 +15,30 @@
                            attrs="{'invisible': ['|', ('categ_type', '!=', '成品'),('categ_type', '=', False)]}"/>
                 </field>
                 <field name="invoice_policy" position="after">
+                    <field name='categ_type' invisible="1"/>
                     <field name="embryo_model_type_id" string="模型类型"
                            attrs="{'invisible': ['|',('categ_type', '!=', '坯料'),('categ_type', '=', False)]}"/>
-                    <field name="materials_id" string="材料" attrs="{'invisible': [('categ_type', '=', '表面工艺')]}"/>
+                    <field name="materials_id" string="材料"
+                           attrs="{'invisible': ['|',('categ_type', '=', '表面工艺'),('categ_type', '=', '刀具')]}"/>
                     <field name="materials_type_id" string="型号"
                            domain="[('materials_id', '=', materials_id)]"
-                           attrs="{'invisible': [('categ_type', '=', '表面工艺')]}"/>
+                           attrs="{'invisible': ['|',('categ_type', '=', '表面工艺'),('categ_type', '=', '刀具')]}"/>
                     <field name="server_product_process_parameters_id" string="表面工艺参数"
                            options="{'no_create': True}"
                            attrs="{'invisible': ['|',('categ_type', '!=', '表面工艺'),('categ_type', '=', False)]}"/>
+                    <field name="cutting_tool" attrs="{'invisible': [('categ_type', '!=', '刀具')]}"/>
+                    <field name="integral_cutting_tool_type_id"
+                           attrs="{'invisible': ['|',('categ_type', '!=', '刀具'),('cutting_tool', '!=', '整体式刀具')]}"/>
+                    <field name="blade_type_id"
+                           attrs="{'invisible': ['|',('categ_type', '!=', '刀具'),('cutting_tool', '!=', '刀片')]}"/>
+                    <field name="cutter_bar_type_id"
+                           attrs="{'invisible': ['|',('categ_type', '!=', '刀具'),('cutting_tool', '!=', '刀杆')]}"/>
+                    <field name="cutter_pad_type_id"
+                           attrs="{'invisible': ['|',('categ_type', '!=', '刀具'),('cutting_tool', '!=', '刀盘')]}"/>
+                    <field name="handle_type_id"
+                           attrs="{'invisible': ['|',('categ_type', '!=', '刀具'),('cutting_tool', '!=', '刀柄')]}"/>
+                    <field name="chuck_type_id"
+                           attrs="{'invisible': ['|',('categ_type', '!=', '刀具'),('cutting_tool', '!=', '夹头')]}"/>
                 </field>
 
                 <xpath expr="//label[@for='volume']" position="before">
@@ -55,21 +65,15 @@
                                 <div class="o_address_format">
                                     <label for="model_long" string="长"/>
                                     <field name="model_long" class="o_address_zip"/>
-                                    <!--                                    <span>&amp;nbsp;</span>-->
                                     <label for="model_width" string="宽"/>
                                     <field name="model_width" class="o_address_zip"/>
-                                    <!--                                    <span>&amp;nbsp;</span>-->
                                     <label for="model_height" string="高"/>
                                     <field name="model_height" class="o_address_zip"/>
                                 </div>
-                                <!--                            <field name="model_long" string="长[mm]"/>-->
-                                <!--                            <field name="model_width" string="宽[mm]"/>-->
-                                <!--                            <field name="model_height" string="高[mm]"/>-->
                                 <field name="model_volume" string="体积[mm³]"/>
                                 <field name="product_model_type_id" string="模型类型"/>
                                 <field name="model_processing_panel" placeholder="例如R,U" string="加工面板"/>
                                 <field name="model_machining_precision"/>
-                                <!--                                <field name="model_surface_process_ids" string="表面工艺"/>-->
                                 <field name="model_process_parameters_ids" string="表面工艺参数" widget="many2many_tags"
                                        options="{'no_create': True}"/>
                                 <field name="model_remark" string="备注说明"/>
@@ -77,6 +81,144 @@
                         </group>
                     </page>
                 </xpath>
+                <xpath expr="//page[last()-1]" position="after">
+                    <page string="刀具物料参数" attrs="{'invisible': [('categ_type', '!=', '刀具')]}">
+                        <group>
+                            <!--整体式刀具-->
+                            <group attrs="{'invisible': ['|',('categ_type', '!=', '刀具'),('cutting_tool', '!=', '整体式刀具')]}">
+                                <field name="cutting_tool_parameter_brand_id"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '整体式刀具')],'required': [('cutting_tool', '=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_parameter_total_length"/>
+                                <field name="cutting_tool_parameter_shank_length"/>
+                                <field name="cutting_tool_parameter_blade_length"/>
+                                <field name="cutting_tool_parameter_diameter"/>
+                                <field name="cutting_tool_parameter_nut"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_parameter_blade_number"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '整体式刀具')]}"/>
+                            </group>
+                            <group attrs="{'invisible': ['|',('categ_type', '!=', '刀具'),('cutting_tool', '!=', '整体式刀具')]}">
+                                <field name="cutting_tool_parameter_material_model_id"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '整体式刀具')],'required': [('cutting_tool', '=', '整体式刀具')]}"/>
+                                />
+                                <field name="cutting_tool_parameter_front_angle"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_parameter_rear_angle"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_parameter_main_included_angle"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '整体式刀具')]}"/>
+                            </group>
+                            <group attrs="{'invisible': ['|',('categ_type', '!=', '刀具'),('cutting_tool', '!=', '整体式刀具')]}">
+                                <field name="cutting_tool_parameter_chuck_model_ids" widget="many2many_tags"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '整体式刀具')],'required': [('cutting_tool', '=', '整体式刀具')]}"/>
+                                <field name="cutting_tool_parameter_scope"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '整体式刀具')]}"/>
+                            </group>
+                            <!--刀片-->
+                            <group attrs="{'invisible': ['|',('categ_type', '!=', '刀具'),('cutting_tool', '!=', '刀片')]}">
+                                <field name="cutting_tool_parameter_brand_id"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '刀片')],'required': [('cutting_tool', '=', '刀片')]}"/>
+                                <field name="cutting_tool_parameter_top_angle"/>
+                                <field name="cutting_tool_parameter_front_angle"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_parameter_rear_angle"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_parameter_main_included_angle"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_parameter_r_angle"/>
+                                <field name="cutting_tool_parameter_working_hardness" attrs="{'required': [('cutting_tool', '=', '刀片')]}"/>
+                            </group>
+                            <group attrs="{'invisible': ['|',('categ_type', '!=', '刀具'),('cutting_tool', '!=', '刀片')]}">
+                                <field name="cutting_tool_parameter_material_model_id"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '刀片')],'required': [('cutting_tool', '=', '刀片')]}"/>
+                                <label for="cutting_tool_parameter_length" string="尺寸[mm]"/>
+                                <div class="o_address_format">
+                                    <label for="cutting_tool_parameter_length" string="长度L"/>
+                                    <field name="cutting_tool_parameter_length" class="o_address_zip"/>
+                                    <label for="cutting_tool_parameter_width" string="宽度D"/>
+                                    <field name="cutting_tool_parameter_width" class="o_address_zip"/>
+                                    <label for="cutting_tool_parameter_height" string="高度T"
+                                           attrs="{'invisible': [('cutting_tool', '!=', '刀片')]}"/>
+                                    <field name="cutting_tool_parameter_height" class="o_address_zip"
+                                           attrs="{'invisible': [('cutting_tool', '!=', '刀片')]}"/>
+                                </div>
+                                <field name="cutting_tool_parameter_radius"/>
+                                <field name="cutting_tool_parameter_nut"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '刀片')]}"/>
+                                <field name="cutting_tool_parameter_cutter_bar_ids" widget="many2many_tags" attrs="{'required': [('cutting_tool', '=', '刀片')]}"/>
+                                <field name="cutting_tool_parameter_cutter_pad_ids" widget="many2many_tags" attrs="{'required': [('cutting_tool', '=', '刀片')]}"/>
+                            </group>
+
+                            <!--刀杆/刀盘-->
+                            <group attrs="{'invisible': ['|',('categ_type', '!=', '刀具'),('cutting_tool', 'not in', ['刀杆','刀盘'])]}">
+                                <field name="cutting_tool_parameter_brand_id"
+                                       attrs="{'invisible': [('cutting_tool', 'not in', ['刀杆','刀盘'])],'required': [('cutting_tool', 'not in', ['刀杆','刀盘'])]}"/>
+                                <field name="cutting_tool_parameter_c_diameter"/>
+                                <field name="cutting_tool_parameter_d_diameter"/>
+                                <field name="cutting_tool_parameter_l_total_length"/>
+                                <field name="cutting_tool_parameter_wrench"/>
+                                <field name="cutting_tool_parameter_screw"/>
+                                <field name="cutting_tool_parameter_blade_ids" widget="many2many_tags"/>
+                                <field name="cutting_tool_parameter_scope"
+                                       attrs="{'invisible': [('cutting_tool', 'not in', ['刀杆','刀盘'])]}"/>
+
+                            </group>
+                            <group attrs="{'invisible': ['|',('categ_type', '!=', '刀具'),('cutting_tool', 'not in', ['刀杆','刀盘'])]}">
+                                <field name="cutting_tool_parameter_material_model_id"
+                                       attrs="{'invisible': [('cutting_tool', 'not in', ['刀杆','刀盘'])],'required': [('cutting_tool', 'not in', ['刀杆','刀盘'])]}"/>
+                                <field name="cutting_tool_parameter_rounded_corner"/>
+                                <field name="cutting_tool_parameter_accuracy_level"/>
+                                <field name="cutting_tool_parameter_blade_number"
+                                       attrs="{'invisible': [('cutting_tool', 'not in', ['刀杆','刀盘'])]}"/>
+                                <field name="cutting_tool_parameter_hardness"/>
+                            </group>
+                            <!--刀柄-->
+                            <group attrs="{'invisible': ['|',('categ_type', '!=', '刀具'),('cutting_tool', '!=', '刀柄')]}">
+                                <field name="cutting_tool_parameter_brand_id"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '刀柄')],'required': [('cutting_tool', '=', '刀柄')]}"/>
+                                <field name="cutting_tool_parameter_handle_length"/>
+                                <field name="cutting_tool_parameter_length1"/>
+                                <field name="cutting_tool_parameter_diameter1"/>
+                                <field name="cutting_tool_parameter_body_accuracy"/>
+                                <field name="cutting_tool_parameter_nut"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '刀柄')]}"/>
+                                <field name="cutting_tool_parameter_clamping_range"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '刀柄')]}"/>
+                                <field name="cutting_tool_parameter_weight"/>
+                                <field name="cutting_tool_parameter_chuck_model_ids" widget="many2many_tags"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '刀柄')],'required': [('cutting_tool', '=', '刀柄')]}"/>
+                            </group>
+                            <group attrs="{'invisible': ['|',('categ_type', '!=', '刀具'),('cutting_tool', '!=', '刀柄')]}">
+                                <field name="cutting_tool_parameter_material_model_id"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '刀柄')],'required': [('cutting_tool', '=', '刀柄')]}"/>
+                                <field name="cutting_tool_parameter_detection_accuracy"/>
+                                <field name="cutting_tool_parameter_detection_hardness"/>
+                                <field name="cutting_tool_parameter_standard_speed"/>
+                            </group>
+                            <!--夹头-->
+                            <group attrs="{'invisible': ['|',('categ_type', '!=', '刀具'),('cutting_tool', '!=', '夹头')]}">
+                                <field name="cutting_tool_parameter_brand_id"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '夹头')],'required': [('cutting_tool', '=', '夹头')]}"/>
+                                <field name="cutting_tool_parameter_outer_diameter"/>
+                                <field name="cutting_tool_parameter_inner_diameter"/>
+                                <field name="cutting_tool_parameter_accuracy"/>
+                                <field name="cutting_tool_parameter_nut"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '夹头')]}"/>
+                                <field name="cutting_tool_parameter_clamping_range"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '夹头')]}"/>
+                                <field name="cutting_tool_parameter_handle_model_ids" widget="many2many_tags"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '夹头')]}"/>
+                            </group>
+                            <group attrs="{'invisible': ['|',('categ_type', '!=', '刀具'),('cutting_tool', '!=', '夹头')]}">
+                                <field name="cutting_tool_parameter_material_model_id"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '夹头')],'required': [('cutting_tool', '=', '夹头')]}"/>
+                                <field name="cutting_tool_parameter_height" string="高度[mm]"
+                                       attrs="{'invisible': [('cutting_tool', '!=', '夹头')]}"/>
+                                <field name="cutting_tool_parameter_feature"/>
+                            </group>
+                        </group>
+                    </page>
+                </xpath>
             </field>
         </record>
 
diff --git a/sf_manufacturing/models/__init__.py b/sf_manufacturing/models/__init__.py
index 419dee46..c174827d 100644
--- a/sf_manufacturing/models/__init__.py
+++ b/sf_manufacturing/models/__init__.py
@@ -5,6 +5,8 @@ from . import mrp_maintenance
 from . import mrp_routing_workcenter
 from . import mrp_workorder
 from . import model_type
+from . import product_template
+from . import product_workorder
 from . import stock
 from . import res_user
 
diff --git a/sf_manufacturing/models/model_type.py b/sf_manufacturing/models/model_type.py
index 14315148..c665de36 100644
--- a/sf_manufacturing/models/model_type.py
+++ b/sf_manufacturing/models/model_type.py
@@ -1,6 +1,25 @@
 from odoo import fields, models
 
 
+class ResProductCategory(models.Model):
+    _inherit = "product.category"
+
+    type = fields.Selection(
+        [("成品", "成品"), ("坯料", "坯料"), ("原材料", "原材料"), ("表面工艺", "表面工艺"), ("刀具", "刀具"),
+         ("夹具", "夹具")],
+        default="", string="类型")
+
+#
+# class ResProductTemplateCateg(models.Model):
+#     _inherit = 'product.template'
+#
+#     categ_type = fields.Selection(
+#         [("成品", "成品"), ("坯料", "坯料"), ("原材料", "原材料"), ("表面工艺", "表面工艺"), ("刀具", "刀具"),
+#          ("夹具", "夹具")],
+#         string='产品的类别', related='categ_id.type',
+#         store=True)
+
+
 class ModelType(models.Model):
     _name = 'sf.model.type'
     _description = '模型类型'
@@ -82,5 +101,6 @@ class SurfaceTechnicsModelTypeRoutingSort(models.Model):
 
     _sql_constraints = [
         (
-        'route_model_type_uniq', 'unique (route_workcenter_id,surface_technics_model_type_id)', '表面工艺工序不能重复!')
+            'route_model_type_uniq', 'unique (route_workcenter_id,surface_technics_model_type_id)',
+            '表面工艺工序不能重复!')
     ]
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
new file mode 100644
index 00000000..5653ac7b
--- /dev/null
+++ b/sf_manufacturing/models/product_template.py
@@ -0,0 +1,684 @@
+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
+import logging
+import base64
+import hashlib
+import os
+
+
+class ResProductTemplate(models.Model):
+    _inherit = 'product.template'
+
+    # 模型的长,宽,高,体积,精度,材料
+    model_name = fields.Char('模型名称')
+    categ_type = fields.Selection(
+        [("成品", "成品"), ("坯料", "坯料"), ("原材料", "原材料"), ("表面工艺", "表面工艺"), ("刀具", "刀具"),
+         ("夹具", "夹具")],
+        string='产品的类别', related='categ_id.type',
+        store=True)
+    model_long = fields.Float('模型长[mm]', digits=(16, 3))
+    model_width = fields.Float('模型宽[mm]', digits=(16, 3))
+    model_height = fields.Float('模型高[mm]', digits=(16, 3))
+    model_volume = fields.Float('模型体积[m³]')
+    model_machining_precision = fields.Selection([
+        ('0.10', '±0.10mm'),
+        ('0.05', '±0.05mm'),
+        ('0.03', '±0.03mm'),
+        ('0.02', '±0.02mm'),
+        ('0.01', '±0.01mm')], string='加工精度')
+    product_model_type_id = fields.Many2one('sf.model.type', string='产品模型类型')
+    embryo_model_type_id = fields.Many2one('sf.model.type', string='坯料模型类型')
+    model_processing_panel = fields.Char('模型加工面板')
+    # model_surface_process_category_id = fields.Many2one('sf.production.process.category', string='表面工艺类别')
+    # model_surface_process_ids = fields.Many2many('sf.production.process', 'rel_product_process', string='表面工艺')
+    server_product_process_parameters_id = fields.Many2one('sf.production.process.parameter',
+                                                           string='表面工艺参数(服务产品)')
+    model_process_parameters_ids = fields.Many2many('sf.production.process.parameter', 'process_parameter_rel',
+                                                    string='表面工艺参数')
+    # model_price = fields.Float('模型单价', digits=(16, 3))
+    model_remark = fields.Char('模型备注说明')
+    length = fields.Float('长[mm]', digits=(16, 3))
+    width = fields.Float('宽[mm]', digits=(16, 3))
+    height = fields.Float('高[mm]', digits=(16, 3))
+    materials_id = fields.Many2one('sf.production.materials', string='材料')
+    materials_type_id = fields.Many2one('sf.materials.model', string='材料型号')
+    single_manufacturing = fields.Boolean(string="单个制造")
+    upload_model_file = fields.Many2many('ir.attachment', 'upload_model_file_attachment_ref', string='上传模型文件')
+    model_code = fields.Char('模型编码')
+    is_bfm = fields.Boolean('业务平台是否自动创建', default=False)
+
+    cutting_tool = fields.Selection([
+        ('整体式刀具', '整体式刀具'),
+        ('刀片', '刀片'),
+        ('刀杆', '刀杆'),
+        ('刀盘', '刀盘'),
+        ('刀柄', '刀柄'),
+        ('夹头', '夹头')], string='刀具')
+    # 关联整体式刀具型号
+    integral_cutting_tool_type_id = fields.Many2one('sf.integral.cutting.tool', '整体式刀具型号')
+    # 关联刀片型号
+    blade_type_id = fields.Many2one('sf.blade', '刀片型号')
+    # 关联刀杆型号
+    cutter_bar_type_id = fields.Many2one('sf.cutter.bar', '刀杆型号')
+    # 关联刀盘型号
+    cutter_pad_type_id = fields.Many2one('sf.cutter.pad', '刀盘型号')
+    # 关联刀柄型号
+    handle_type_id = fields.Many2one('sf.handle', '刀柄型号')
+    # 关联夹头型号
+    chuck_type_id = fields.Many2one('sf.chuck', '夹头型号')
+    cutting_tool_parameter_brand_id = fields.Many2one('sf.machine.brand', '品牌')
+    # 整体式刀具参数
+    cutting_tool_parameter_total_length = fields.Float('总长度[mm]')
+    cutting_tool_parameter_shank_length = fields.Float('柄部长度[mm]')
+    cutting_tool_parameter_blade_length = fields.Float('刃部长度[mm]')
+    cutting_tool_parameter_diameter = fields.Float('直径[mm]')
+    cutting_tool_parameter_blade_number = fields.Integer('刃数')
+    cutting_tool_parameter_front_angle = fields.Float('前角(°)')
+    cutting_tool_parameter_rear_angle = fields.Float('后角(°)')
+    cutting_tool_parameter_main_included_angle = fields.Float('主偏角(°)')
+    cutting_tool_parameter_material_model_id = fields.Many2one('sf.materials.model', '材料型号')
+    cutting_tool_parameter_nut = fields.Float('配对螺母[mm]')
+    # 适用夹头型号可以多选
+    cutting_tool_parameter_chuck_model_ids = fields.Many2many('sf.chuck', string='适用夹头型号')
+    cutting_tool_parameter_scope = fields.Char('适用范围')
+    # 刀片参数
+    cutting_tool_parameter_length = fields.Float('长度L[mm]')
+    cutting_tool_parameter_width = fields.Float('宽度D[mm])')
+    cutting_tool_parameter_height = fields.Float('高度T[mm]')
+    cutting_tool_parameter_top_angle = fields.Float('顶角(°)')
+    cutting_tool_parameter_r_angle = fields.Float('R角(°)')
+    cutting_tool_parameter_working_hardness = fields.Char('加工硬度')
+    cutting_tool_parameter_cutter_bar_ids = fields.Many2many('sf.cutter.bar', string='适用刀杆型号')
+    cutting_tool_parameter_cutter_pad_ids = fields.Many2many('sf.cutter.pad', string='适用刀盘型号')
+    cutting_tool_parameter_radius = fields.Float('刀尖半径[mm]')
+    # 刀杆/刀盘参数
+    cutting_tool_parameter_c_diameter = fields.Float('C柄径[mm]')
+    cutting_tool_parameter_l_total_length = fields.Float('L总长[mm]')
+    cutting_tool_parameter_d_diameter = fields.Float('D刃径[mm]')
+    cutting_tool_parameter_blade_ids = fields.Many2many('sf.blade', string='适用刀片型号')
+    cutting_tool_parameter_wrench = fields.Float('配对扳手[mm]')
+    cutting_tool_parameter_screw = fields.Float('配备螺丝[mm]')
+    cutting_tool_parameter_accuracy_level = fields.Char('精度等级')
+    cutting_tool_parameter_rounded_corner = fields.Float('刀尖圆角半径[mm]')
+    cutting_tool_parameter_hardness = fields.Char('硬度(°)')
+    # 刀柄参数
+    cutting_tool_parameter_handle_length = fields.Float('L[mm]')
+    cutting_tool_parameter_length1 = fields.Float('L1[mm]')
+    cutting_tool_parameter_diameter1 = fields.Float('D1[mm]')
+    cutting_tool_parameter_weight = fields.Float('重量(kg)')
+    cutting_tool_parameter_body_accuracy = fields.Float('本体精度[mm]')
+    cutting_tool_parameter_clamping_range = fields.Float('夹持范围[mm]')
+    cutting_tool_parameter_detection_accuracy = fields.Float('检测精度')
+    cutting_tool_parameter_detection_hardness = fields.Float('检测硬度')
+    cutting_tool_parameter_standard_speed = fields.Float('标准转速')
+    # 夹头参数
+    cutting_tool_parameter_accuracy = fields.Float('精度[mm]')
+    cutting_tool_parameter_outer_diameter = fields.Float('外径[mm]')
+    cutting_tool_parameter_inner_diameter = fields.Float('内径[mm]')
+    cutting_tool_parameter_handle_model_ids = fields.Many2many('sf.handle.model', string='适用刀柄型号')
+    cutting_tool_parameter_feature = fields.Char('特性')
+
+    # image_1920 = fields.Image(related='cutting_tool_parameter_image', store=True,
+    #                           domain=[('cutting_tool_parameter_image', '!=', False)])
+
+    # @api.constrains('cutting_tool_parameter_length',)
+    # def _check_length_or_width(self):
+    #     for record in self:
+    #         if record.cutting_tool == '刀片':
+    #             if record.cutting_tool_parameter_length <= 0 \
+    #                     and record.cutting_tool_parameter_width <= 0:
+    #                 raise ValueError('该产品中有字段不能为零，请确认并重新输入！')
+    #
+    #
+    # @api.constrains('cutting_tool_parameter_length',
+    #                 'cutting_tool_parameter_width')
+    # def _check_length_or_width(self):
+    #     for record in self:
+    #         if record.cutting_tool == '刀片':
+    #             if record.cutting_tool_parameter_length <= 0 \
+    #                     and record.cutting_tool_parameter_width <= 0:
+    #                 raise ValueError('该产品中有字段不能为零，请确认并重新输入！')
+    #     # if self.cutting_tool == '刀片':
+    #     #     if self.cutting_tool_parameter_length == 0 \
+    #     #             or self.cutting_tool_parameter_width == 0:
+    #     #         raise ValueError('该产品中有字段不能为零，请确认并重新输入！')
+    #
+    # @api.constrains('cutting_tool_parameter_height')
+    # def _check_height(self):
+    #     if self.cutting_tool == '刀片':
+    #         if self.cutting_tool_parameter_height <= 0:
+    #             raise ValueError('该产品中高度不能为零，请确认并重新输入！')
+    #
+    # @api.constrains('cutting_tool_parameter_top_angle')
+    # def _check_top_angle(self):
+    #     if self.cutting_tool == '刀片':
+    #         if self.cutting_tool_parameter_top_angle <= 0:
+    #             raise ValueError('该产品中顶角不能为零，请确认并重新输入！')
+    #
+    # @api.constrains('cutting_tool_parameter_r_angle')
+    # def _check_r_angle(self):
+    #     if self.cutting_tool == '刀片':
+    #         if self.cutting_tool_parameter_r_angle <= 0:
+    #             raise ValueError('该产品中R角不能为零，请确认并重新输入！')
+    #
+    # @api.constrains('cutting_tool_parameter_radius')
+    # def _check_radius(self):
+    #     if self.cutting_tool == '刀片':
+    #         if self.cutting_tool_parameter_radius <= 0:
+    #             raise ValueError('该产品中刀尖半径不能为零，请确认并重新输入！')
+    #
+    # @api.constrains('cutting_tool_parameter_handle_length',
+    #                 'cutting_tool_parameter_length1',
+    #                 'cutting_tool_parameter_diameter1')
+    # # 'cutting_tool_parameter_body_accuracy',
+    # # 'cutting_tool_parameter_detection_accuracy',
+    # # 'cutting_tool_parameter_detection_hardness')
+    # def _check_handle(self):
+    #     for record in self:
+    #         if record.cutting_tool == '刀柄':
+    #             if record.cutting_tool_parameter_handle_length == 0 \
+    #                     or record.cutting_tool_parameter_diameter1 == 0 \
+    #                     or record.cutting_tool_parameter_length1 == 0:
+    #                 # or record.cutting_tool_parameter_detection_accuracy == 0 \
+    #                 # or record.cutting_tool_parameter_detection_hardness == 0 \
+    #                 # or record.cutting_tool_parameter_body_accuracy == 0:
+    #                 raise ValueError('该产品中有字段不能为零，请确认并重新输入！')
+    #     # if self.cutting_tool == '刀柄':
+    #     #     if self.cutting_tool_parameter_handle_length == 0 \
+    #     #             or self.cutting_tool_parameter_diameter1 == 0 \
+    #     #             or self.cutting_tool_parameter_length1 == 0 \
+    #     #             or self.cutting_tool_parameter_detection_accuracy == 0 \
+    #     #             or self.cutting_tool_parameter_detection_hardness == 0 \
+    #     #             or self.cutting_tool_parameter_body_accuracy == 0:
+    #     #         raise ValueError('该产品中有字段不能为零，请确认并重新输入！')
+    #
+    # @api.constrains('cutting_tool_parameter_weight')
+    # def _check_weight(self):
+    #     if self.cutting_tool == '刀柄':
+    #         if self.cutting_tool_parameter_weight == 0:
+    #             raise ValueError('该产品中重量不能为零，请确认并重新输入！')
+
+    # @api.constrains('cutting_tool_parameter_c_diameter',
+    #                 'cutting_tool_parameter_l_total_length',
+    #                 'cutting_tool_parameter_d_diameter',
+    #                 'cutting_tool_parameter_wrench',
+    #                 'cutting_tool_parameter_screw',
+    #                 'cutting_tool_parameter_rounded_corner',
+    #                 'cutting_tool_parameter_hardness')
+    # def _check_angle(self):
+    #     if self.cutting_tool in ['刀杆', '刀盘']:
+    #         if self.cutting_tool_parameter_c_diameter == 0 \
+    #                 or self.cutting_tool_parameter_l_total_length == 0 \
+    #                 or self.cutting_tool_parameter_d_diameter == 0 \
+    #                 or self.cutting_tool_parameter_wrench == 0 \
+    #                 or self.cutting_tool_parameter_screw == 0 \
+    #                 or self.cutting_tool_parameter_rounded_corner == 0 \
+    #                 or self.cutting_tool_parameter_hardness:
+    #             raise ValueError('该产品中有字段不能为零，请确认并重新输入！')
+
+    # @api.constrains('cutting_tool_parameter_c_diameter',
+    #                 'cutting_tool_parameter_l_total_length',
+    #                 'cutting_tool_parameter_diameter1')
+    # def _check_angle(self):
+    #     for record in self:
+    #         if record.cutting_tool == '整体式刀具' or record.cutting_tool == '刀片':
+    #             if record.cutting_tool_parameter_c_diameter == 0 \
+    #                     or record.cutting_tool_parameter_l_total_length == 0 \
+    #                     or record.cutting_tool_parameter_diameter1 == 0:
+    #                 raise ValueError('该产品中有字段不能为零，请确认并重新输入！')
+
+    # @api.constrains('cutting_tool_parameter_outer_diameter',
+    #                 'cutting_tool_parameter_inner_diameter',
+    #                 'cutting_tool_parameter_body_accuracy',
+    #                 'cutting_tool_parameter_handle_length',
+    #                 'cutting_tool_parameter_length1',
+    #                 'cutting_tool_parameter_diameter1')
+    # def _check_angle(self):
+    #     for record in self:
+    #         if record.cutting_tool == '整体式刀具' or record.cutting_tool == '刀片':
+    #             if record.cutting_tool_parameter_front_angle == 0 \
+    #                     or record.cutting_tool_parameter_rear_angle == 0 \
+    #                     or record.cutting_tool_parameter_main_included_angle == 0:
+    #                 raise ValueError('该产品中有字段不能为零，请确认并重新输入！')
+
+    # @api.constrains('cutting_tool_parameter_front_angle',
+    #                 'cutting_tool_parameter_rear_angle',
+    #                 'cutting_tool_parameter_main_included_angle')
+    # def _check_angle(self):
+    #     for record in self:
+    #         if record.cutting_tool == '整体式刀具' or record.cutting_tool == '刀片':
+    #             if record.cutting_tool_parameter_front_angle <= 0 \
+    #                     or record.cutting_tool_parameter_rear_angle <= 0 \
+    #                     or record.cutting_tool_parameter_main_included_angle <= 0:
+    #                 raise ValueError('该产品中有字段不能为零，请确认并重新输入！')
+    #
+    # @api.constrains('cutting_tool_parameter_total_length',
+    #                 'cutting_tool_parameter_shank_length',
+    #                 'cutting_tool_parameter_blade_length',
+    #                 'cutting_tool_parameter_diameter')
+    # def _check_length(self):
+    #     for record in self:
+    #         if record.cutting_tool == '整体式刀具':
+    #             if record.cutting_tool_parameter_total_length <= 0 \
+    #                     or record.cutting_tool_parameter_shank_length <= 0 \
+    #                     or record.cutting_tool_parameter_blade_length <= 0 \
+    #                     or record.cutting_tool_parameter_diameter <= 0:
+    #                 raise ValueError('该产品中有字段不能为零，请确认并重新输入！')
+
+    # @api.constrains('cutting_tool_parameter_total_length',
+    #                 'cutting_tool_parameter_shank_length',
+    #                 'cutting_tool_parameter_blade_length',
+    #                 'cutting_tool_parameter_diameter')
+    # def _check_length(self):
+    #     for record in self:
+    #         if record.cutting_tool == '整体式刀具':
+    #             if record.cutting_tool_parameter_total_length == 0 \
+    #                     or record.cutting_tool_parameter_shank_length == 0 \
+    #                     or record.cutting_tool_parameter_blade_length == 0 \
+    #                     or record.cutting_tool_parameter_diameter == 0:
+    #                 raise ValueError('该产品中有字段不能为零，请确认并重新输入！')
+
+    # @api.constrains('cutting_tool_parameter_blade_number')
+    # def _check_blade_number(self):
+    #     if self.cutting_tool in ['整体式刀具', '刀杆', '刀盘']:
+    #         if self.cutting_tool_parameter_blade_number <= 0:
+    #             raise ValueError('该产品中刃数不能为零，请确认并重新输入！')
+    #
+    # @api.constrains('cutting_tool_parameter_nut')
+    # def _check_nut(self):
+    #     if self.cutting_tool in ['整体式刀具', '刀片', '刀柄', '夹头']:
+    #         if self.cutting_tool_parameter_nut <= 0:
+    #             raise ValueError('该产品中配对螺母不能为零，请确认并重新输入！')
+
+    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')
+        if product_length_in_feet_param == '1':
+            return self.env.ref('uom.product_uom_cubic_foot')
+        else:
+            return self.env.ref('sf_dlm.product_uom_cubic_millimeter')
+
+    # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品
+    def product_create(self, product_id, item, order_id, order_number, i):
+        copy_product_id = product_id.with_user(self.env.ref("base.user_admin")).copy()
+        copy_product_id.product_tmpl_id.active = True
+        model_type = self.env['sf.model.type'].search([], limit=1)
+        attachment = self.attachment_create(item['model_name'], item['model_data'])
+        vals = {
+            'name': '%s-%s-%s' % ('P', order_id.name, i),
+            'model_long': item['model_long'] + model_type.embryo_tolerance,
+            'model_width': item['model_width'] + model_type.embryo_tolerance,
+            'model_height': item['model_height'] + model_type.embryo_tolerance,
+            'model_volume': (item['model_long'] + model_type.embryo_tolerance) * (
+                    item['model_width'] + model_type.embryo_tolerance) * (
+                                    item['model_height'] + model_type.embryo_tolerance),
+            'product_model_type_id': model_type.id,
+            'model_processing_panel': 'R',
+            'model_machining_precision': item['model_machining_precision'],
+            'model_code': item['barcode'],
+            'length': item['model_long'],
+            'width': item['model_width'],
+            'height': item['model_height'],
+            'volume': item['model_long'] * item['model_width'] * item['model_height'],
+            'model_file': '' if not item['model_file'] else base64.b64decode(item['model_file']),
+            'model_name': attachment.name,
+            'upload_model_file': [(6, 0, [attachment.id])],
+            # 'tag_ids': [(6, 0, [t.id for t in account_template.tag_ids])],
+            # 'single_manufacturing': True,
+            # 'tracking': 'serial',
+            'list_price': item['price'],
+            # 'categ_id': self.env.ref('sf_dlm.product_category_finished_sf').id,
+            'materials_id': self.env['sf.production.materials'].search(
+                [('materials_no', '=', item['texture_code'])]).id,
+            'materials_type_id': self.env['sf.materials.model'].search(
+                [('materials_no', '=', item['texture_type_code'])]).id,
+            # 'model_surface_process_ids': self.get_production_process_id(item['surface_process_code']),
+            'model_process_parameters_ids': self.get_process_parameters_id(item['process_parameters_code']),
+            'model_remark': item['remark'],
+            'default_code': '%s-%s' % (order_number, i),
+            # 'barcode': item['barcode'],
+            'active': True,
+            # 'route_ids': self._get_routes('')
+        }
+        copy_product_id.sudo().write(vals)
+        # product_id.product_tmpl_id.active = False
+        return copy_product_id
+
+    def _get_ids(self, param):
+        type_ids = []
+        if not param:
+            return []
+        for item in param:
+            type_ids.append(item.id)
+        return [(6, 0, type_ids)]
+
+    def get_process_parameters_id(self, process_parameters_code):
+        process_parameters_ids = []
+        for item in process_parameters_code:
+            process_parameters = self.env['sf.production.process.parameter'].search([('code', '=', item)])
+            process_parameters_ids.append(process_parameters.id)
+        return [(6, 0, process_parameters_ids)]
+
+    def attachment_create(self, name, data):
+        attachment = self.env['ir.attachment'].create({
+            'datas': base64.b64decode(data),
+            'type': 'binary',
+            'public': True,
+            'description': '模型文件',
+            'name': name
+        })
+        return attachment
+
+    # 创建坯料
+    def no_bom_product_create(self, product_id, item, order_id, route_type, i):
+        no_bom_copy_product_id = product_id.with_user(self.env.ref("base.user_admin")).copy()
+        no_bom_copy_product_id.product_tmpl_id.active = True
+        materials_id = self.env['sf.production.materials'].search(
+            [('materials_no', '=', item['texture_code'])])
+        materials_type_id = self.env['sf.materials.model'].search(
+            [('materials_no', '=', item['texture_type_code'])])
+        model_type = self.env['sf.model.type'].search([], limit=1)
+        supplier = self.env['mrp.bom'].get_supplier(materials_type_id)
+        logging.info('no_bom_copy_product_supplier-vals:%s' % supplier)
+        vals = {
+            'name': '%s-%s-%s [%s %s-%s * %s * %s]' % ('R',
+                                                       order_id.name, i, materials_id.name, materials_type_id.name,
+                                                       item['model_long'] + model_type.embryo_tolerance,
+                                                       item['model_width'] + model_type.embryo_tolerance,
+                                                       item['model_height'] + model_type.embryo_tolerance),
+            'length': item['model_long'] + model_type.embryo_tolerance,
+            'width': item['model_width'] + model_type.embryo_tolerance,
+            'height': item['model_height'] + model_type.embryo_tolerance,
+            'volume': (item['model_long'] + model_type.embryo_tolerance) * (
+                    item['model_width'] + model_type.embryo_tolerance) * (
+                              item['model_height'] + model_type.embryo_tolerance),
+            'embryo_model_type_id': model_type.id,
+            'list_price': item['price'],
+            'materials_id': materials_id.id,
+            'materials_type_id': materials_type_id.id,
+            'is_bfm': True,
+            # 'route_ids': self._get_routes(route_type),
+            # 'categ_id': self.env.ref('sf_dlm.product_category_embryo_sf').id,
+            # 'model_surface_process_id': self.env['sf.production.process'].search(
+            #     [('process_encode', '=', item['surface_process_code'])]).id,
+            # 'model_process_parameters_id': self.env['sf.processing.technology'].search(
+            #     [('process_encode', '=', item['process_parameters_code'])]).id,
+            'active': True
+        }
+        # 外协和采购生成的坯料需要根据材料型号绑定供应商
+        if route_type == 'subcontract' or route_type == 'purchase':
+            no_bom_copy_product_id.purchase_ok = True
+            no_bom_copy_product_id.seller_ids = [
+                (0, 0, {'partner_id': supplier.partner_id.id, 'delay': 1.0})]
+            if route_type == 'subcontract':
+                partner = self.env['res.partner'].search([('id', '=', supplier.partner_id.id)])
+                partner.is_subcontractor = True
+        no_bom_copy_product_id.write(vals)
+        logging.info('no_bom_copy_product_id-vals:%s' % vals)
+        # product_id.product_tmpl_id.active = False
+        return no_bom_copy_product_id
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        for vals in vals_list:
+            if vals.get('upload_model_file'):
+                if vals.get('is_bfm') is False and vals.get('categ_type') == '成品':
+                    for item in vals['upload_model_file']:
+                        logging.info('create-attachment:%s' % int(item[2][0]))
+                        attachment = self.env['ir.attachment'].sudo().search([('id', '=', int(item[2][0]))])
+                        base64_data = base64.b64encode(attachment.datas)
+                        base64_datas = base64_data.decode('utf-8')
+                        model_code = hashlib.sha1(base64_datas.encode('utf-8')).hexdigest()
+                        report_path = attachment._full_path(attachment.store_fname)
+                        vals['model_file'] = self.transition_glb_file(report_path, model_code)
+                        logging.info('create-model_file:%s' % len(vals['model_file']))
+            self._sanitize_vals(vals)
+        templates = super(ResProductTemplate, self).create(vals_list)
+        if "create_product_product" not in self._context:
+            templates._create_variant_ids()
+
+        # This is needed to set given values to first variant after creation
+        for template, vals in zip(templates, vals_list):
+            related_vals = {}
+            for field_name in self._get_related_fields_variant_template():
+                if vals.get(field_name):
+                    related_vals[field_name] = vals[field_name]
+            if related_vals:
+                template.write(related_vals)
+        logging.info('create-model_file:%s' % templates.model_file)
+        return templates
+
+    @api.onchange('upload_model_file')
+    def onchange_model_file(self):
+        for item in self:
+            if item.upload_model_file:
+                if len(item.upload_model_file) > 1:
+                    raise ValidationError('只允许上传一个文件')
+                manufacturing_order = self.env['mrp.production'].search([('product_id', '=', self.id)])
+                if manufacturing_order:
+                    raise ValidationError('该产品已生成制造订单，无法进行修改')
+                file_attachment_id = item.upload_model_file[0]
+                # 附件路径
+                report_path = file_attachment_id._full_path(file_attachment_id.store_fname)
+                base64_data = base64.b64encode(file_attachment_id.datas)
+                base64_datas = base64_data.decode('utf-8')
+                model_code = hashlib.sha1(base64_datas.encode('utf-8')).hexdigest()
+                item.model_file = self.transition_glb_file(report_path, model_code)
+
+    # 将attach的datas内容转为glb文件
+    def transition_glb_file(self, report_path, code):
+        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)
+        # 转化为glb
+        output_glb_file = os.path.join('/tmp', str(code) + '.glb')
+        util_path = get_resource_path('sf_dlm', 'static/util')
+        cmd = 'python3 %s/stl2gltf.py %s %s -b' % (util_path, output_file, output_glb_file)
+        os.system(cmd)
+        # 转base64
+        with open(output_glb_file, 'rb') as fileObj:
+            image_data = fileObj.read()
+            base64_data = base64.b64encode(image_data)
+        return base64_data
+
+    @api.onchange('integral_cutting_tool_type_id')
+    def _get_integral_cutting_tool_type_info(self):
+        if self.integral_cutting_tool_type_id:
+            for item in self:
+                item.cutting_tool_parameter_brand_id = item.integral_cutting_tool_type_id.brand.id
+                item.cutting_tool_parameter_total_length = item.integral_cutting_tool_type_id.total_length
+                item.cutting_tool_parameter_shank_length = item.integral_cutting_tool_type_id.shank_length
+                item.cutting_tool_parameter_blade_length = item.integral_cutting_tool_type_id.blade_length
+                item.cutting_tool_parameter_diameter = item.integral_cutting_tool_type_id.diameter
+                item.cutting_tool_parameter_nut = item.integral_cutting_tool_type_id.nut
+                item.cutting_tool_parameter_blade_number = item.integral_cutting_tool_type_id.blade_number
+                item.cutting_tool_parameter_material_model_id = item.integral_cutting_tool_type_id.material_model.id
+                item.cutting_tool_parameter_front_angle = item.integral_cutting_tool_type_id.front_angle
+                item.cutting_tool_parameter_rear_angle = item.integral_cutting_tool_type_id.rear_angle
+                item.cutting_tool_parameter_main_included_angle = item.integral_cutting_tool_type_id.main_included_angle
+                item.cutting_tool_parameter_chuck_model_ids = self._get_ids(
+                    item.integral_cutting_tool_type_id.chuck_model)
+                item.cutting_tool_parameter_scope = item.integral_cutting_tool_type_id.scope
+                item.image_1920 = '' if not item.integral_cutting_tool_type_id.image else item.integral_cutting_tool_type_id.image
+
+    @api.onchange('blade_type_id')
+    def _get_blade_type_info(self):
+        if self.blade_type_id:
+            for item in self:
+                item.cutting_tool_parameter_brand_id = item.blade_type_id.brand.id
+                item.cutting_tool_parameter_top_angle = item.blade_type_id.top_angle
+                item.cutting_tool_parameter_front_angle = item.blade_type_id.front_angle
+                item.cutting_tool_parameter_rear_angle = item.blade_type_id.rear_angle
+                item.cutting_tool_parameter_main_included_angle = item.blade_type_id.main_included_angle
+                item.cutting_tool_parameter_r_angle = item.blade_type_id.r_angle
+                item.cutting_tool_parameter_working_hardness = item.blade_type_id.hardness
+                item.cutting_tool_parameter_material_model_id = item.blade_type_id.material_model.id
+                item.cutting_tool_parameter_length = item.blade_type_id.length
+                item.cutting_tool_parameter_width = item.blade_type_id.width
+                item.cutting_tool_parameter_height = item.blade_type_id.height
+                item.cutting_tool_parameter_radius = item.blade_type_id.radius
+                item.cutting_tool_parameter_nut = item.blade_type_id.nut
+                item.cutting_tool_parameter_cutter_bar_ids = self._get_ids(item.blade_type_id.cutter_bar)
+                item.cutting_tool_parameter_cutter_pad_ids = self._get_ids(item.blade_type_id.cutter_pad)
+                item.image_1920 = '' if not item.blade_type_id.image else item.blade_type_id.image
+
+    @api.onchange('cutter_bar_type_id')
+    def _get_cutter_bar_type_info(self):
+        if self.cutter_bar_type_id:
+            for item in self:
+                item.cutting_tool_parameter_brand_id = item.cutter_bar_type_id.brand.id
+                item.cutting_tool_parameter_c_diameter = item.cutter_bar_type_id.c_diameter
+                item.cutting_tool_parameter_d_diameter = item.cutter_bar_type_id.d_diameter
+                item.cutting_tool_parameter_l_total_length = item.cutter_bar_type_id.total_length
+                item.cutting_tool_parameter_wrench = item.cutter_bar_type_id.wrench
+                item.cutting_tool_parameter_screw = item.cutter_bar_type_id.screw
+                item.cutting_tool_parameter_blade_ids = self._get_ids(item.cutter_bar_type_id.blade)
+                item.cutting_tool_parameter_scope = item.cutter_bar_type_id.scope
+                item.cutting_tool_parameter_material_model_id = item.cutter_bar_type_id.material_model.id
+                item.cutting_tool_parameter_rounded_corner = item.cutter_bar_type_id.radius
+                item.cutting_tool_parameter_accuracy_level = item.cutter_bar_type_id.accuracy
+                item.cutting_tool_parameter_blade_number = item.cutter_bar_type_id.blade_number
+                item.cutting_tool_parameter_hardness = item.cutter_bar_type_id.hardness
+                item.image_1920 = '' if not item.cutter_bar_type_id.image else item.cutter_bar_type_id.image
+
+    @api.onchange('cutter_pad_type_id')
+    def _get_cutter_pad_type_info(self):
+        if self.cutter_pad_type_id:
+            for item in self:
+                item.cutting_tool_parameter_brand_id = item.cutter_pad_type_id.brand.id
+                item.cutting_tool_parameter_c_diameter = item.cutter_pad_type_id.c_diameter
+                item.cutting_tool_parameter_d_diameter = item.cutter_pad_type_id.d_diameter
+                item.cutting_tool_parameter_l_total_length = item.cutter_pad_type_id.total_length
+                item.cutting_tool_parameter_wrench = item.cutter_pad_type_id.wrench
+                item.cutting_tool_parameter_screw = item.cutter_pad_type_id.screw
+                item.cutting_tool_parameter_blade_ids = item.cutter_pad_type_id.blade.id
+                item.cutting_tool_parameter_scope = item.cutter_pad_type_id.scope
+                item.cutting_tool_parameter_material_model_id = item.cutter_pad_type_id.material_model.id
+                item.cutting_tool_parameter_rounded_corner = item.cutter_pad_type_id.radius
+                item.cutting_tool_parameter_accuracy_level = item.cutter_pad_type_id.accuracy
+                item.cutting_tool_parameter_blade_number = item.cutter_pad_type_id.blade_number
+                item.cutting_tool_parameter_hardness = item.cutter_pad_type_id.hardness
+                item.image_1920 = '' if not item.cutter_pad_type_id.image else item.cutter_pad_type_id.image
+
+    @api.onchange('handle_type_id')
+    def _get_handle_type_info(self):
+        if self.handle_type_id:
+            for item in self:
+                item.cutting_tool_parameter_brand_id = item.handle_type_id.brand.id
+                item.cutting_tool_parameter_handle_length = item.handle_type_id.length
+                item.cutting_tool_parameter_length1 = item.handle_type_id.length1
+                item.cutting_tool_parameter_diameter1 = item.handle_type_id.diameter1
+                item.cutting_tool_parameter_body_accuracy = item.handle_type_id.body_accuracy
+                item.cutting_tool_parameter_nut = item.handle_type_id.nut
+                item.cutting_tool_parameter_clamping_range = item.handle_type_id.clamping_range
+                item.cutting_tool_parameter_weight = item.handle_type_id.weight
+                item.cutting_tool_parameter_material_model_id = item.handle_type_id.material_model.id
+                item.cutting_tool_parameter_chuck_model_ids = self._get_ids(item.handle_type_id.chuck_model)
+                item.cutting_tool_parameter_detection_accuracy = item.handle_type_id.detection_accuracy
+                item.cutting_tool_parameter_detection_hardness = item.handle_type_id.detection_hardness
+                item.cutting_tool_parameter_standard_speed = item.handle_type_id.standard_speed
+                item.image_1920 = '' if not item.handle_type_id.image else item.handle_type_id.image
+
+    @api.onchange('chuck_type_id')
+    def _get_chuck_type_info(self):
+        if self.chuck_type_id:
+            for item in self:
+                item.cutting_tool_parameter_brand_id = item.chuck_type_id.brand.id
+                item.cutting_tool_parameter_outer_diameter = item.chuck_type_id.diameter
+                item.cutting_tool_parameter_inner_diameter = item.chuck_type_id.inner_diameter
+                item.cutting_tool_parameter_accuracy = item.chuck_type_id.accuracy
+                item.cutting_tool_parameter_nut = item.chuck_type_id.nut
+                item.cutting_tool_parameter_clamping_range = item.chuck_type_id.clamping_range
+                item.cutting_tool_parameter_handle_model_ids = self._get_ids(item.chuck_type_id.handle_model)
+                item.cutting_tool_parameter_material_model_id = item.chuck_type_id.material_model.id
+                item.cutting_tool_parameter_height = item.chuck_type_id.height
+                item.cutting_tool_parameter_feature = item.chuck_type_id.feature
+                item.image_1920 = '' if not item.chuck_type_id.image else item.chuck_type_id.image
+
+class ResMrpBom(models.Model):
+    _inherit = 'mrp.bom'
+
+    subcontractor_id = fields.Many2one('res.partner', string='外包商')
+
+    def bom_create_line_has(self, embryo):
+        vals = {
+            'bom_id': self.id,
+            'product_id': embryo.id,
+            'product_tmpl_id': embryo.product_tmpl_id.id,
+            'product_qty': 1,
+            'product_uom_id': 1
+        }
+        return self.env['mrp.bom.line'].create(vals)
+
+    # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品后再次进行创建bom
+    def bom_create(self, product, bom_type, product_type):
+        bom_id = self.env['mrp.bom'].create({
+            'product_tmpl_id': product.product_tmpl_id.id,
+            'type': bom_type,
+            # 'subcontractor_id': '' or subcontract.partner_id.id,
+            'product_qty': 1,
+            'product_uom_id': 1
+        })
+        if bom_type == 'subcontract' and product_type is not False:
+            subcontract = self.get_supplier(product.materials_type_id)
+            bom_id.subcontractor_id = subcontract.partner_id.id
+        return bom_id
+
+    # 坯料BOM组件：选取当前坯料原材料，
+    # 然后根据当前的坯料的体积得出需要的原材料重量（立方米m³） *材料密度 * 1000 = 所需原材料重量KG（公斤）
+    # 坯料所需原材料公式：当前的坯料的体积（立方米m³） *材料密度 * 1000 = 所需原材料重量KG（公斤）
+    def bom_create_line(self, embryo):
+        # 选取当前坯料原材料
+        raw_bom_line = self.get_raw_bom(embryo)
+        if raw_bom_line:
+            bom_line = self.env['mrp.bom.line'].create({
+                'bom_id': self.id,
+                'product_id': raw_bom_line.id,
+                'product_tmpl_id': raw_bom_line.product_tmpl_id.id,
+                'product_qty': round(embryo.volume * raw_bom_line.materials_type_id.density / 1000000),
+                'product_uom_id': raw_bom_line.uom_id.id,
+            })
+            return bom_line
+        else:
+            return False
+
+    # 查询材料型号默认排第一的供应商
+    def get_supplier(self, materials_type):
+        seller_id = self.env['sf.supplier.sort'].search(
+            [('materials_model_id', '=', materials_type.id)],
+            limit=1,
+            order='sequence asc')
+        return seller_id
+
+    # 匹配bom
+    def get_bom(self, product):
+        embryo_has = self.env['product.product'].search(
+            [('categ_id.type', '=', '坯料'), ('materials_type_id', '=', product.materials_type_id.id),
+             ('length', '>', product.length), ('width', '>', product.width),
+             ('height', '>', product.height), ('is_bfm', '=', False)
+             ],
+            limit=1,
+            order='volume desc'
+        )
+        logging.info('get_bom-vals:%s' % embryo_has)
+        if embryo_has:
+            rate_of_waste = ((embryo_has.volume - product.model_volume) % embryo_has.volume) * 100
+            if rate_of_waste <= 20:
+                return embryo_has
+        else:
+            return
+
+    # 查bom的原材料
+    def get_raw_bom(self, product):
+        raw_bom = self.env['product.product'].search(
+            [('categ_id.type', '=', '原材料'), ('materials_type_id', '=', product.materials_type_id.id)])
+        return raw_bom
+
+    # @api.constrains('type')
+    # def _check_type(self):
+    #     category = self.env['product.category'].search(
+    #         [('type', '=', self.type)])
+    #     if category:
+    #         raise ValidationError("该类别已存在,请选择其他类别")
diff --git a/sf_manufacturing/models/product_workorder.py b/sf_manufacturing/models/product_workorder.py
new file mode 100644
index 00000000..bcdc5d86
--- /dev/null
+++ b/sf_manufacturing/models/product_workorder.py
@@ -0,0 +1,12 @@
+from odoo import fields, models
+
+
+class ResMrpWorkOrder(models.Model):
+    _inherit = 'mrp.workorder'
+    _order = 'sequence'
+
+    product_tmpl_id_length = fields.Float(related='production_id.product_tmpl_id.length', readonly=True, store=True, check_company=True, string="坯料长度(mm)")
+    product_tmpl_id_width = fields.Float(related='production_id.product_tmpl_id.width', readonly=True, store=True, check_company=True, string="坯料宽度(mm)")
+    product_tmpl_id_height = fields.Float(related='production_id.product_tmpl_id.height', readonly=True, store=True, check_company=True, string="坯料高度(mm)")
+    product_tmpl_id_materials_id = fields.Many2one(related='production_id.product_tmpl_id.materials_id', readonly=True, store=True, check_company=True, string="材料")
+    product_tmpl_id_materials_type_id = fields.Many2one(related='production_id.product_tmpl_id.materials_type_id', readonly=True, store=True, check_company=True, string="型号")
diff --git a/sf_mrs_connect/data/ir_cron_data.xml b/sf_mrs_connect/data/ir_cron_data.xml
index 513d5dee..016789b6 100644
--- a/sf_mrs_connect/data/ir_cron_data.xml
+++ b/sf_mrs_connect/data/ir_cron_data.xml
@@ -99,28 +99,6 @@
         <field name="doall" eval="False"/>
     </record>
 
-    <record model="ir.cron" id="sf_cron10">
-        <field name="name">同步资源库刀具类别</field>
-        <field name="model_id" ref="model_sf_cutting_tool_category"/>
-        <field name="state">code</field>
-        <field name="code">model.sync_cutting_tool_category()</field>
-        <field name="interval_number">1</field>
-        <field name="interval_type">days</field>
-        <field name="numbercall">-1</field>
-        <field name="doall" eval="False"/>
-    </record>
-
-    <record model="ir.cron" id="sf_cron11">
-        <field name="name">同步资源库刀具型号</field>
-        <field name="model_id" ref="model_sf_cutting_tool_type"/>
-        <field name="state">code</field>
-        <field name="code">model.sync_cutting_tool_type()</field>
-        <field name="interval_number">1</field>
-        <field name="interval_type">days</field>
-        <field name="numbercall">-1</field>
-        <field name="doall" eval="False"/>
-    </record>
-
     <record model="ir.cron" id="sf_cron12">
         <field name="name">同步资源库工序</field>
         <field name="model_id" ref="model_sf_processing_order"/>
@@ -307,4 +285,48 @@
         <field name="numbercall">-1</field>
         <field name="doall" eval="False"/>
     </record>
+
+    <record model="ir.cron" id="sf_cron29">
+        <field name="name">同步资源库夹紧元件型号</field>
+        <field name="model_id" ref="model_sf_fixture_clamping_element"/>
+        <field name="state">code</field>
+        <field name="code">model.sync_fixture_clamping_element()</field>
+        <field name="interval_number">1</field>
+        <field name="interval_type">days</field>
+        <field name="numbercall">-1</field>
+        <field name="doall" eval="False"/>
+    </record>
+
+    <record model="ir.cron" id="sf_cron30">
+        <field name="name">同步资源库夹紧元件类型</field>
+        <field name="model_id" ref="model_sf_clamping_element_type"/>
+        <field name="state">code</field>
+        <field name="code">model.sync_clamping_element_type()</field>
+        <field name="interval_number">1</field>
+        <field name="interval_type">days</field>
+        <field name="numbercall">-1</field>
+        <field name="doall" eval="False"/>
+    </record>
+
+    <record model="ir.cron" id="sf_cron31">
+        <field name="name">同步资源库导向元件类型</field>
+        <field name="model_id" ref="model_sf_guide_element_type"/>
+        <field name="state">code</field>
+        <field name="code">model.sync_guide_element_type()</field>
+        <field name="interval_number">1</field>
+        <field name="interval_type">days</field>
+        <field name="numbercall">-1</field>
+        <field name="doall" eval="False"/>
+    </record>
+
+     <record model="ir.cron" id="sf_cron31">
+        <field name="name">同步资源库导向元件导向方式</field>
+        <field name="model_id" ref="model_sf_guide_element_guide_mode"/>
+        <field name="state">code</field>
+        <field name="code">model.sync_guide_element_guide_mode()</field>
+        <field name="interval_number">1</field>
+        <field name="interval_type">days</field>
+        <field name="numbercall">-1</field>
+        <field name="doall" eval="False"/>
+    </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 bb996fdf..de7265ba 100644
--- a/sf_mrs_connect/models/res_config_setting.py
+++ b/sf_mrs_connect/models/res_config_setting.py
@@ -40,100 +40,111 @@ class ResConfigSettings(models.TransientModel):
             _logger.info("同步资源库机床型号")
             self.env['sf.machine_tool.category'].sync_all_machine_tool_category()
             _logger.info("同步资源库机床类型")
-            self.env['sf.cutting_tool.category'].sync_all_cutting_tool_category()
-            _logger.info("同步资源库刀具类别")
-            self.env['sf.cutting_tool.type'].sync_all_cutting_tool_type()
-            _logger.info("同步资源库刀具")
             # self.env['sf.production.process.parameter'].sync_all_production_process_parameter()
             # _logger.info("同步表面工艺参数")
-            _logger.info("定时同步每日功能刀具类型列表...")
-            # self.env['sf.functional.cutting.tool.model'].sync_functional_cutting_tool_model()
-            _logger.info("同步每日功能刀具类型完成")
+            # _logger.info("定时同步每日功能刀具类型列表...")
+            # # self.env['sf.functional.cutting.tool.model'].sync_functional_cutting_tool_model()
+            # _logger.info("同步每日功能刀具类型完成")
             _logger.info("同步所有功能刀具类型...")
             self.env['sf.functional.cutting.tool.model'].sync_all_functional_cutting_tool_model()
             _logger.info("同步所有功能刀具类型完成")
-            _logger.info("定时同步每日整体式刀具类型列表...")
-            # self.env['sf.integral.cutting.tool'].sync_integral_cutting_tool()
-            _logger.info("同步整体式刀具类型完成")
-            _logger.info("同步每日刀片类型列表...")
-            self.env['sf.blade.model'].sync_blade_model()
-            _logger.info("同步每日刀片类型完成")
+            # _logger.info("定时同步每日整体式刀具类型列表...")
+            # # self.env['sf.integral.cutting.tool'].sync_integral_cutting_tool()
+            # _logger.info("同步整体式刀具类型完成")
+            # _logger.info("同步每日刀具物料...")
+            # self.env['sf.cutting.tool.material'].sync_cutting_tool_material()
+            # _logger.info("同步每日刀具物料完成")
+            _logger.info("同步所有刀具物料...")
+            self.env['sf.cutting.tool.material'].sync_all_cutting_tool_material()
+            _logger.info("同步所有刀具物料完成")
+            # _logger.info("同步每日刀片类型列表...")
+            # self.env['sf.blade.model'].sync_blade_model()
+            # _logger.info("同步每日刀片类型完成")
             _logger.info("同步所有刀片类型列表...")
             self.env['sf.blade.model'].sync_all_blade_model()
             _logger.info("同步所有刀片类型完成")
-            _logger.info("同步每日刀杆类型...")
-            self.env['sf.cutter.bar.model'].sync_cutter_bar_model()
-            _logger.info("同步每日刀杆类型完成")
+            # _logger.info("同步每日刀杆类型...")
+            # self.env['sf.cutter.bar.model'].sync_cutter_bar_model()
+            # _logger.info("同步每日刀杆类型完成")
             _logger.info("同步所有刀杆类型...")
             self.env['sf.cutter.bar.model'].sync_all_cutter_bar_model()
             _logger.info("同步所有刀杆类型完成")
-            _logger.info("同步每日刀盘类型...")
-            self.env['sf.cutter.pad.model'].sync_cutter_pad_model()
-            _logger.info("同步每日刀盘类型完成")
+            # _logger.info("同步每日刀盘类型...")
+            # self.env['sf.cutter.pad.model'].sync_cutter_pad_model()
+            # _logger.info("同步每日刀盘类型完成")
             _logger.info("同步所有刀盘类型...")
             self.env['sf.cutter.pad.model'].sync_all_cutter_pad_model()
             _logger.info("同步所有刀盘类型完成")
-            _logger.info("同步每日刀柄类型...")
-            self.env['sf.handle.model'].sync_handle_model()
-            _logger.info("同步每日刀柄类型完成")
+            # _logger.info("同步每日刀柄类型...")
+            # self.env['sf.handle.model'].sync_handle_model()
+            # _logger.info("同步每日刀柄类型完成")
             _logger.info("同步所有刀柄类型...")
             self.env['sf.handle.model'].sync_all_handle_model()
             _logger.info("同步所有刀柄类型完成")
-            _logger.info("同步每日夹头类型...")
-            self.env['sf.chuck.model'].sync_chuck_model()
-            _logger.info("同步每日夹头类型完成")
+            # _logger.info("同步每日夹头类型...")
+            # self.env['sf.chuck.model'].sync_chuck_model()
+            # _logger.info("同步每日夹头类型完成")
             _logger.info("同步所有夹头类型...")
             self.env['sf.chuck.model'].sync_all_chuck_model()
             _logger.info("同步所有夹头类型完成")
-            _logger.info("同步每日整体式刀具类型...")
-            self.env['sf.integral.cutting.tool.model'].sync_integral_cutting_tool_model()
-            _logger.info("同步每日整体式刀具类型完成")
+            # _logger.info("同步每日整体式刀具类型...")
+            # self.env['sf.integral.cutting.tool.model'].sync_integral_cutting_tool_model()
+            # _logger.info("同步每日整体式刀具类型完成")
             _logger.info("同步所有整体式刀具类型...")
             self.env['sf.integral.cutting.tool.model'].sync_all_integral_cutting_tool_model()
             _logger.info("同步所有整体式刀具类型完成")
-            _logger.info("同步每日刀片列表...")
-            self.env['sf.blade'].sync_blade()
-            _logger.info("同步每日刀片完成")
+            # _logger.info("同步每日刀片列表...")
+            # self.env['sf.blade'].sync_blade()
+            # _logger.info("同步每日刀片完成")
             _logger.info("同步所有刀片列表...")
             self.env['sf.blade'].sync_all_blade()
             _logger.info("同步所有刀片完成")
-            _logger.info("同步每日刀杆列表...")
-            self.env['sf.cutter.bar'].sync_cutter_bar()
-            _logger.info("同步每日刀杆完成")
+            # _logger.info("同步每日刀杆列表...")
+            # self.env['sf.cutter.bar'].sync_cutter_bar()
+            # _logger.info("同步每日刀杆完成")
             _logger.info("同步所有刀杆列表...")
             self.env['sf.cutter.bar'].sync_all_cutter_bar()
             _logger.info("同步所有刀杆完成")
-            _logger.info("同步每日刀盘列表...")
-            self.env['sf.cutter.pad'].sync_cutter_pad()
-            _logger.info("同步每日刀盘完成")
+            # _logger.info("同步每日刀盘列表...")
+            # self.env['sf.cutter.pad'].sync_cutter_pad()
+            # _logger.info("同步每日刀盘完成")
             _logger.info("同步所有刀盘列表...")
             self.env['sf.cutter.pad'].sync_all_cutter_pad()
             _logger.info("同步所有刀盘完成")
-            _logger.info("同步每日刀柄列表...")
-            self.env['sf.handle'].sync_handle()
-            _logger.info("同步每日刀柄完成")
+            # _logger.info("同步每日刀柄列表...")
+            # self.env['sf.handle'].sync_handle()
+            # _logger.info("同步每日刀柄完成")
             _logger.info("同步所有刀柄列表...")
             self.env['sf.handle'].sync_all_handle()
             _logger.info("同步所有刀柄完成")
-            _logger.info("同步每日夹头列表...")
-            self.env['sf.chuck'].sync_chuck()
-            _logger.info("同步每日夹头完成")
+            # _logger.info("同步每日夹头列表...")
+            # self.env['sf.chuck'].sync_chuck()
+            # _logger.info("同步每日夹头完成")
             _logger.info("同步所有夹头列表...")
             self.env['sf.chuck'].sync_all_chuck()
             _logger.info("同步所有夹头完成")
-            _logger.info("同步每日整体式刀具列表...")
-            self.env['sf.integral.cutting.tool'].sync_integral_cutting_tool()
-            _logger.info("同步每日整体式刀具完成")
+            # _logger.info("同步每日整体式刀具列表...")
+            # self.env['sf.integral.cutting.tool'].sync_integral_cutting_tool()
+            # _logger.info("同步每日整体式刀具完成")
             _logger.info("同步所有整体式刀具列表...")
             self.env['sf.integral.cutting.tool'].sync_all_integral_cutting_tool()
             _logger.info("同步所有整体式刀具完成")
-            _logger.info("同步每日同步功能刀具列表...")
-            self.env['sf.functional.cutting.tool'].sync_functional_cutting_tool()
-            _logger.info("同步每日功能刀具列表完成")
+            # _logger.info("同步每日同步功能刀具列表...")
+            # self.env['sf.functional.cutting.tool'].sync_functional_cutting_tool()
+            # _logger.info("同步每日功能刀具列表完成")
             _logger.info("同步所有功能刀具列表...")
             self.env['sf.functional.cutting.tool'].sync_all_functional_cutting_tool()
             _logger.info("同步所有功能刀具列表完成")
 
+            # self.env['sf.fixture.clamping.element'].sync_all_fixture_clamping_element()
+            # _logger.info("同步资源库夹紧元件型号")
+            # self.env['sf.clamping.element.type'].sync_all_clamping_element_type()
+            # _logger.info("同步资源库夹紧元件类型")
+            # self.env['sf.guide.element.type'].sync_all_guide_element_type()
+            # _logger.info("同步资源库导向元件类型")
+            # self.env['sf.guide.element.guide.mode'].sync_all_guide_element_guide_mode()
+            # _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 601b9212..bd236f9c 100644
--- a/sf_mrs_connect/models/sync_common.py
+++ b/sf_mrs_connect/models/sync_common.py
@@ -726,7 +726,7 @@ class MachineToolType(models.Model):
                         [('code', '=', item['machine_tool_id'])]).id
 
                 else:
-                    print(item['machine_tool_picture'].encode('utf-8'))
+                    # print(item['machine_tool_picture'].encode('utf-8'))
                     self.env['sf.machine_tool.type'].create({
                         "id": item['id'],
                         "name": item['name'],
@@ -883,168 +883,6 @@ class MachineToolType(models.Model):
             raise ValidationError("认证未通过")
 
 
-class CuttingTool(models.Model):
-    _inherit = 'sf.cutting_tool.category'
-    _description = '刀具类别'
-    url = '/api/cutting_tool_category/list'
-
-    # 定时同步刀具类别
-    def sync_cutting_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
-        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_category_yesterday_list']:
-                brand = self.env['sf.cutting_tool.category'].search(
-                    [("code", '=', item['code'])])
-                if brand:
-                    brand.id = item['id'],
-                    brand.name = item['name'],
-                    brand.code = item['code'],
-                    brand.active = item['active'],
-                    brand.remark = item['remark']
-                else:
-                    self.env['sf.cutting_tool.category'].create({
-                        "id": item['id'],
-                        "name": item['name'],
-                        "code": item['code'],
-                        "remark": item['remark'],
-                        "active": item['active'],
-                        # "tag_ids": item['tag_ids']
-
-                    })
-        else:
-            raise ValidationError("认证未通过")
-
-    # 同步所有刀具类别
-    def sync_all_cutting_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
-        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_category_all_list']:
-                brand = self.env['sf.cutting_tool.category'].search(
-                    [("code", '=', item['code'])])
-                if not brand:
-                    self.env['sf.cutting_tool.category'].create({
-                        "id": item['id'],
-                        "name": item['name'],
-                        "code": item['code'],
-                        "remark": item['remark'],
-                        "active": item['active'],
-                        # "tag_ids": item['tag_ids']
-
-                    })
-        else:
-            raise ValidationError("认证未通过")
-
-
-class CuttingToolType(models.Model):
-    _inherit = 'sf.cutting_tool.type'
-    _description = '刀具型号'
-    url = '/api/cutting_tool_type/list'
-
-    # 定时同步刀具型号
-    def sync_cutting_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
-        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_type_yesterday_list']:
-                brand = self.env['sf.cutting_tool.type'].search(
-                    [("code", '=', item['code'])])
-                if brand:
-                    brand.id = item['id'],
-                    brand.name = item['name'],
-                    brand.code = item['code'],
-                    brand.active = item['active'],
-                    brand.remark = item['remark'],
-                    brand.diameter = item['diameter'],
-                    brand.cone_angle_pitch = item['cone_angle_pitch'],
-                    brand.shank_diameter = item['shank_diameter'],
-                    brand.long_blade = item['long_blade'],
-                    brand.taper_shank_length = item['taper_shank_length'],
-                    brand.tool_length = item['tool_length'],
-                    brand.blade_number = item['blade_number']
-                    brand.brand_id = self.env['sf.machine.brand'].search([('code', '=', item['brand_id'])]).id,
-                    brand.category_id = self.env['sf.cutting_tool.category'].search(
-                        [('code', '=', item['category_id'])]).id
-                else:
-                    self.env['sf.cutting_tool.type'].create({
-                        "id": item['id'],
-                        "name": item['name'],
-                        "remark": item['remark'],
-                        "code": item['code'],
-                        "active": item['active'],
-                        "diameter": item['diameter'],
-                        "cone_angle_pitch": item['cone_angle_pitch'],
-                        "shank_diameter": item['shank_diameter'],
-                        "long_blade": item['long_blade'],
-                        "taper_shank_length": item['taper_shank_length'],
-                        "tool_length": item['tool_length'],
-                        "blade_number": item['blade_number'],
-                        'brand_id': self.env['sf.machine.brand'].search([('code', '=', item['brand_id'])]).id,
-                        "category_id": self.env['sf.cutting_tool.category'].search(
-                            [('code', '=', item['category_id'])]).id,
-                    })
-        else:
-            raise ValidationError("认证未通过")
-
-    # 同步所有刀具型号
-    def sync_all_cutting_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
-        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_type_all_list']:
-                brand = self.env['sf.cutting_tool.type'].search(
-                    [("code", '=', item['code'])])
-                if not brand:
-                    self.env['sf.cutting_tool.type'].create({
-                        "id": item['id'],
-                        "name": item['name'],
-                        "remark": item['remark'],
-                        "code": item['code'],
-                        "active": item['active'],
-                        "diameter": item['diameter'],
-                        "cone_angle_pitch": item['cone_angle_pitch'],
-                        "shank_diameter": item['shank_diameter'],
-                        "long_blade": item['long_blade'],
-                        "taper_shank_length": item['taper_shank_length'],
-                        "tool_length": item['tool_length'],
-                        "blade_number": item['blade_number'],
-                        'brand_id': self.env['sf.machine.brand'].search([('code', '=', item['brand_id'])]).id,
-                        "category_id": self.env['sf.cutting_tool.category'].search(
-                            [('code', '=', item['category_id'])]).id,
-                    })
-        else:
-            raise ValidationError("认证未通过")
-
-
 class sfProcessingOrder(models.Model):
     _inherit = 'sf.processing.order'
     _description = '工序'
@@ -1237,6 +1075,78 @@ class MachineToolCategory(models.Model):
             raise ValidationError("认证未通过")
 
 
+# 同步刀具物料
+class sfSyncCutting_tool_Material(models.Model):
+    _inherit = 'sf.cutting.tool.material'
+    _description = '刀具物料同步'
+
+    url = '/api/mrs_cutting_tool_material/list'
+
+    # 定时同步每日刀具物料
+    def sync_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
+        r = requests.post(strUrl, json={}, data=None, headers=headers)
+        r = r.json()
+        result = json.loads(r['result'])
+        # print('result:%s' % result)
+        if result['status'] == 1:
+            if result.get('mrs_cutting_tool_material_yesterday_list'):
+                for item in result['mrs_cutting_tool_material_yesterday_list']:
+                    if item:
+                        brand = self.env['sf.cutting.tool.material'].search(
+                            [("code", '=', item['code'])])
+                        if not brand:
+                            self.env['sf.cutting.tool.material'].create({
+                                "name": item['name'],
+                                "code": item['code'],
+                                "remark": item['remark'],
+                            })
+                        else:
+                            brand.write({
+                                "name": item['name'],
+                                "code": item['code'],
+                                "remark": item['remark'],
+                            })
+        else:
+            raise ValidationError("认证未通过")
+
+    # 同步所有刀具物料
+    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
+        r = requests.post(strUrl, json={}, data=None, headers=headers)
+        r = r.json()
+        result = json.loads(r['result'])
+        # print('result:%s' % result)
+        if result['status'] == 1:
+            if result.get('mrs_cutting_tool_material_all_list'):
+                for item in result['mrs_cutting_tool_material_all_list']:
+                    if item:
+                        brand = self.env['sf.cutting.tool.material'].search(
+                            [("code", '=', item['code'])])
+                        if not brand:
+                            self.env['sf.cutting.tool.material'].create({
+                                "name": item['name'],
+                                "code": item['code'],
+                                "remark": item['remark'],
+                            })
+                        else:
+                            brand.write({
+                                "name": item['name'],
+                                "code": item['code'],
+                                "remark": item['remark'],
+                            })
+
+
 # 同步功能刀具列表
 class sfSyncFunctional_cutting_tool(models.Model):
     _inherit = 'sf.functional.cutting.tool'
@@ -1254,7 +1164,7 @@ class sfSyncFunctional_cutting_tool(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_functional_cutting_tool_yesterday_list'):
                 for item in result['mrs_functional_cutting_tool_yesterday_list']:
@@ -1462,7 +1372,7 @@ class SyncFunctionalCuttingToolModel(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_functional_cutting_tool_model_yesterday_list'):
                 for item in result['mrs_functional_cutting_tool_model_yesterday_list']:
@@ -1495,7 +1405,7 @@ class SyncFunctionalCuttingToolModel(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_functional_cutting_tool_model_all_list'):
                 for item in result['mrs_functional_cutting_tool_model_all_list']:
@@ -1536,7 +1446,7 @@ class SyncIntegralCuttingTool(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_integral_cutting_tool_yesterday_list'):
                 for item in result['mrs_integral_cutting_tool_yesterday_list']:
@@ -1561,6 +1471,8 @@ class SyncIntegralCuttingTool(models.Model):
                                     [("code", '=', item['integral_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "total_length": item['total_length'],
                                 "shank_length": item['shank_length'],
                                 "blade_length": item['blade_length'],
@@ -1584,6 +1496,8 @@ class SyncIntegralCuttingTool(models.Model):
                                     [("code", '=', item['integral_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "total_length": item['total_length'],
                                 "shank_length": item['shank_length'],
                                 "blade_length": item['blade_length'],
@@ -1613,7 +1527,7 @@ class SyncIntegralCuttingTool(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_integral_cutting_tool_all_list'):
                 for item in result['mrs_integral_cutting_tool_all_list']:
@@ -1638,6 +1552,8 @@ class SyncIntegralCuttingTool(models.Model):
                                     [("code", '=', item['integral_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "total_length": item['total_length'],
                                 "shank_length": item['shank_length'],
                                 "blade_length": item['blade_length'],
@@ -1661,6 +1577,8 @@ class SyncIntegralCuttingTool(models.Model):
                                     [("code", '=', item['integral_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "total_length": item['total_length'],
                                 "shank_length": item['shank_length'],
                                 "blade_length": item['blade_length'],
@@ -1698,7 +1616,7 @@ class SyncIntegralCuttingToolModel(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_integral_cutting_tool_model_list'):
                 for item in result['mrs_integral_cutting_tool_model_list']:
@@ -1710,6 +1628,16 @@ class SyncIntegralCuttingToolModel(models.Model):
                                 "name": item['name'],
                                 "code": item['code'],
                                 "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
+                            })
+                        else:
+                            brand.write({
+                                "name": item['name'],
+                                "code": item['code'],
+                                "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                             })
         else:
             raise ValidationError("认证未通过")
@@ -1725,7 +1653,7 @@ class SyncIntegralCuttingToolModel(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_integral_cutting_tool_model_all_list'):
                 for item in result['mrs_integral_cutting_tool_model_all_list']:
@@ -1737,6 +1665,16 @@ class SyncIntegralCuttingToolModel(models.Model):
                                 "name": item['name'],
                                 "code": item['code'],
                                 "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
+                            })
+                        else:
+                            brand.write({
+                                "name": item['name'],
+                                "code": item['code'],
+                                "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                             })
         else:
             raise ValidationError("认证未通过")
@@ -1759,10 +1697,20 @@ class SyncBlade(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_blade_yesterday_list'):
                 for item in result['mrs_blade_yesterday_list']:
+                    bar_list = []
+                    pad_list = []
+                    if item.get('cutter_bar'):
+                        for i in item.get('cutter_bar'):
+                            bar_list.append(self.env['sf.cutter.bar'].search(
+                                [("code", '=', i)]).id)
+                    if item.get('cutter_pad'):
+                        for j in item.get('cutter_pad'):
+                            pad_list.append(self.env['sf.cutter.pad'].search(
+                                [("code", '=', j)]).id)
                     if item:
                         # code, name, blade_model_number, brand, length, width, height, top_angle, front_angle, rear_angle, main_included_angle, r_angle, material_model, hardness, nut, cutter_bar, cutter_pad, radius, image, create_uid, create_date
                         brand = self.env['sf.blade'].search(
@@ -1779,6 +1727,8 @@ class SyncBlade(models.Model):
                                     [("code", '=', item['blade_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "length": item['length'],
                                 "width": item['width'],
                                 "height": item['height'],
@@ -1791,8 +1741,8 @@ class SyncBlade(models.Model):
                                     [("materials_no", '=', item['material_model'])]).id,
                                 "hardness": item['hardness'],
                                 "nut": item['nut'],
-                                "cutter_bar": item['cutter_bar'],
-                                "cutter_pad": item['cutter_pad'],
+                                "cutter_bar": bar_list,
+                                "cutter_pad": pad_list,
                                 "radius": item['radius'],
                                 "image": image,
                             })
@@ -1803,6 +1753,8 @@ class SyncBlade(models.Model):
                                     [("code", '=', item['blade_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "length": item['length'],
                                 "width": item['width'],
                                 "height": item['height'],
@@ -1815,8 +1767,8 @@ class SyncBlade(models.Model):
                                     [("materials_no", '=', item['material_model'])]).id,
                                 "hardness": item['hardness'],
                                 "nut": item['nut'],
-                                "cutter_bar": item['cutter_bar'],
-                                "cutter_pad": item['cutter_pad'],
+                                "cutter_bar": bar_list,
+                                "cutter_pad": pad_list,
                                 "radius": item['radius'],
                                 "image": image,
                             })
@@ -1838,7 +1790,16 @@ class SyncBlade(models.Model):
         if result['status'] == 1:
             if result.get('mrs_blade_all_list'):
                 for item in result['mrs_blade_all_list']:
-                    # print('item_image:%s' % item['image'].encode('utf-8)
+                    bar_list = []
+                    pad_list = []
+                    if item.get('cutter_bar'):
+                        for i in item.get('cutter_bar'):
+                            bar_list.append(self.env['sf.cutter.bar'].search(
+                                [("code", '=', i)]).id)
+                    if item.get('cutter_pad'):
+                        for j in item.get('cutter_pad'):
+                            pad_list.append(self.env['sf.cutter.pad'].search(
+                                [("code", '=', j)]).id)
 
                     if item:
                         brand = self.env['sf.blade'].search(
@@ -1855,6 +1816,8 @@ class SyncBlade(models.Model):
                                     [("code", '=', item['blade_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "length": item['length'],
                                 "width": item['width'],
                                 "height": item['height'],
@@ -1867,8 +1830,8 @@ class SyncBlade(models.Model):
                                     [("materials_no", '=', item['material_model'])]).id,
                                 "hardness": item['hardness'],
                                 "nut": item['nut'],
-                                "cutter_bar": item['cutter_bar'],
-                                "cutter_pad": item['cutter_pad'],
+                                "cutter_bar": bar_list,
+                                "cutter_pad": pad_list,
                                 "radius": item['radius'],
                                 "image": image,
                             })
@@ -1879,6 +1842,8 @@ class SyncBlade(models.Model):
                                     [("code", '=', item['blade_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "length": item['length'],
                                 "width": item['width'],
                                 "height": item['height'],
@@ -1891,8 +1856,8 @@ class SyncBlade(models.Model):
                                     [("materials_no", '=', item['material_model'])]).id,
                                 "hardness": item['hardness'],
                                 "nut": item['nut'],
-                                "cutter_bar": item['cutter_bar'],
-                                "cutter_pad": item['cutter_pad'],
+                                "cutter_bar": bar_list,
+                                "cutter_pad": pad_list,
                                 "radius": item['radius'],
                                 "image": image,
                             })
@@ -1918,7 +1883,7 @@ class SyncBladeModel(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_blade_model_yesterday_list'):
                 for item in result['mrs_blade_model_yesterday_list']:
@@ -1930,12 +1895,16 @@ class SyncBladeModel(models.Model):
                                 "name": item['name'],
                                 "code": item['code'],
                                 "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                             })
                         else:
                             brand.write({
                                 "name": item['name'],
                                 "code": item['code'],
                                 "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                             })
                 print('同步每日刀片类型列表成功')
         else:
@@ -1952,7 +1921,7 @@ class SyncBladeModel(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_blade_model_all_list'):
                 for item in result['mrs_blade_model_all_list']:
@@ -1964,12 +1933,16 @@ class SyncBladeModel(models.Model):
                                 "name": item['name'],
                                 "code": item['code'],
                                 "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                             })
                         else:
                             brand.write({
                                 "name": item['name'],
                                 "code": item['code'],
                                 "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                             })
                 print('同步刀片类型列表成功')
         else:
@@ -1994,7 +1967,7 @@ class SyncCutterBar(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_cutter_bar_yesterday_list'):
                 for item in result['mrs_cutter_bar_yesterday_list']:
@@ -2015,10 +1988,12 @@ class SyncCutterBar(models.Model):
                             self.env['sf.cutter.bar'].create({
                                 "code": item['code'],
                                 "name": item['name'],
-                                "cutter_bar_model_number": self.env['sf.cutter.bar'].search(
+                                "cutter_bar_model_number": self.env['sf.cutter.bar.model'].search(
                                     [("code", '=', item['cutter_bar_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "c_diameter": item['c_diameter'],
                                 "total_length": item['total_length'],
                                 "material_model": self.env['sf.materials.model'].search(
@@ -2038,10 +2013,12 @@ class SyncCutterBar(models.Model):
                             brand.write({
                                 "code": item['code'],
                                 "name": item['name'],
-                                "cutter_bar_model_number": self.env['sf.cutter.bar'].search(
+                                "cutter_bar_model_number": self.env['sf.cutter.bar.model'].search(
                                     [("code", '=', item['cutter_bar_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "c_diameter": item['c_diameter'],
                                 "total_length": item['total_length'],
                                 "material_model": self.env['sf.materials.model'].search(
@@ -2093,10 +2070,12 @@ class SyncCutterBar(models.Model):
                             self.env['sf.cutter.bar'].create({
                                 "code": item['code'],
                                 "name": item['name'],
-                                "cutter_bar_model_number": self.env['sf.cutter.bar'].search(
+                                "cutter_bar_model_number": self.env['sf.cutter.bar.model'].search(
                                     [("code", '=', item['cutter_bar_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "c_diameter": item['c_diameter'],
                                 "total_length": item['total_length'],
                                 "material_model": self.env['sf.materials.model'].search(
@@ -2116,10 +2095,12 @@ class SyncCutterBar(models.Model):
                             brand.write({
                                 "code": item['code'],
                                 "name": item['name'],
-                                "cutter_bar_model_number": self.env['sf.cutter.bar'].search(
+                                "cutter_bar_model_number": self.env['sf.cutter.bar.model'].search(
                                     [("code", '=', item['cutter_bar_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "c_diameter": item['c_diameter'],
                                 "total_length": item['total_length'],
                                 "material_model": self.env['sf.materials.model'].search(
@@ -2158,7 +2139,7 @@ class SyncCutterBarModel(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_cutter_bar_model_yesterday_list'):
                 for item in result['mrs_cutter_bar_model_yesterday_list']:
@@ -2170,18 +2151,22 @@ class SyncCutterBarModel(models.Model):
                                 "name": item['name'],
                                 "code": item['code'],
                                 "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                             })
                         else:
                             brand.write({
                                 "name": item['name'],
                                 "code": item['code'],
                                 "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                             })
                 print('同步每日刀片类型列表成功')
         else:
             raise ValidationError("认证未通过")
 
-    # 定时同步所有刀杆类型列表
+    # 同步所有刀杆类型列表
     def sync_all_cutter_bar_model(self):
         sf_sync_config = self.env['res.config.settings'].get_values()
         token = sf_sync_config['token']
@@ -2192,7 +2177,7 @@ class SyncCutterBarModel(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_cutter_bar_model_all_list'):
                 for item in result['mrs_cutter_bar_model_all_list']:
@@ -2204,12 +2189,16 @@ class SyncCutterBarModel(models.Model):
                                 "name": item['name'],
                                 "code": item['code'],
                                 "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                             })
                         else:
                             brand.write({
                                 "name": item['name'],
                                 "code": item['code'],
                                 "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                             })
                 print('同步刀杆类型列表成功')
         else:
@@ -2234,7 +2223,7 @@ class SyncCutterPad(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_cutter_pad_yesterday_list'):
                 for item in result['mrs_cutter_pad_yesterday_list']:
@@ -2259,6 +2248,8 @@ class SyncCutterPad(models.Model):
                                     [("code", '=', item['cutter_pad_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "c_diameter": item['c_diameter'],
                                 "total_length": item['total_length'],
                                 "material_model": self.env['sf.materials.model'].search(
@@ -2283,6 +2274,8 @@ class SyncCutterPad(models.Model):
                                     [("code", '=', item['cutter_pad_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "c_diameter": item['c_diameter'],
                                 "total_length": item['total_length'],
                                 "material_model": self.env['sf.materials.model'].search(
@@ -2314,7 +2307,7 @@ class SyncCutterPad(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_cutter_pad_all_list'):
                 for item in result['mrs_cutter_pad_all_list']:
@@ -2339,6 +2332,8 @@ class SyncCutterPad(models.Model):
                                     [("code", '=', item['cutter_pad_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "c_diameter": item['c_diameter'],
                                 "total_length": item['total_length'],
                                 "material_model": self.env['sf.materials.model'].search(
@@ -2363,6 +2358,8 @@ class SyncCutterPad(models.Model):
                                     [("code", '=', item['cutter_pad_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "c_diameter": item['c_diameter'],
                                 "total_length": item['total_length'],
                                 "material_model": self.env['sf.materials.model'].search(
@@ -2402,7 +2399,7 @@ class SyncCutterPadModel(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_cutter_pad_model_yesterday_list'):
                 for item in result['mrs_cutter_pad_model_yesterday_list']:
@@ -2414,12 +2411,16 @@ class SyncCutterPadModel(models.Model):
                                 "name": item['name'],
                                 "code": item['code'],
                                 "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                             })
                         else:
                             brand.write({
                                 "name": item['name'],
                                 "code": item['code'],
                                 "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                             })
                 print('同步每日刀盘类型列表成功')
         else:
@@ -2436,7 +2437,7 @@ class SyncCutterPadModel(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_cutter_pad_model_all_list'):
                 for item in result['mrs_cutter_pad_model_all_list']:
@@ -2448,12 +2449,16 @@ class SyncCutterPadModel(models.Model):
                                 "name": item['name'],
                                 "code": item['code'],
                                 "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                             })
                         else:
                             brand.write({
                                 "name": item['name'],
                                 "code": item['code'],
                                 "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                             })
                 print('同步刀盘类型列表成功')
         else:
@@ -2478,7 +2483,7 @@ class SyncHandle(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_handle_yesterday_list'):
                 for item in result['mrs_handle_yesterday_list']:
@@ -2503,6 +2508,8 @@ class SyncHandle(models.Model):
                                     [("code", '=', item['handle_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "length": item['length'],
                                 "length1": item['length1'],
                                 "diameter1": item['diameter1'],
@@ -2527,6 +2534,8 @@ class SyncHandle(models.Model):
                                     [("code", '=', item['handle_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "length": item['length'],
                                 "length1": item['length1'],
                                 "diameter1": item['diameter1'],
@@ -2558,7 +2567,7 @@ class SyncHandle(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_handle_all_list'):
                 for item in result['mrs_handle_all_list']:
@@ -2583,6 +2592,8 @@ class SyncHandle(models.Model):
                                     [("code", '=', item['handle_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "length": item['length'],
                                 "length1": item['length1'],
                                 "diameter1": item['diameter1'],
@@ -2607,6 +2618,8 @@ class SyncHandle(models.Model):
                                     [("code", '=', item['handle_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "length": item['length'],
                                 "length1": item['length1'],
                                 "diameter1": item['diameter1'],
@@ -2646,7 +2659,7 @@ class SyncHandleModel(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_handle_model_yesterday_list'):
                 for item in result['mrs_handle_model_yesterday_list']:
@@ -2658,12 +2671,16 @@ class SyncHandleModel(models.Model):
                                 "name": item['name'],
                                 "code": item['code'],
                                 "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                             })
                         else:
                             brand.write({
                                 "name": item['name'],
                                 "code": item['code'],
                                 "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                             })
                 print('同步每日刀柄类型列表成功')
         else:
@@ -2680,7 +2697,7 @@ class SyncHandleModel(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_handle_model_all_list'):
                 for item in result['mrs_handle_model_all_list']:
@@ -2692,12 +2709,16 @@ class SyncHandleModel(models.Model):
                                 "name": item['name'],
                                 "code": item['code'],
                                 "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                             })
                         else:
                             brand.write({
                                 "name": item['name'],
                                 "code": item['code'],
                                 "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                             })
                 print('同步刀柄类型列表成功')
         else:
@@ -2722,7 +2743,7 @@ class SyncChuck(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_chuck_yesterday_list'):
                 for item in result['mrs_chuck_yesterday_list']:
@@ -2747,6 +2768,8 @@ class SyncChuck(models.Model):
                                     [("code", '=', item['chuck_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "accuracy": item['accuracy'],
                                 "diameter": item['diameter'],
                                 "inner_diameter": item['inner_diameter'],
@@ -2767,6 +2790,8 @@ class SyncChuck(models.Model):
                                     [("code", '=', item['chuck_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "accuracy": item['accuracy'],
                                 "diameter": item['diameter'],
                                 "inner_diameter": item['inner_diameter'],
@@ -2794,7 +2819,7 @@ class SyncChuck(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_chuck_all_list'):
                 for item in result['mrs_chuck_all_list']:
@@ -2819,6 +2844,8 @@ class SyncChuck(models.Model):
                                     [("code", '=', item['chuck_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "accuracy": item['accuracy'],
                                 "diameter": item['diameter'],
                                 "inner_diameter": item['inner_diameter'],
@@ -2839,6 +2866,8 @@ class SyncChuck(models.Model):
                                     [("code", '=', item['chuck_model_number'])]).id,
                                 "brand": self.env['sf.machine.brand'].search(
                                     [("code", '=', item['brand'])]).id,
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                                 "accuracy": item['accuracy'],
                                 "diameter": item['diameter'],
                                 "inner_diameter": item['inner_diameter'],
@@ -2874,7 +2903,7 @@ class SyncChuckModel(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_chuck_model_yesterday_list'):
                 for item in result['mrs_chuck_model_yesterday_list']:
@@ -2886,12 +2915,16 @@ class SyncChuckModel(models.Model):
                                 "name": item['name'],
                                 "code": item['code'],
                                 "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                             })
                         else:
                             brand.write({
                                 "name": item['name'],
                                 "code": item['code'],
                                 "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                             })
                 print('同步每日夹头类型列表成功')
         else:
@@ -2908,7 +2941,7 @@ class SyncChuckModel(models.Model):
         r = requests.post(strUrl, json={}, data=None, headers=headers)
         r = r.json()
         result = json.loads(r['result'])
-        print('result:%s' % result)
+        # print('result:%s' % result)
         if result['status'] == 1:
             if result.get('mrs_chuck_model_all_list'):
                 for item in result['mrs_chuck_model_all_list']:
@@ -2920,13 +2953,349 @@ class SyncChuckModel(models.Model):
                                 "name": item['name'],
                                 "code": item['code'],
                                 "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                             })
                         else:
                             brand.write({
                                 "name": item['name'],
                                 "code": item['code'],
                                 "remark": item['remark'],
+                                "cutting_tool_material": self.env['sf.cutting.tool.material'].search(
+                                    [("code", '=', item['cutting_tool_material'])]).id,
                             })
                 print('同步夹头类型列表成功')
         else:
             raise ValidationError("认证未通过")
+
+
+'''=========================================夹紧元件类型==============================================='''
+
+
+class sfClampingElementType(models.Model):
+    _inherit = 'sf.clamping.element.type'
+    _description = '夹紧元件类型'
+    url = '/api/mrs_clamping_element_type/list'
+
+    # 定时同步每日夹紧元件类型
+    def sync_clamping_element_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
+        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['mrs_clamping_element_type_yesterday_list']:
+                if item:
+                    brand = self.env['sf.clamping.element.type'].search(
+                        [("code", '=', item['code'])])
+                    if brand:
+                        brand.name = item['name'],
+                        brand.code = item['code'],
+                        brand.comment = item['comment']
+                    else:
+                        self.env['sf.clamping.element.type'].create({
+                            "name": item['name'],
+                            "code": item['code'],
+                            "comment": item['comment']
+                        })
+        else:
+            raise ValidationError("认证未通过")
+
+    # 同步所有夹紧元件类型
+    def sync_all_clamping_element_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
+        r = requests.post(strUrl, json={}, data=None, headers=headers)
+        r = r.json()
+        result = json.loads(r['result'])
+        if result['status'] == 1:
+            _logger.info('result:%s' % result)
+            for item in result['mrs_clamping_element_type_all_list']:
+                if item:
+                    brand = self.env['sf.clamping.element.type'].search(
+                        [("code", '=', item['code'])])
+                    if not brand:
+                        self.env['sf.clamping.element.type'].create({
+                            "name": item['name'],
+                            "code": item['code'],
+                            "comment": item['comment']
+                        })
+        else:
+            raise ValidationError("认证未通过")
+
+
+'''=================================夹紧元件型号============================================='''
+
+
+class sfFixtureClampingElement(models.Model):
+    _inherit = 'sf.fixture.clamping.element'
+    _description = '夹紧元件型号'
+    url = '/api/mrs_fixture_clamping_element/list'
+
+    # 定时同步夹紧元件型号
+    def sync_fixture_clamping_element(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['mrs_fixture_clamping_element_yesterday_list']:
+                brand = self.env['sf.fixture.clamping.element'].search(
+                    [("code", '=', item['code'])])
+                if brand:
+                    brand.code = item['code'],
+                    brand.name = item['name'],
+
+                    brand.length = item['length'],
+                    brand.width = item['width'],
+                    brand.height = item['height'],
+                    brand.diameter = item['diameter'],
+                    brand.hardness = item['hardness'],
+                    brand.chucking_power = item['chucking_power'],
+                    brand.surface_treatment = item['surface_treatment'],
+                    brand.accuracy_grade = item['accuracy_grade'],
+                    # brand.picture = item['picture'].encode('utf-8'),
+                    brand.picture = base64.b64decode(item['picture']),
+                    brand.comment = item['comment'],
+
+                    brand.brand_id = self.env['sf.machine.brand'].search(
+                        [('code', '=', item['brand_id'])]).id,
+                    brand.material_type_id = self.env['sf.materials.model'].search(
+                        [('materials_no', '=', item['material_type_id'])]).id,
+                    brand.clamping_ele_type_id = self.env['sf.clamping.element.type'].search(
+                        [('code', '=', item['clamping_ele_type_id'])]).id
+
+                else:
+                    self.env['sf.fixture.clamping.element'].create({
+                        "code": item['code'],
+                        "name": item['name'],
+
+                        "length": item['length'],
+                        "width": item['width'],
+                        "height": item['height'],
+                        "diameter": item['diameter'],
+                        "hardness": item['hardness'],
+                        "chucking_power": item['chucking_power'],
+                        "surface_treatment": item['surface_treatment'],
+                        "accuracy_grade": item['accuracy_grade'],
+
+                        'picture': base64.b64decode(item['picture']),
+                        # "picture": item['picture'].encode('utf-8'),
+                        "comment": item['comment'],
+
+                        'brand_id': self.env['sf.machine.brand'].search(
+                            [('code', '=', item['brand_id'])]).id,
+                        "material_type_id": self.env['sf.materials.model'].search(
+                            [('materials_no', '=', item['material_type_id'])]).id,
+                        "clamping_ele_type_id": self.env['sf.clamping.element.type'].search(
+                            [('code', '=', item['clamping_ele_type_id'])]).id,
+                    })
+        else:
+            raise ValidationError("认证未通过")
+
+    # 同步所有夹紧元件型号
+    def sync_all_fixture_clamping_element(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'])
+        print(result)
+        if result['status'] == 1:
+            for item in result['mrs_fixture_clamping_element_all_list']:
+                brand = self.env['sf.fixture.clamping.element'].search(
+                    [("code", '=', item['code'])])
+                if not brand:
+                    self.env['sf.fixture.clamping.element'].create({
+                        "code": item['code'],
+                        "name": item['name'],
+
+                        "length": item['length'],
+                        "width": item['width'],
+                        "height": item['height'],
+                        "diameter": item['diameter'],
+                        "hardness": item['hardness'],
+                        "chucking_power": item['chucking_power'],
+                        "surface_treatment": item['surface_treatment'],
+                        "accuracy_grade": item['accuracy_grade'],
+
+                        # "picture": item['picture'].encode('utf-8'),
+                        'picture': base64.b64decode(item['picture']),
+                        "comment": item['comment'],
+
+                        'brand_id': self.env['sf.machine.brand'].search(
+                            [('code', '=', item['brand_id'])]).id,
+                        "material_type_id": self.env['sf.materials.model'].search(
+                            [('materials_no', '=', item['material_type_id'])]).id,
+                        "clamping_ele_type_id": self.env['sf.clamping.element.type'].search(
+                            [('code', '=', item['clamping_ele_type_id'])]).id,
+                    })
+
+
+        else:
+            raise ValidationError("认证未通过")
+
+
+'''===================================导向元件类型=========================================='''
+
+
+class sfGuideElementType(models.Model):
+    _inherit = 'sf.guide.element.type'
+    _description = '导向元件类型'
+    url = '/api/mrs_guide_element_type/list'
+
+    # 定时同步每日导向元件类型
+    def sync_guide_element_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
+        r = requests.post(strUrl, json={}, data=None, headers=headers)
+        r = r.json()
+        result = json.loads(r['result'])
+        if result['status'] == 1:
+            _logger.info('result:%s' % result)
+            for item in result['mrs_guide_element_type_yesterday_list']:
+                if item:
+                    brand = self.env['sf.guide.element.type'].search(
+                        [("code", '=', item['code'])])
+                    if brand:
+                        brand.name = item['name'],
+                        brand.code = item['code'],
+                        brand.comment = item['comment']
+                    else:
+                        self.env['sf.guide.element.type'].create({
+                            "name": item['name'],
+                            "code": item['code'],
+                            "comment": item['comment']
+                        })
+        else:
+            raise ValidationError("认证未通过")
+
+    # 同步所有导向元件类型
+    def sync_all_guide_element_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
+        r = requests.post(strUrl, json={}, data=None, headers=headers)
+        r = r.json()
+        result = json.loads(r['result'])
+        if result['status'] == 1:
+            _logger.info('result:%s' % result)
+            for item in result['mrs_guide_element_type_all_list']:
+                if item:
+                    brand = self.env['sf.guide.element.type'].search(
+                        [("code", '=', item['code'])])
+                    if not brand:
+                        self.env['sf.guide.element.type'].create({
+                            "name": item['name'],
+                            "code": item['code'],
+                            "comment": item['comment']
+                        })
+                        # guide_element_type = self.env['sf.guide.element.type'].search([('code', '=', code)])
+                        # tags = self.env['sf.tag'].search([('name', '=', 'new_tag_name')])
+                        # guide_element_type.write({'tag_ids': [(6, 0, tags.ids)]})
+        else:
+            raise ValidationError("认证未通过")
+
+
+'''===================================导向元件导向方式=========================================='''
+
+
+class sfGuideElementGuideMode(models.Model):
+    _inherit = 'sf.guide.element.guide.mode'
+    _description = '导向元件导向方式'
+    url = '/api/mrs_guide_element_guide_mode/list'
+
+    # 定时同步每日导向元件导向方式
+    def sync_guide_element_guide_mode(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:
+            _logger.info('result:%s' % result)
+            for item in result['mrs_guide_element_guide_mode_yesterday_list']:
+                name_id_list = []
+                if item.get('guide_ele_guide_mode_id'):
+                    for i in item.get('guide_ele_guide_mode_id'):
+                        name_id_list.append(self.env['sf.fixture.guide.element'].search(
+                            [("code", '=', i)]).id)
+                if item:
+                    brand = self.env['sf.guide.element.guide.mode'].search(
+                        [("code", '=', item['code'])])
+                    if brand:
+                        brand.name = item['name'],
+                        brand.code = item['code'],
+                        brand.comment = item['comment']
+                        brand.name_id = name_id_list
+
+                    else:
+                        self.env['sf.guide.element.guide.mode'].create({
+                            "name": item['name'],
+                            "code": item['code'],
+                            "comment": item['comment'],
+                            "name_id": name_id_list
+                        })
+        else:
+            raise ValidationError("认证未通过")
+
+    # 同步所有导向元件导向方式
+    def sync_all_guide_element_guide_mode(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:
+            _logger.info('result:%s' % result)
+            for item in result['mrs_guide_element_guide_mode_all_list']:
+                name_id_list = []
+                if item.get('guide_ele_guide_mode_id'):
+                    for i in item.get('guide_ele_guide_mode_id'):
+                        name_id_list.append(self.env['sf.fixture.guide.element'].search(
+                            [("code", '=', i)]).id)
+                if item:
+                    brand = self.env['sf.guide.element.guide.mode'].search(
+                        [("code", '=', item['code'])])
+                    if not brand:
+                        self.env['sf.guide.element.guide.mode'].create({
+                            "name": item['name'],
+                            "code": item['code'],
+                            "comment": item['comment'],
+                            "name_id": name_id_list
+                        })
+        else:
+            raise ValidationError("认证未通过")