From d18b1808d95db6eec9e65822c5740d34b34f0185 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Tue, 27 Jun 2023 16:35:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=8C=E6=AD=A5=E5=A4=B9?= =?UTF-8?q?=E5=85=B7=E7=9B=B8=E5=85=B3=E7=9A=84=E5=AE=9A=E6=97=B6=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/__manifest__.py | 4 +- sf_base/models/__init__.py | 4 +- sf_base/models/fixture.py | 12 ++- sf_base/security/ir.model.access.csv | 9 +-- sf_mrs_connect/data/ir_cron_data.xml | 116 ++++++++++++++++++++------- sf_mrs_connect/models/sync_common.py | 48 +++++------ 6 files changed, 124 insertions(+), 69 deletions(-) diff --git a/sf_base/__manifest__.py b/sf_base/__manifest__.py index fd39282d..085b8f6f 100644 --- a/sf_base/__manifest__.py +++ b/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", diff --git a/sf_base/models/__init__.py b/sf_base/models/__init__.py index 5b9136ae..dee7cab3 100644 --- a/sf_base/models/__init__.py +++ b/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 diff --git a/sf_base/models/fixture.py b/sf_base/models/fixture.py index 9d0e8107..5a198d71 100644 --- a/sf_base/models/fixture.py +++ b/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) + diff --git a/sf_base/security/ir.model.access.csv b/sf_base/security/ir.model.access.csv index 430d2805..beabc3f7 100644 --- a/sf_base/security/ir.model.access.csv +++ b/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 diff --git a/sf_mrs_connect/data/ir_cron_data.xml b/sf_mrs_connect/data/ir_cron_data.xml index 016789b6..7c74d5c4 100644 --- a/sf_mrs_connect/data/ir_cron_data.xml +++ b/sf_mrs_connect/data/ir_cron_data.xml @@ -264,69 +264,125 @@ - - 同步夹头型号 - + + 同步夹具物料 + code - model.sync_chuck() + model.sync_fixture_material() 1 days -1 - - 同步夹头类型 - + + 同步联装类型列表 + code - model.sync_chuck_model() + model.sync_multi_mounting_type() 1 days -1 - - 同步资源库夹紧元件型号 - + + 同步夹具型号 + code - model.sync_fixture_clamping_element() + model.sync_fixture_model() 1 days -1 - - 同步资源库夹紧元件类型 - + + 同步功能夹具类型 + code - model.sync_clamping_element_type() + model.sync_functional_fixture_type() 1 days -1 - - 同步资源库导向元件类型 - + + 同步功能夹具 + code - model.sync_guide_element_type() + model.sync_functional_fixture() 1 days -1 - - 同步资源库导向元件导向方式 - - code - model.sync_guide_element_guide_mode() - 1 - days - -1 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py index ba74d692..0cd13cf6 100644 --- a/sf_mrs_connect/models/sync_common.py +++ b/sf_mrs_connect/models/sync_common.py @@ -2866,13 +2866,13 @@ class SyncMulti_Mounting_Type(models.Model): class SyncFixtureModel(models.Model): - _inherit = 'sf.fixture_model' + _inherit = 'sf.fixture.model' _description = '同步夹具型号列表' url = '/api/fixture_model/list' - # 定时同步夹具物料列表 - def sync_multi_mounting_type(self): + # 定时同步夹具型号列表 + def sync_fixture_model(self): sf_sync_config = self.env['res.config.settings'].get_values() token = sf_sync_config['token'] sf_secret_key = sf_sync_config['sf_secret_key'] @@ -2893,11 +2893,11 @@ class SyncFixtureModel(models.Model): "name": item['name'], "code": item['code'], "remark": item['remark'], - "fixture_material_id": self.env['mrs.fixture.material'].search( + "fixture_material_id": self.env['sf.fixture.material'].search( [('code', '=', item.fixture_material_code)]).id, - "multi_mounting_type_id": self.env['mrs.multi_mounting.type'].search( + "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search( [('code', '=', item.multi_mounting_type_code)]).id, - "brand_id": self.env['mrs.machine.brand'].search([('code', '=', item.brand_code)]).id, + "brand_id": self.env['sf.machine.brand'].search([('code', '=', item.brand_code)]).id, "clamping_way": item.clamping_way, "port_type": item.port_type, "model_file": item.model_file, @@ -2910,8 +2910,8 @@ class SyncFixtureModel(models.Model): "clamp_workpiece_height_max": item.clamp_workpiece_height_max, "clamp_workpiece_diameter_max": item.clamp_workpiece_diameter_max, "maximum_carrying_weight": item.maximum_carrying_weight, - "Maximum_clamping_force": item.Maximum_clamping_force, - "materials_model_id": self.env['mrs.materials.model'].search( + "maximum_clamping_force": item.maximum_clamping_force, + "materials_model_id": self.env['sf.materials.model'].search( [('materials_no', '=', item.materials_model_code)]).id, "driving_way": item.driving_way, "apply_machine_tool_type": item.apply_machine_tool_type, @@ -2921,11 +2921,11 @@ class SyncFixtureModel(models.Model): "name": item['name'], "code": item['code'], "remark": item['remark'], - "fixture_material_id": self.env['mrs.fixture.material'].search( + "fixture_material_id": self.env['sf.fixture.material'].search( [('code', '=', item.fixture_material_code)]).id, - "multi_mounting_type_id": self.env['mrs.multi_mounting.type'].search( + "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search( [('code', '=', item.multi_mounting_type_code)]).id, - "brand_id": self.env['mrs.machine.brand'].search([('code', '=', item.brand_code)]).id, + "brand_id": self.env['sf.machine.brand'].search([('code', '=', item.brand_code)]).id, "clamping_way": item.clamping_way, "port_type": item.port_type, "model_file": item.model_file, @@ -2938,8 +2938,8 @@ class SyncFixtureModel(models.Model): "clamp_workpiece_height_max": item.clamp_workpiece_height_max, "clamp_workpiece_diameter_max": item.clamp_workpiece_diameter_max, "maximum_carrying_weight": item.maximum_carrying_weight, - "Maximum_clamping_force": item.Maximum_clamping_force, - "materials_model_id": self.env['mrs.materials.model'].search( + "maximum_clamping_force": item.maximum_clamping_force, + "materials_model_id": self.env['sf.materials.model'].search( [('materials_no', '=', item.materials_model_code)]).id, "driving_way": item.driving_way, "apply_machine_tool_type": item.apply_machine_tool_type, @@ -2947,7 +2947,7 @@ class SyncFixtureModel(models.Model): else: raise ValidationError("认证未通过") - # 定时同步所有夹具物料列表 + # 定时同步所有夹具型号列表 def sync_all_fixture_model(self): sf_sync_config = self.env['res.config.settings'].get_values() token = sf_sync_config['token'] @@ -2970,11 +2970,11 @@ class SyncFixtureModel(models.Model): "name": item['name'], "code": item['code'], "remark": item['remark'], - "fixture_material_id": self.env['mrs.fixture.material'].search( + "fixture_material_id": self.env['sf.fixture.material'].search( [('code', '=', item.fixture_material_code)]).id, - "multi_mounting_type_id": self.env['mrs.multi_mounting.type'].search( + "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search( [('code', '=', item.multi_mounting_type_code)]).id, - "brand_id": self.env['mrs.machine.brand'].search([('code', '=', item.brand_code)]).id, + "brand_id": self.env['sf.machine.brand'].search([('code', '=', item.brand_code)]).id, "clamping_way": item.clamping_way, "port_type": item.port_type, "model_file": item.model_file, @@ -2987,8 +2987,8 @@ class SyncFixtureModel(models.Model): "clamp_workpiece_height_max": item.clamp_workpiece_height_max, "clamp_workpiece_diameter_max": item.clamp_workpiece_diameter_max, "maximum_carrying_weight": item.maximum_carrying_weight, - "Maximum_clamping_force": item.Maximum_clamping_force, - "materials_model_id": self.env['mrs.materials.model'].search( + "maximum_clamping_force": item.maximum_clamping_force, + "materials_model_id": self.env['sf.materials.model'].search( [('materials_no', '=', item.materials_model_code)]).id, "driving_way": item.driving_way, "apply_machine_tool_type": item.apply_machine_tool_type, @@ -2998,11 +2998,11 @@ class SyncFixtureModel(models.Model): "name": item['name'], "code": item['code'], "remark": item['remark'], - "fixture_material_id": self.env['mrs.fixture.material'].search( + "fixture_material_id": self.env['sf.fixture.material'].search( [('code', '=', item.fixture_material_code)]).id, - "multi_mounting_type_id": self.env['mrs.multi_mounting.type'].search( + "multi_mounting_type_id": self.env['sf.multi_mounting.type'].search( [('code', '=', item.multi_mounting_type_code)]).id, - "brand_id": self.env['mrs.machine.brand'].search([('code', '=', item.brand_code)]).id, + "brand_id": self.env['sf.machine.brand'].search([('code', '=', item.brand_code)]).id, "clamping_way": item.clamping_way, "port_type": item.port_type, "model_file": item.model_file, @@ -3015,8 +3015,8 @@ class SyncFixtureModel(models.Model): "clamp_workpiece_height_max": item.clamp_workpiece_height_max, "clamp_workpiece_diameter_max": item.clamp_workpiece_diameter_max, "maximum_carrying_weight": item.maximum_carrying_weight, - "Maximum_clamping_force": item.Maximum_clamping_force, - "materials_model_id": self.env['mrs.materials.model'].search( + "maximum_clamping_force": item.maximum_clamping_force, + "materials_model_id": self.env['sf.materials.model'].search( [('materials_no', '=', item.materials_model_code)]).id, "driving_way": item.driving_way, "apply_machine_tool_type": item.apply_machine_tool_type,