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暂未有对应的工件预调(前置三元检测)工单'}