新增同步夹具相关的定时器

sf_base/__manifest__.py

@@ -14,11 +14,11 @@
     'data': [
         'security/group_security.xml',
         'security/ir.model.access.csv',
-        'data/fixture_data.xml'
+        # 'data/fixture_data.xml'
         'views/base_view.xml',
         'views/common_view.xml',
-        "views/menu_view.xml",
         'views/fixture_view.xml',
+        'views/functional_fixture_view.xml',
         'views/menu_view.xml',
         # "views/tool_base_views.xml",
         # "views/tool_base_menu.xml",

sf_base/models/__init__.py

@@ -1,6 +1,8 @@
 from . import base
 from . import common
 from . import tool_base
-from . import fixture_base
+#from . import fixture_base
+from . import fixture
+from . import functional_fixture
 
 

sf_base/models/fixture.py

@@ -25,9 +25,10 @@ class FixtureModel(models.Model):
 
     code = fields.Char(string='编码')
     name = fields.Char(string="名称", size=15)
-    fixture_material_id = fields.Many2one('mrs.fixture.material', string="夹具物料", )
-    multi_mounting_model_id = fields.Many2one('mrs.multi_mounting.type', string="联装类型")
-    brand_id = fields.Many2one('mrs.machine.brand', string="品牌")
+    fixture_material_id = fields.Many2one('sf.fixture.material', string="夹具物料", )
+    fixture_material_type = fields.Char(string="夹具物料类型", related='fixture_material_id.name')
+    multi_mounting_type_id = fields.Many2one('sf.multi_mounting.type', string="联装类型")
+    brand_id = fields.Many2one('sf.machine.brand', string="品牌")
     clamping_way = fields.Char(string="装夹方式")
     port_type = fields.Char(string="接口类型")
     model_file = fields.Binary(string="3D模型图")
@@ -41,8 +42,11 @@ class FixtureModel(models.Model):
     clamp_workpiece_diameter_max = fields.Char(string="夹持工件直径MAX[mm]")
     maximum_carrying_weight = fields.Char(string="最大承载重量[kg]")
     Maximum_clamping_force = fields.Char(string="最大夹持力[n]")
-    materials_model_id = fields.Many2one('mrs.materials.model', string="材料型号")
+    materials_model_id = fields.Many2one('sf.materials.model', string="材料型号")
     driving_way = fields.Char(string="驱动方式")
     apply_machine_tool_type = fields.Char(string="适用机床型号")
+    through_hole_size = fields.Integer(string="过孔大小[mm]", size=6)
+    screw_size = fields.Integer(string="螺牙大小[mm]", size=6)
+
 
 

sf_base/security/ir.model.access.csv

@@ -31,14 +31,7 @@ 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_setting_element_type,sf_setting_element_type,model_sf_setting_element_type,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_tool_setting_type,sf_tool_setting_type,model_sf_tool_setting_type,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_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
+
 
 access_sf_fixture_material,sf_fixture_material,model_sf_fixture_material,base.group_user,1,1,1,1
 access_sf_multi_mounting_type,sf_multi_mounting_type,model_sf_multi_mounting_type,base.group_user,1,1,1,1