From fc2588140bd47c4eb9619fc3c715ef6e430c49ca Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Thu, 22 Feb 2024 18:22:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=92=8C=E5=B7=A5=E4=BB=B6=E9=A2=84=E8=B0=83?= =?UTF-8?q?=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 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py index 65d116e4..222ff983 100644 --- a/sf_manufacturing/controllers/controllers.py +++ b/sf_manufacturing/controllers/controllers.py @@ -60,11 +60,13 @@ class Manufacturing_Connect(http.Controller): datas = request.httprequest.data ret = json.loads(datas) if 'ProductionLine' in ret: - workorder = request.env['mrp.workorder'].sudo().get_plan_workorder(ret['ProductionLine']) + workorder_ids = request.env['mrp.workorder'].sudo().get_plan_workorder(ret['ProductionLine']) else: ProductionLine = False - workorder = request.env['mrp.workorder'].sudo().get_plan_workorder(ProductionLine) + workorder_ids = request.env['mrp.workorder'].sudo().get_plan_workorder(ProductionLine) logging.info('RfidCode:%s' % ret) + logging.info('workorder_ids:%s' % workorder_ids) + workorder = request.env['mrp.workorder'].sudo().search(workorder_ids) if workorder: for item in workorder: date_planned_start = '' @@ -119,7 +121,8 @@ class Manufacturing_Connect(http.Controller): 'XOffset': 0 if not item.material_center_point else offset[0], 'YOffset': 0 if not item.material_center_point else offset[1], 'ZOffet': 0 if not item.material_center_point else offset[2], - 'COffset': 'G54' if not item.X_deviation_angle else item.X_deviation_angle + 'COffset': 0 if not item.X_deviation_angle else item.X_deviation_angle, + 'Coordinate': 'G54' }) else: res = {'Succeed': False, 'ErrorCode': 203, 'Error': '该rfid暂未有对应的工件预调(前置三元检测)工单'}