From d2b80ea42c185eff72f032e3cee26104ebdb9514 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Fri, 23 Feb 2024 10:32:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/controllers/controllers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py index 0be53879..d4f5a8da 100644 --- a/sf_manufacturing/controllers/controllers.py +++ b/sf_manufacturing/controllers/controllers.py @@ -157,11 +157,11 @@ class Manufacturing_Connect(http.Controller): if workorder.state != 'ready': res = {'Succeed': False, 'ErrorCode': 202, 'Error': '工单未就绪'} return json.JSONEncoder().encode(res) - work_equipment_id = request.env['maintenance.equipment'].sudo().search(['name', '=', equipment_id], limit=1) + 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 json.JSONEncoder().encode(res) - workorder.equipment_id = work_equipment_id + workorder.equipment_id = work_equipment_id.id workorder.button_start() except Exception as e: res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} From 7062289c894df1de9976ff27cb47d0d166feb424 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Fri, 23 Feb 2024 10:41:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=BC=80=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/controllers/controllers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py index d4f5a8da..4703f6f7 100644 --- a/sf_manufacturing/controllers/controllers.py +++ b/sf_manufacturing/controllers/controllers.py @@ -143,7 +143,7 @@ class Manufacturing_Connect(http.Controller): """ logging.info('button_Work_START:%s' % kw) try: - res = {'Succeed': True, 'Datas': []} + res = {'Succeed': True, 'Datas': ['工单已开始']} datas = request.httprequest.data ret = json.loads(datas) production_id = ret['BillId'] @@ -161,7 +161,7 @@ class Manufacturing_Connect(http.Controller): if not work_equipment_id: res = {'Succeed': False, 'ErrorCode': 202, 'Error': '没有找到该加工设备'} return json.JSONEncoder().encode(res) - workorder.equipment_id = work_equipment_id.id + workorder.equipment_id = work_equipment_id workorder.button_start() except Exception as e: res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} @@ -178,7 +178,7 @@ class Manufacturing_Connect(http.Controller): """ logging.info('button_Work_End:%s' % kw) try: - res = {'Succeed': True, 'Datas': []} + res = {'Succeed': True, 'Datas': ['工单已结束']} datas = request.httprequest.data ret = json.loads(datas) production_id = ret['BillId']