jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/修复日计划工单和工件预调接口' into develop

Browse Source
This commit is contained in:
jinling.yang
2024-02-22 18:24:54 +08:00
parent e619e6660e 4d745b48cf
commit 87cda7e641
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sf_manufacturing/controllers/controllers.py
View File

@@ -60,11 +60,13 @@ class Manufacturing_Connect(http.Controller):
datas = request.httprequest.data datas = request.httprequest.data
ret = json.loads(datas) ret = json.loads(datas)
if 'ProductionLine' in ret: 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: else:
ProductionLine = False 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('RfidCode:%s' % ret)
logging.info('workorder_ids:%s' % workorder_ids)
workorder = request.env['mrp.workorder'].sudo().search(workorder_ids)
if workorder: if workorder:
for item in workorder: for item in workorder:
date_planned_start = '' date_planned_start = ''
@@ -119,7 +121,8 @@ class Manufacturing_Connect(http.Controller):
'XOffset': 0 if not item.material_center_point else offset[0], 'XOffset': 0 if not item.material_center_point else offset[0],
'YOffset': 0 if not item.material_center_point else offset[1], 'YOffset': 0 if not item.material_center_point else offset[1],
'ZOffet': 0 if not item.material_center_point else offset[2], '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: else:
res = {'Succeed': False, 'ErrorCode': 203, 'Error': '该rfid暂未有对应的工件预调(前置三元检测)工单'} res = {'Succeed': False, 'ErrorCode': 203, 'Error': '该rfid暂未有对应的工件预调(前置三元检测)工单'}