From 6405944cf1f3591b7759fab3f13a145516111347 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Thu, 30 May 2024 15:22:30 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=88=80=E5=85=B7=E6=B8=85=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD=E5=88=80?= =?UTF-8?q?=E5=85=B7=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_tool_management/controllers/controllers.py | 47 +++++++++++++++---- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/sf_tool_management/controllers/controllers.py b/sf_tool_management/controllers/controllers.py index a524f0bc..d7f2adee 100644 --- a/sf_tool_management/controllers/controllers.py +++ b/sf_tool_management/controllers/controllers.py @@ -8,31 +8,62 @@ from odoo.http import request class Manufacturing_Connect(http.Controller): - @http.route('/AutoDeviceApi/ToolGroup', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False, + @http.route('/AutoDeviceApi/ToolInventory', type='json', auth='none', methods=['GET', 'POST'], csrf=False, cors="*") - def get_functional_tool_groups_Info(self, **kw): + def get_functional_tool_inventory_Info(self, **kw): """ - 刀具组接口 + 功能刀具清单接口 :param kw: :return: """ - logging.info('get_functional_tool_groups_Info:%s' % kw) + logging.info('get_functional_tool_inventory_Info:%s' % kw) try: datas = request.httprequest.data ret = json.loads(datas) # ret = json.loads(ret['result']) logging.info('DeviceId:%s' % ret) - functional_tools = request.env['sf.tool.inventory'].sudo().search([]) + tool_inventory = request.env['sf.tool.inventory'].sudo().search([]) + + res = {'Succeed': True, 'Datas': []} + if tool_inventory: + for item in tool_inventory: + res['Datas'].append({ + 'ToolName': item.name, + 'GroupName': item.tool_groups_id.name, + 'Lifetime': item.life_span + }) + except Exception as e: + res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} + logging.info('get_functional_tool_inventory_Info error:%s' % e) + return json.JSONEncoder().encode(res) + + @http.route('/AutoDeviceApi/ToolEntity', type='json', auth='none', methods=['GET', 'POST'], csrf=False, + cors="*") + def get_functional_tool_entity_Info(self, **kw): + """ + 功能刀具列表接口 + :param kw: + :return: + """ + logging.info('get_functional_tool_entity_Info:%s' % kw) + try: + datas = request.httprequest.data + ret = json.loads(datas) + # ret = json.loads(ret['result']) + logging.info('DeviceId:%s' % ret) + functional_tools = request.env['sf.functional.cutting.tool.entity'].sudo().search([]) res = {'Succeed': True, 'Datas': []} if functional_tools: for item in functional_tools: res['Datas'].append({ + 'Rfid': item.rfid, + 'ToolName': item.tool_name_id.name, 'GroupName': item.tool_groups_id.name, - 'ToolId': item.functional_cutting_tool_model_id.name, - 'ToolName': item.name + 'MaxLifetime': item.max_lifetime_value, + 'KnifeHandle': item.cutting_tool_cutterhandle_model_id.name }) except Exception as e: res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} - logging.info('get_functional_tool_groups_Info error:%s' % e) + logging.info('get_functional_tool_entity_Info error:%s' % e) return json.JSONEncoder().encode(res)