From 87e3f6d04ecc6d37e193350352ef75e8d96d0e5f Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Mon, 26 Jun 2023 18:07:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=B9=E5=85=B7?= =?UTF-8?q?=E5=92=8C=E5=8A=9F=E8=83=BD=E5=A4=B9=E5=85=B7=EF=BC=8C=E5=8F=8A?= =?UTF-8?q?=E5=90=8C=E6=AD=A5mrs=E7=9A=84=E5=A4=B9=E5=85=B7=E5=92=8C?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=A4=B9=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/__manifest__.py | 11 +- sf_base/models/fixture.py | 48 + sf_base/models/functional_fixture.py | 19 + sf_base/security/ir.model.access.csv | 12 +- sf_base/views/fixture_view.xml | 255 ++++ sf_base/views/functional_fixture_view.xml | 112 ++ sf_base/views/ir_cron_mrs.xml | 505 +++++++ sf_base/views/menu_fixture_view.xml | 217 +-- sf_mrs_connect/models/res_config_setting.py | 10 + sf_mrs_connect/models/sync_common.py | 1365 ++++++++++++------- 10 files changed, 1986 insertions(+), 568 deletions(-) create mode 100644 sf_base/models/fixture.py create mode 100644 sf_base/models/functional_fixture.py create mode 100644 sf_base/views/fixture_view.xml create mode 100644 sf_base/views/functional_fixture_view.xml create mode 100644 sf_base/views/ir_cron_mrs.xml diff --git a/sf_base/__manifest__.py b/sf_base/__manifest__.py index 65b76795..fd39282d 100644 --- a/sf_base/__manifest__.py +++ b/sf_base/__manifest__.py @@ -14,12 +14,15 @@ 'data': [ 'security/group_security.xml', 'security/ir.model.access.csv', + 'data/fixture_data.xml' 'views/base_view.xml', 'views/common_view.xml', "views/menu_view.xml", - "views/tool_base_views.xml", - "views/tool_base_menu.xml", - 'views/fixture_base_view.xml', + 'views/fixture_view.xml', + 'views/menu_view.xml', + # "views/tool_base_views.xml", + # "views/tool_base_menu.xml", + # 'views/fixture_base_view.xml', 'views/menu_fixture_view.xml', ], @@ -30,7 +33,7 @@ 'web.assets_qweb': [ ], 'web.assets_backend': [ - 'sf_base/static/src/scss/*.scss', + 'sf_base/static/src/scss/*.scss', ], }, diff --git a/sf_base/models/fixture.py b/sf_base/models/fixture.py new file mode 100644 index 00000000..9d0e8107 --- /dev/null +++ b/sf_base/models/fixture.py @@ -0,0 +1,48 @@ +from odoo import models, fields, api + + +class FixtureMaterial(models.Model): + _name = 'sf.fixture.material' + _description = "夹具物料" + + code = fields.Char(string='编码') + name = fields.Char(string="名称", size=15) + remark = fields.Char(string="备注") + + +class Multi_MountingType(models.Model): + _name = 'sf.multi_mounting.type' + _description = "联装类型" + + code = fields.Char(string='编码') + name = fields.Char(string="名称", size=15) + remark = fields.Char(string="备注") + + +class FixtureModel(models.Model): + _name = 'sf.fixture.model' + _description = "夹具型号" + + 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="品牌") + clamping_way = fields.Char(string="装夹方式") + port_type = fields.Char(string="接口类型") + model_file = fields.Binary(string="3D模型图") + length = fields.Char(string="长度[mm]") + width = fields.Char(string="宽度[mm]") + height = fields.Char(string="高度[mm]") + weight = fields.Char(string="重量[kg]") + clamp_workpiece_length_max = fields.Char(string="夹持工件长度MAX[mm]") + clamp_workpiece_width_max = fields.Char(string="夹持工件宽度MAX[mm]") + clamp_workpiece_height_max = fields.Char(string="夹持工件高度MAX[mm]") + 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="材料型号") + driving_way = fields.Char(string="驱动方式") + apply_machine_tool_type = fields.Char(string="适用机床型号") + + diff --git a/sf_base/models/functional_fixture.py b/sf_base/models/functional_fixture.py new file mode 100644 index 00000000..ff046ff7 --- /dev/null +++ b/sf_base/models/functional_fixture.py @@ -0,0 +1,19 @@ +from odoo import models, fields, api + + +class FunctionalFixtureType(models.Model): + _name = 'sf.functional.fixture.type' + _description = "功能夹具类型" + + code = fields.Char(string='编码', readonly=True) + name = fields.Char(string="名称", size=15) + remark = fields.Char(string="备注") + + +class FunctionalFixture(models.Model): + _name = 'sf.functional.fixture' + _description = "功能夹具" + + code = fields.Char(string='编码', readonly=True) + name = fields.Char(string="名称", size=15) + functional_fixture_type_id = fields.Many2one('mrs.functional.fixture.type', string="功能夹具类型" ) \ No newline at end of file diff --git a/sf_base/security/ir.model.access.csv b/sf_base/security/ir.model.access.csv index ad1e2ff2..430d2805 100644 --- a/sf_base/security/ir.model.access.csv +++ b/sf_base/security/ir.model.access.csv @@ -31,18 +31,20 @@ 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 +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 +access_sf_fixture_model,sf_fixture_model,model_sf_fixture_model,base.group_user,1,1,1,1 +access_sf_functional_fixture_type,sf_functional_fixture_type,model_sf_functional_fixture_type,base.group_user,1,1,1,1 +access_sf_functional_fixture,sf_functional_fixture,model_sf_functional_fixture,base.group_user,1,1,1,1 + + diff --git a/sf_base/views/fixture_view.xml b/sf_base/views/fixture_view.xml new file mode 100644 index 00000000..67d2c7a8 --- /dev/null +++ b/sf_base/views/fixture_view.xml @@ -0,0 +1,255 @@ + + + + + + search.sf.fixture.material + sf.fixture.material + + + + + + + + + + + 夹具物料 + sf.fixture.material + + + + + + + + + + + 夹具物料 + sf.fixture.material + +
+ + + + + + + + + + + + + + + +
+ + + + + 夹具物料 + ir.actions.act_window + sf.fixture.material + tree,form + + + + + + + search.sf.multi_mounting.type + sf.multi_mounting.type + + + + + + + + + + + + 联装类型 + sf.multi_mounting.type + + + + + + + + + + + 联装类型 + sf.multi_mounting.type + +
+ + + + + + + + + + + + + +
+ + + + + 联装类型 + ir.actions.act_window + sf.multi_mounting.type + tree,form + + + + + + search.sf.fixture.model + sf.fixture.model + + + + + + + + + + + + + + + + + + 夹具型号 + sf.fixture.model + + + + + + + + + + + + + + + 夹具型号 + sf.fixture.model + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + 夹具型号 + ir.actions.act_window + sf.fixture.model + tree,form + + \ No newline at end of file diff --git a/sf_base/views/functional_fixture_view.xml b/sf_base/views/functional_fixture_view.xml new file mode 100644 index 00000000..6a7e3c57 --- /dev/null +++ b/sf_base/views/functional_fixture_view.xml @@ -0,0 +1,112 @@ + + + + + + + search.sf.functional.fixture.type + sf.functional.fixture.type + + + + + + + + + + + 功能夹具类型 + sf.functional.fixture.type + + + + + + + + + + + 功能夹具类型 + sf.functional.fixture.type + +
+ + + + + + + + + + + + + +
+ + + + + 功能夹具类型 + ir.actions.act_window + sf.functional.fixture.type + tree,form + + + + + + + search.sf.functional.fixture + sf.functional.fixture + + + + + + + + + + 功能夹具 + sf.functional.fixture + + + + + + + + + + 功能夹具 + sf.functional.fixture + +
+ + + + + + + + +
+ + + + + 功能夹具 + ir.actions.act_window + sf.functional.fixture + tree,form + + \ No newline at end of file diff --git a/sf_base/views/ir_cron_mrs.xml b/sf_base/views/ir_cron_mrs.xml new file mode 100644 index 00000000..a1e88354 --- /dev/null +++ b/sf_base/views/ir_cron_mrs.xml @@ -0,0 +1,505 @@ + + + + + 基础信息同步:品牌类别 + + code + model._cron_machine_brand_tags_func() + 1 + days + -1 + + + + + + 基础信息同步:工序 + + code + model._cron_processing_order_func() + 1 + days + -1 + + + + + 基础信息同步:品牌 + + code + model._cron_machine_brand_func() + 1 + days + -1 + + + + + 基础信息同步:机床型号 + + code + model._cron_machine_tool_type_func() + 1 + days + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 基础信息同步:材料 + + code + model._cron_production_materials_func() + 1 + days + -1 + + + + + 基础信息同步:材料型号 + + code + model._cron_materials_model_func() + 1 + days + -1 + + + + + 基础信息同步:表面工艺类别 + + code + model._cron_production_process_category_func() + 1 + days + -1 + + + + + + 基础信息同步:表面工艺 + + code + model._cron_production_process_func() + 1 + days + -1 + + + + + + + + + + + + + + + + 基础信息同步:数控系统 + + code + model._cron_machine_control_system_func() + 1 + days + -1 + + + + + 基础信息同步:模型类型 + + code + model._cron_model_type_func() + 1 + days + -1 + + + + + 基础信息同步:可选参数 + + code + model._cron_mrs_production_process_parameter() + 1 + days + -1 + + + + + 基础信息同步:机床类型 + + code + model._cron_machine_tool_category_func() + 1 + days + -1 + + + + + 基础信息同步:功能刀具型号 + + code + model._cron_mrs_functional_cutting_tool_func() + 1 + days + -1 + + + + + 基础信息同步:功能刀具类型 + + code + model._cron_mrs_functional_cutting_tool_model_func() + 1 + days + -1 + + + + + 基础信息同步:整体式刀具 + + code + model._cron_mrs_integral_cutting_tool_func() + 1 + days + -1 + + + + + 基础信息同步:整体式刀具类型 + + code + model._cron_mrs_integral_cutting_tool_model_func() + 1 + days + -1 + + + + + 基础信息同步:刀片型号 + + code + model._cron_mrs_blade_func() + 1 + days + -1 + + + + + 基础信息同步:刀片类型 + + code + model._cron_mrs_blade_model_func() + 1 + days + -1 + + + + + 基础信息同步:刀杆型号 + + code + model._cron_mrs_cutter_bar_func() + 1 + days + -1 + + + + + 基础信息同步:刀杆类型 + + code + model._cron_mrs_cutter_bar_model_func() + 1 + days + -1 + + + + + 基础信息同步:刀盘型号 + + code + model._cron_mrs_cutter_pad_func() + 1 + days + -1 + + + + + 基础信息同步:刀盘类型 + + code + model._cron_mrs_cutter_pad_model_func() + 1 + days + -1 + + + + + + 基础信息同步:刀柄型号 + + code + model._cron_mrs_handle_func() + 1 + days + -1 + + + + + 基础信息同步:刀柄类型 + + code + model._cron_mrs_handle_model_func() + 1 + days + -1 + + + + + 基础信息同步:夹具物料 + + code + model._cron_fixture_material_func() + 1 + days + -1 + + + + + 基础信息同步:联装类型 + + code + model._cron_multi_mounting_type_func() + 1 + days + -1 + + + + + 基础信息同步:夹具型号 + + code + model._cron_fixture_model_func() + 1 + days + -1 + + + + + 基础信息同步:功能夹具类型 + + code + model._cron_functional_fixture_type_func() + 1 + days + -1 + + + + + 基础信息同步:功能夹具 + + code + model._cron_functional_fixture_func() + 1 + days + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sf_base/views/menu_fixture_view.xml b/sf_base/views/menu_fixture_view.xml index 4a5e1283..34cc2486 100644 --- a/sf_base/views/menu_fixture_view.xml +++ b/sf_base/views/menu_fixture_view.xml @@ -1,106 +1,127 @@ - - - - - - - - - - - - - - - - - - - - - - - - + /> - - - + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 de7265ba..032a1b20 100644 --- a/sf_mrs_connect/models/res_config_setting.py +++ b/sf_mrs_connect/models/res_config_setting.py @@ -136,6 +136,16 @@ class ResConfigSettings(models.TransientModel): self.env['sf.functional.cutting.tool'].sync_all_functional_cutting_tool() _logger.info("同步所有功能刀具列表完成") + self.env['sf.fixture.material'].sync_all_fixture_material() + _logger.info("同步夹具物料") + self.env['sf.multi_mounting.type'].sync_all_multi_mounting_type() + _logger.info("同步联装类型") + self.env['sf.fixture.model'].sync_all_fixture_model() + _logger.info("同步夹具型号") + self.env['sf.functional.fixture.type'].sync_all_functional_fixture_type() + _logger.info("同步功能夹具类型") + self.env['sf.functional.fixture'].sync_all_functional_fixture() + _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() diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py index bd236f9c..ba74d692 100644 --- a/sf_mrs_connect/models/sync_common.py +++ b/sf_mrs_connect/models/sync_common.py @@ -2725,15 +2725,45 @@ class SyncHandleModel(models.Model): raise ValidationError("认证未通过") -# 同步夹头型号列表 -class SyncChuck(models.Model): - _inherit = 'sf.chuck' - _description = '同步夹头型号列表' +class SyncFixtureMaterial(models.Model): + _inherit = 'sf.fixture.material' + _description = '同步夹具物料列表' - url = '/api/mrs_chuck/list' + url = '/api/fixture_material/list' - # 定时同步每日夹头型号列表 - def sync_chuck(self): + # 定时同步夹具物料列表 + def sync_fixture_material(self): + sf_sync_config = self.env['res.config.settings'].get_values() + token = sf_sync_config['token'] + sf_secret_key = sf_sync_config['sf_secret_key'] + headers = Common.get_headers(self, token, sf_secret_key) + strUrl = sf_sync_config['sf_url'] + self.url + 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('fixture_material_yesterday_list'): + for item in result['fixture_material_yesterday_list']: + if item: + fixture_material = self.env['sf.fixture.material'].search( + [("code", '=', item['code'])]) + if not fixture_material: + self.env['sf.fixture.material'].create({ + "name": item['name'], + "code": item['code'], + "remark": item['remark'], + }) + else: + fixture_material.write({ + "name": item['name'], + "remark": item['remark'], + }) + else: + raise ValidationError("认证未通过") + + # 定时同步所有夹具物料列表 + def sync_all_fixture_material(self): sf_sync_config = self.env['res.config.settings'].get_values() token = sf_sync_config['token'] sf_secret_key = sf_sync_config['sf_secret_key'] @@ -2745,71 +2775,65 @@ class SyncChuck(models.Model): result = json.loads(r['result']) # print('result:%s' % result) if result['status'] == 1: - if result.get('mrs_chuck_yesterday_list'): - for item in result['mrs_chuck_yesterday_list']: - handle_model_list = [] - if item.get('handle_model'): - for handle_model in item['handle_model']: - handle_model_list.append(self.env['sf.handle.model'].search( - [("code", '=', handle_model)]).id) + if result.get('fixture_material_all_list'): + for item in result['fixture_material_all_list']: if item: - brand = self.env['sf.chuck'].search( + fixture_material = self.env['sf.fixture.material'].search( [("code", '=', item['code'])]) - if item.get('image'): - image = base64.b64decode(item['image']) - else: - image = '' - if not brand: - # code, name, chuck_model_number, brand, accuracy, diameter, inner_diameter, height, material_model, nut, handle_model, clamping_range, feature, image - self.env['sf.chuck'].create({ - "code": item['code'], + if not fixture_material: + self.env['sf.fixture.material'].create({ "name": item['name'], - "chuck_model_number": self.env['sf.chuck.model'].search( - [("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'], - "height": item['height'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "nut": item['nut'], - "handle_model": handle_model_list, - "clamping_range": item['clamping_range'], - "feature": item['feature'], - "image": image, + "code": item['code'], + "remark": item['remark'], }) else: - brand.write({ - "code": item['code'], + fixture_material.write({ "name": item['name'], - "chuck_model_number": self.env['sf.chuck.model'].search( - [("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'], - "height": item['height'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "nut": item['nut'], - "handle_model": handle_model_list, - "clamping_range": item['clamping_range'], - "feature": item['feature'], - "image": image, + "remark": item['remark'], }) - print('同步每日夹头型号列表成功') else: raise ValidationError("认证未通过") - # 同步所有夹头型号列表 - def sync_all_chuck(self): + +class SyncMulti_Mounting_Type(models.Model): + _inherit = 'sf.multi_mounting.type' + _description = '同步联装类型列表' + + url = '/api/multi_mounting_type/list' + + # 定时同步夹具物料列表 + def sync_multi_mounting_type(self): + sf_sync_config = self.env['res.config.settings'].get_values() + token = sf_sync_config['token'] + sf_secret_key = sf_sync_config['sf_secret_key'] + headers = Common.get_headers(self, token, sf_secret_key) + strUrl = sf_sync_config['sf_url'] + self.url + 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('multi_mounting_type_yesterday_list'): + for item in result['multi_mounting_type_yesterday_list']: + if item: + multi_mounting_type = self.env['sf.multi_mounting.type'].search( + [("code", '=', item['code'])]) + if not multi_mounting_type: + self.env['sf.multi_mounting.type'].create({ + "name": item['name'], + "code": item['code'], + "remark": item['remark'], + }) + else: + multi_mounting_type.write({ + "name": item['name'], + "remark": item['remark'], + }) + else: + raise ValidationError("认证未通过") + + # 定时同步所有夹具物料列表 + def sync_all_multi_mounting_type(self): sf_sync_config = self.env['res.config.settings'].get_values() token = sf_sync_config['token'] sf_secret_key = sf_sync_config['sf_secret_key'] @@ -2821,79 +2845,110 @@ class SyncChuck(models.Model): result = json.loads(r['result']) # print('result:%s' % result) if result['status'] == 1: - if result.get('mrs_chuck_all_list'): - for item in result['mrs_chuck_all_list']: - handle_model_list = [] - if item.get('handle_model'): - for handle_model in item['handle_model']: - handle_model_list.append(self.env['sf.handle.model'].search( - [("code", '=', handle_model)]).id) + if result.get('multi_mounting_type_all_list'): + for item in result['multi_mounting_type_all_list']: if item: - brand = self.env['sf.chuck'].search( + multi_mounting_type = self.env['sf.multi_mounting.type'].search( [("code", '=', item['code'])]) - if item.get('image'): - image = base64.b64decode(item['image']) - else: - image = '' - if not brand: - # code, name, chuck_model_number, brand, accuracy, diameter, inner_diameter, height, material_model, nut, handle_model, clamping_range, feature, image - self.env['sf.chuck'].create({ - "code": item['code'], + if not multi_mounting_type: + self.env['sf.multi_mounting.type'].create({ "name": item['name'], - "chuck_model_number": self.env['sf.chuck.model'].search( - [("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'], - "height": item['height'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "nut": item['nut'], - "handle_model": handle_model_list, - "clamping_range": item['clamping_range'], - "feature": item['feature'], - "image": image, + "code": item['code'], + "remark": item['remark'], }) else: - brand.write({ - "code": item['code'], + multi_mounting_type.write({ "name": item['name'], - "chuck_model_number": self.env['sf.chuck.model'].search( - [("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'], - "height": item['height'], - "material_model": self.env['sf.materials.model'].search( - [("materials_no", '=', item['material_model'])]).id, - "nut": item['nut'], - "handle_model": handle_model_list, - "clamping_range": item['clamping_range'], - "feature": item['feature'], - "image": image, + "remark": item['remark'], }) - print('同步所有夹头型号列表成功') else: raise ValidationError("认证未通过") -# 同步夹头类型列表 -class SyncChuckModel(models.Model): - _inherit = 'sf.chuck.model' - _description = '同步夹头类型列表' +class SyncFixtureModel(models.Model): + _inherit = 'sf.fixture_model' + _description = '同步夹具型号列表' - url = '/api/mrs_chuck_model/list' + url = '/api/fixture_model/list' - # 定时同步每日夹头型号列表 - def sync_chuck_model(self): + # 定时同步夹具物料列表 + def sync_multi_mounting_type(self): + sf_sync_config = self.env['res.config.settings'].get_values() + token = sf_sync_config['token'] + sf_secret_key = sf_sync_config['sf_secret_key'] + headers = Common.get_headers(self, token, sf_secret_key) + strUrl = sf_sync_config['sf_url'] + self.url + 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('fixture_model_yesterday_list'): + for item in result['fixture_model_yesterday_list']: + if item: + fixture_model = self.env['sf.fixture.model'].search( + [("code", '=', item['code'])]) + if not fixture_model: + self.env['sf.fixture.model'].create({ + "name": item['name'], + "code": item['code'], + "remark": item['remark'], + "fixture_material_id": self.env['mrs.fixture.material'].search( + [('code', '=', item.fixture_material_code)]).id, + "multi_mounting_type_id": self.env['mrs.multi_mounting.type'].search( + [('code', '=', item.multi_mounting_type_code)]).id, + "brand_id": self.env['mrs.machine.brand'].search([('code', '=', item.brand_code)]).id, + "clamping_way": item.clamping_way, + "port_type": item.port_type, + "model_file": item.model_file, + "length": item.length, + "width": item.width, + "height": item.height, + "weight": item.weight, + "clamp_workpiece_length_max": item.clamp_workpiece_length_max, + "clamp_workpiece_width_max": item.clamp_workpiece_width_max, + "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( + [('materials_no', '=', item.materials_model_code)]).id, + "driving_way": item.driving_way, + "apply_machine_tool_type": item.apply_machine_tool_type, + }) + else: + fixture_model.write({ + "name": item['name'], + "code": item['code'], + "remark": item['remark'], + "fixture_material_id": self.env['mrs.fixture.material'].search( + [('code', '=', item.fixture_material_code)]).id, + "multi_mounting_type_id": self.env['mrs.multi_mounting.type'].search( + [('code', '=', item.multi_mounting_type_code)]).id, + "brand_id": self.env['mrs.machine.brand'].search([('code', '=', item.brand_code)]).id, + "clamping_way": item.clamping_way, + "port_type": item.port_type, + "model_file": item.model_file, + "length": item.length, + "width": item.width, + "height": item.height, + "weight": item.weight, + "clamp_workpiece_length_max": item.clamp_workpiece_length_max, + "clamp_workpiece_width_max": item.clamp_workpiece_width_max, + "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( + [('materials_no', '=', item.materials_model_code)]).id, + "driving_way": item.driving_way, + "apply_machine_tool_type": item.apply_machine_tool_type, + }) + else: + raise ValidationError("认证未通过") + + # 定时同步所有夹具物料列表 + def sync_all_fixture_model(self): sf_sync_config = self.env['res.config.settings'].get_values() token = sf_sync_config['token'] sf_secret_key = sf_sync_config['sf_secret_key'] @@ -2905,33 +2960,110 @@ class SyncChuckModel(models.Model): result = json.loads(r['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']: + if result.get('fixture_model_all_list'): + for item in result['fixture_model_all_list']: if item: - brand = self.env['sf.chuck.model'].search( + fixture_model = self.env['sf.fixture.model'].search( [("code", '=', item['code'])]) - if not brand: - self.env['sf.chuck.model'].create({ + if not fixture_model: + self.env['sf.fixture.model'].create({ "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, + "fixture_material_id": self.env['mrs.fixture.material'].search( + [('code', '=', item.fixture_material_code)]).id, + "multi_mounting_type_id": self.env['mrs.multi_mounting.type'].search( + [('code', '=', item.multi_mounting_type_code)]).id, + "brand_id": self.env['mrs.machine.brand'].search([('code', '=', item.brand_code)]).id, + "clamping_way": item.clamping_way, + "port_type": item.port_type, + "model_file": item.model_file, + "length": item.length, + "width": item.width, + "height": item.height, + "weight": item.weight, + "clamp_workpiece_length_max": item.clamp_workpiece_length_max, + "clamp_workpiece_width_max": item.clamp_workpiece_width_max, + "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( + [('materials_no', '=', item.materials_model_code)]).id, + "driving_way": item.driving_way, + "apply_machine_tool_type": item.apply_machine_tool_type, }) else: - brand.write({ + fixture_model.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, + "fixture_material_id": self.env['mrs.fixture.material'].search( + [('code', '=', item.fixture_material_code)]).id, + "multi_mounting_type_id": self.env['mrs.multi_mounting.type'].search( + [('code', '=', item.multi_mounting_type_code)]).id, + "brand_id": self.env['mrs.machine.brand'].search([('code', '=', item.brand_code)]).id, + "clamping_way": item.clamping_way, + "port_type": item.port_type, + "model_file": item.model_file, + "length": item.length, + "width": item.width, + "height": item.height, + "weight": item.weight, + "clamp_workpiece_length_max": item.clamp_workpiece_length_max, + "clamp_workpiece_width_max": item.clamp_workpiece_width_max, + "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( + [('materials_no', '=', item.materials_model_code)]).id, + "driving_way": item.driving_way, + "apply_machine_tool_type": item.apply_machine_tool_type, }) - print('同步每日夹头类型列表成功') else: raise ValidationError("认证未通过") - # 定时同步所有夹头型号列表 - def sync_all_chuck_model(self): + +class SyncFunctionalFixtureType(models.Model): + _inherit = 'sf.functional.fixture.type' + _description = '同步功能夹具类型列表' + + url = '/api/functional_fixture_type/list' + + # 定时同步功能夹具类型列表 + def sync_functional_fixture_type(self): + sf_sync_config = self.env['res.config.settings'].get_values() + token = sf_sync_config['token'] + sf_secret_key = sf_sync_config['sf_secret_key'] + headers = Common.get_headers(self, token, sf_secret_key) + strUrl = sf_sync_config['sf_url'] + self.url + 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('functional_fixture_type_yesterday_list'): + for item in result['functional_fixture_type_yesterday_list']: + if item: + functional_fixture_type = self.env['sf.functional.fixture.type'].search( + [("code", '=', item['code'])]) + if not functional_fixture_type: + self.env['sf.functional.fixture.type'].create({ + "name": item['name'], + "code": item['code'], + "remark": item['remark'], + }) + else: + functional_fixture_type.write({ + "name": item['name'], + "remark": item['remark'], + }) + else: + raise ValidationError("认证未通过") + + # 定时同步所有功能夹具类型列表 + def sync_all_functional_fixture_type(self): sf_sync_config = self.env['res.config.settings'].get_values() token = sf_sync_config['token'] sf_secret_key = sf_sync_config['sf_secret_key'] @@ -2943,42 +3075,65 @@ class SyncChuckModel(models.Model): result = json.loads(r['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']: + if result.get('functional_fixture_type_all_list'): + for item in result['functional_fixture_type_all_list']: if item: - brand = self.env['sf.chuck.model'].search( + functional_fixture_type = self.env['sf.functional.fixture.type'].search( [("code", '=', item['code'])]) - if not brand: - self.env['sf.chuck.model'].create({ + if not functional_fixture_type: + self.env['sf.functional.fixture.type'].create({ "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({ + functional_fixture_type.write({ + "name": item['name'], + "remark": item['remark'], + }) + else: + raise ValidationError("认证未通过") + + +class SyncFunctionalFixture(models.Model): + _inherit = 'sf.functional.fixture' + _description = '同步功能夹具列表' + + url = '/api/functional_fixture/list' + + # 定时同步功能夹具列表 + def sync_functional_fixture(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('functional_fixture_yesterday_list'): + for item in result['functional_fixture_yesterday_list']: + if item: + functional_fixture = self.env['sf.functional.fixture'].search( + [("code", '=', item['code'])]) + if not functional_fixture: + self.env['sf.functional.fixture'].create({ "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: + functional_fixture.write({ + "name": item['name'], + "remark": item['remark'], + }) 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): + # 定时同步所有功能夹具列表 + def sync_all_functional_fixture(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'] @@ -2988,314 +3143,602 @@ class sfClampingElementType(models.Model): 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: - 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'] - }) + if result.get('functional_fixture_all_list'): + for item in result['functional_fixture_all_list']: + if item: + functional_fixture = self.env['sf.functional.fixture'].search( + [("code", '=', item['code'])]) + if not functional_fixture: + self.env['sf.functional.fixture'].create({ + "name": item['name'], + "code": item['code'], + "remark": item['remark'], + }) + else: + functional_fixture.write({ + "name": item['name'], + "remark": item['remark'], + }) 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("认证未通过") +# +# # 同步夹头型号列表 +# class SyncChuck(models.Model): +# _inherit = 'sf.chuck' +# _description = '同步夹头型号列表' +# +# url = '/api/mrs_chuck/list' +# +# # 定时同步每日夹头型号列表 +# def sync_chuck(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_chuck_yesterday_list'): +# for item in result['mrs_chuck_yesterday_list']: +# handle_model_list = [] +# if item.get('handle_model'): +# for handle_model in item['handle_model']: +# handle_model_list.append(self.env['sf.handle.model'].search( +# [("code", '=', handle_model)]).id) +# if item: +# brand = self.env['sf.chuck'].search( +# [("code", '=', item['code'])]) +# if item.get('image'): +# image = base64.b64decode(item['image']) +# else: +# image = '' +# if not brand: +# # code, name, chuck_model_number, brand, accuracy, diameter, inner_diameter, height, material_model, nut, handle_model, clamping_range, feature, image +# self.env['sf.chuck'].create({ +# "code": item['code'], +# "name": item['name'], +# "chuck_model_number": self.env['sf.chuck.model'].search( +# [("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'], +# "height": item['height'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "nut": item['nut'], +# "handle_model": handle_model_list, +# "clamping_range": item['clamping_range'], +# "feature": item['feature'], +# "image": image, +# }) +# else: +# brand.write({ +# "code": item['code'], +# "name": item['name'], +# "chuck_model_number": self.env['sf.chuck.model'].search( +# [("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'], +# "height": item['height'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "nut": item['nut'], +# "handle_model": handle_model_list, +# "clamping_range": item['clamping_range'], +# "feature": item['feature'], +# "image": image, +# }) +# print('同步每日夹头型号列表成功') +# else: +# raise ValidationError("认证未通过") +# +# # 同步所有夹头型号列表 +# def sync_all_chuck(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_chuck_all_list'): +# for item in result['mrs_chuck_all_list']: +# handle_model_list = [] +# if item.get('handle_model'): +# for handle_model in item['handle_model']: +# handle_model_list.append(self.env['sf.handle.model'].search( +# [("code", '=', handle_model)]).id) +# if item: +# brand = self.env['sf.chuck'].search( +# [("code", '=', item['code'])]) +# if item.get('image'): +# image = base64.b64decode(item['image']) +# else: +# image = '' +# if not brand: +# # code, name, chuck_model_number, brand, accuracy, diameter, inner_diameter, height, material_model, nut, handle_model, clamping_range, feature, image +# self.env['sf.chuck'].create({ +# "code": item['code'], +# "name": item['name'], +# "chuck_model_number": self.env['sf.chuck.model'].search( +# [("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'], +# "height": item['height'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "nut": item['nut'], +# "handle_model": handle_model_list, +# "clamping_range": item['clamping_range'], +# "feature": item['feature'], +# "image": image, +# }) +# else: +# brand.write({ +# "code": item['code'], +# "name": item['name'], +# "chuck_model_number": self.env['sf.chuck.model'].search( +# [("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'], +# "height": item['height'], +# "material_model": self.env['sf.materials.model'].search( +# [("materials_no", '=', item['material_model'])]).id, +# "nut": item['nut'], +# "handle_model": handle_model_list, +# "clamping_range": item['clamping_range'], +# "feature": item['feature'], +# "image": image, +# }) +# print('同步所有夹头型号列表成功') +# else: +# raise ValidationError("认证未通过") +# +# +# # 同步夹头类型列表 +# class SyncChuckModel(models.Model): +# _inherit = 'sf.chuck.model' +# _description = '同步夹头类型列表' +# +# url = '/api/mrs_chuck_model/list' +# +# # 定时同步每日夹头型号列表 +# def sync_chuck_model(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# 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_chuck_model_yesterday_list'): +# for item in result['mrs_chuck_model_yesterday_list']: +# if item: +# brand = self.env['sf.chuck.model'].search( +# [("code", '=', item['code'])]) +# if not brand: +# self.env['sf.chuck.model'].create({ +# "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_chuck_model(self): +# sf_sync_config = self.env['res.config.settings'].get_values() +# token = sf_sync_config['token'] +# sf_secret_key = sf_sync_config['sf_secret_key'] +# headers = Common.get_headers(self, token, sf_secret_key) +# +# strUrl = sf_sync_config['sf_url'] + self.url +# 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_chuck_model_all_list'): +# for item in result['mrs_chuck_model_all_list']: +# if item: +# brand = self.env['sf.chuck.model'].search( +# [("code", '=', item['code'])]) +# if not brand: +# self.env['sf.chuck.model'].create({ +# "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("认证未通过") From d18b1808d95db6eec9e65822c5740d34b34f0185 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Tue, 27 Jun 2023 16:35:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=A4=B9=E5=85=B7=E7=9B=B8=E5=85=B3=E7=9A=84=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=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,