From ce011276649d3f1fbac025a8d57454bfed1798dd Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Thu, 22 Feb 2024 10:15:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E6=8E=A7=E5=AF=B9=E6=8E=A5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/controllers/controllers.py | 4 ++-- sf_base/models/tool_base_new.py | 2 +- sf_quality/models/quality.py | 2 +- sf_tool_management/controllers/controllers.py | 10 +++++----- sf_tool_management/models/base.py | 2 +- sf_tool_management/models/mrp_workorder.py | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sf_base/controllers/controllers.py b/sf_base/controllers/controllers.py index 71547a67..ca600580 100644 --- a/sf_base/controllers/controllers.py +++ b/sf_base/controllers/controllers.py @@ -8,7 +8,7 @@ from odoo.http import request class Manufacturing_Connect(http.Controller): - @http.route('/AutoDeviceApi/MaintenanceToolGroups', type='json', auth='none', methods=['GET', 'POST'], csrf=False, + @http.route('/AutoDeviceApi/MachineToolGroup', type='json', auth='none', methods=['GET', 'POST'], csrf=False, cors="*") def get_maintenance_tool_groups_Info(self, **kw): """ @@ -20,7 +20,7 @@ class Manufacturing_Connect(http.Controller): try: datas = request.httprequest.data ret = json.loads(datas) - ret = json.loads(ret['result']) + # ret = json.loads(ret['result']) logging.info('DeviceId:%s' % ret) tool_groups = request.env['sf.tool.groups'].sudo().search([]) diff --git a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py index 18656c96..e5b3a098 100644 --- a/sf_base/models/tool_base_new.py +++ b/sf_base/models/tool_base_new.py @@ -256,7 +256,7 @@ class ToolGroups(models.Model): # ==========机床刀具组接口========== def _register_tool_groups(self, obj): - create_url = '/AutoDeviceApi/MaintenanceToolGroups' + create_url = '/AutoDeviceApi/MachineToolGroup' sf_sync_config = self.env['res.config.settings'].get_values() token = sf_sync_config['token'] sf_secret_key = sf_sync_config['sf_secret_key'] diff --git a/sf_quality/models/quality.py b/sf_quality/models/quality.py index 18b24daa..748d8bca 100644 --- a/sf_quality/models/quality.py +++ b/sf_quality/models/quality.py @@ -11,7 +11,7 @@ class QualityCheck(models.Model): # ==========零件特采接口========== def _register_tool_groups(self): - create_url = '/AutoDeviceApi/ModSpecial' + create_url = '/AutoDeviceApi/PartSpecProc' sf_sync_config = self.env['res.config.settings'].get_values() token = sf_sync_config['token'] sf_secret_key = sf_sync_config['sf_secret_key'] diff --git a/sf_tool_management/controllers/controllers.py b/sf_tool_management/controllers/controllers.py index b40abb69..f3412595 100644 --- a/sf_tool_management/controllers/controllers.py +++ b/sf_tool_management/controllers/controllers.py @@ -8,7 +8,7 @@ from odoo.http import request class Manufacturing_Connect(http.Controller): - @http.route('/AutoDeviceApi/MachineToolLibrary', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False, + @http.route('/AutoDeviceApi/GetToolInfo', type='json', auth='none', methods=['GET', 'POST'], csrf=False, cors="*") def get_equipment_tool_Info(self, **kw): """ @@ -20,7 +20,7 @@ class Manufacturing_Connect(http.Controller): try: datas = request.httprequest.data ret = json.loads(datas) - ret = json.loads(ret['result']) + ret = json.loads(ret.get('result')) logging.info('DeviceId:%s' % ret) equipment = request.env['maintenance.equipment'].sudo().search([('name', '=', ret['DeviceId'])]) @@ -56,7 +56,7 @@ class Manufacturing_Connect(http.Controller): logging.info('get_equipment_tool_Info error:%s' % e) return json.JSONEncoder().encode(res) - @http.route('/AutoDeviceApi/ToolGroups', type='json', auth='none', methods=['GET', 'POST'], csrf=False, + @http.route('/AutoDeviceApi/ToolGroup', type='json', auth='none', methods=['GET', 'POST'], csrf=False, cors="*") def get_functional_tool_groups_Info(self, **kw): """ @@ -68,7 +68,7 @@ class Manufacturing_Connect(http.Controller): try: datas = request.httprequest.data ret = json.loads(datas) - ret = json.loads(ret['result']) + # ret = json.loads(ret['result']) logging.info('DeviceId:%s' % ret) functional_tools = request.env['sf.functional.cutting.tool.entity'].sudo().search([]) @@ -83,4 +83,4 @@ class Manufacturing_Connect(http.Controller): except Exception as e: res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} logging.info('get_functional_tool_groups_Info error:%s' % e) - return json.JSONEncoder().encode(res) \ No newline at end of file + return json.JSONEncoder().encode(res) diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py index ab5e0649..a2799850 100644 --- a/sf_tool_management/models/base.py +++ b/sf_tool_management/models/base.py @@ -180,7 +180,7 @@ class FunctionalCuttingToolEntity(models.Model): # ==========刀具组接口========== def _register_functional_tool_groups(self, obj): - create_url = '/AutoDeviceApi/ToolGroups' + create_url = '/AutoDeviceApi/ToolGroup' sf_sync_config = self.env['res.config.settings'].get_values() token = sf_sync_config['token'] sf_secret_key = sf_sync_config['sf_secret_key'] diff --git a/sf_tool_management/models/mrp_workorder.py b/sf_tool_management/models/mrp_workorder.py index 90fe9393..47185516 100644 --- a/sf_tool_management/models/mrp_workorder.py +++ b/sf_tool_management/models/mrp_workorder.py @@ -11,7 +11,7 @@ class CNCprocessing(models.Model): # ==========MES装刀指令接口========== def register_cnc_processing(self, cnc_processing): - create_url = '/AutoDeviceApi/MESToolLoadingInstruction' + create_url = '/AutoDeviceApi/ToolLoadInstruct' sf_sync_config = self.env['res.config.settings'].get_values() token = sf_sync_config['token'] sf_secret_key = sf_sync_config['sf_secret_key']