From e885d7b372ff99c5ac00a7f9eab6ea13988ea478 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Fri, 23 Feb 2024 10:13:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=A7=8B=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/controllers/controllers.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py index e253f4b0..0be53879 100644 --- a/sf_manufacturing/controllers/controllers.py +++ b/sf_manufacturing/controllers/controllers.py @@ -153,14 +153,14 @@ class Manufacturing_Connect(http.Controller): [('production_id', '=', production_id), ('routing_type', '=', routing_type)], limit=1) if not workorder: res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单不存在'} - return res + return json.JSONEncoder().encode(res) if workorder.state != 'ready': res = {'Succeed': False, 'ErrorCode': 202, 'Error': '工单未就绪'} - return res + return json.JSONEncoder().encode(res) work_equipment_id = request.env['maintenance.equipment'].sudo().search(['name', '=', equipment_id], limit=1) if not work_equipment_id: res = {'Succeed': False, 'ErrorCode': 202, 'Error': '没有找到该加工设备'} - return res + return json.JSONEncoder().encode(res) workorder.equipment_id = work_equipment_id workorder.button_start() except Exception as e: @@ -190,7 +190,7 @@ class Manufacturing_Connect(http.Controller): return json.JSONEncoder().encode(res) if workorder.state != 'progress': res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单未开始'} - return res + return json.JSONEncoder().encode(res) workorder.button_finish() except Exception as e: res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}