From 94efe4e7ca16154d93fa9a716ea5c2a7e6bf6305 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Fri, 11 Aug 2023 10:26:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=90=8C=E6=AD=A5=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_mrs_connect/models/sync_common.py | 124 --------------------------- 1 file changed, 124 deletions(-) diff --git a/sf_mrs_connect/models/sync_common.py b/sf_mrs_connect/models/sync_common.py index a4aca06a..bd7b1cdd 100644 --- a/sf_mrs_connect/models/sync_common.py +++ b/sf_mrs_connect/models/sync_common.py @@ -570,121 +570,6 @@ class MachineBrand(models.Model): raise ValidationError("认证未通过") -class MachineTool(models.Model): - _inherit = 'sf.machine_tool' - _description = '机床' - url = '/api/machine_tool/list' - crea_url = '/api/machine_tool/create' - - # 定时同步机床 - def sync_machine_tool(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['machine_tool_all_yesterday_list']: - brand = self.env['sf.machine_tool'].search( - [("code", '=', item['code'])]) - if brand: - brand.id = item['id'], - brand.name = item['name'], - brand.code = item['code'], - brand.precision = item['precision'], - - brand.knife_type = item['knife_type'], - brand.registration_date = item['registration_date'], - brand.number_of_knife_library = item['number_of_knife_library'], - brand.rotate_speed = item['rotate_speed'], - brand.number_of_axles = item['number_of_axles'], - # brand.control_system_id = item['control_system_id'], - brand.type_id = item['type_id'], - brand.brand_id = item['brand_id'], - brand.x_axis = item['x_axis'], - brand.y_axis = item['y_axis'], - brand.z_axis = item['z_axis'], - brand.b_axis = item['b_axis'], - brand.c_axis = item['c_axis'], - brand.state = item['state'], - brand.active = item['active'] - - else: - self.env['sf.machine_tool'].create({ - "id": item['id'], - "name": item['name'], - "precision": item['precision'], - "code": item['code'], - "status": item['status'], - "knife_type": item['knife_type'], - "registration_date": item['registration_date'], - "number_of_knife_library": item['number_of_knife_library'], - "rotate_speed": item['rotate_speed'], - "number_of_axles": item['number_of_axles'], - # "control_system_id": item['control_system_id'], - "type_id": item['type_id'], - "brand_id": item['brand_id'], - "x_axis": item['x_axis'], - "y_axis": item['y_axis'], - "z_axis": item['z_axis'], - "b_axis": item['b_axis'], - "c_axis": item['c_axis'], - "state": item['state'], - "active": item['active'], - # "tag_ids": item['tag_ids'] - - }) - else: - raise ValidationError("认证未通过") - - # 同步所有机床 - def sync_all_machine_tool(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['machine_tool_all_list']: - brand = self.env['sf.machine_tool'].search( - [("code", '=', item['code'])]) - if not brand: - self.env['sf.machine_tool'].create({ - - "id": item['id'], - "name": item['name'], - "precision": item['precision'], - "code": item['code'], - "status": item['status'], - "knife_type": item['knife_type'], - "registration_date": item['registration_date'], - "number_of_knife_library": item['number_of_knife_library'], - "rotate_speed": item['rotate_speed'], - "number_of_axles": item['number_of_axles'], - # "control_system_id": item['control_system_id'], - "type_id": item['type_id'], - 'brand_id': self.env['sf.machine.brand'].search([('code', '=', item['brand_id'])]).id, - "x_axis": item['x_axis'], - "y_axis": item['y_axis'], - "z_axis": item['z_axis'], - "b_axis": item['b_axis'], - "c_axis": item['c_axis'], - "state": item['state'], - "active": item['active'], - # "tag_ids": item['tag_ids'] - - }) - else: - raise ValidationError("认证未通过") - class MachineToolType(models.Model): _inherit = 'sf.machine_tool.type' @@ -727,8 +612,6 @@ class MachineToolType(models.Model): brand.active = item['active'], brand.remark = item['remark'], brand.brand_id = self.env['sf.machine.brand'].search([('code', '=', item['brand_id'])]).id, - brand.machine_tool_id = self.env['sf.machine_tool'].search( - [('code', '=', item['machine_tool_id'])]).id else: # print(item['machine_tool_picture'].encode('utf-8')) @@ -740,8 +623,6 @@ class MachineToolType(models.Model): "number_of_knife_library": item['number_of_knife_library'], "rotate_speed": item['rotate_speed'], - 'machine_tool_id': self.env['sf.machine_tool'].search( - [('code', '=', item['machine_tool_id'])]).id, "number_of_axles": item['number_of_axles'], "x_axis": item['x_axis'], "y_axis": item['y_axis'], @@ -810,8 +691,6 @@ class MachineToolType(models.Model): "number_of_knife_library": item['number_of_knife_library'], "rotate_speed": item['rotate_speed'], - 'machine_tool_id': self.env['sf.machine_tool'].search( - [('code', '=', item['machine_tool_id'])]).id, "number_of_axles": item['number_of_axles'], "x_axis": item['x_axis'], "y_axis": item['y_axis'], @@ -856,11 +735,8 @@ class MachineToolType(models.Model): "id": item['id'], "name": item['name'], "code": item['code'], - "number_of_knife_library": item['number_of_knife_library'], "rotate_speed": item['rotate_speed'], - 'machine_tool_id': self.env['sf.machine_tool'].search( - [('code', '=', item['machine_tool_id'])]).id, "number_of_axles": item['number_of_axles'], "x_axis": item['x_axis'], "y_axis": item['y_axis'],