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

修改创建调度任务逻辑，不匹配的路线返回错误信息

Browse Source
This commit is contained in:
胡尧
2024-08-16 16:49:30 +08:00
parent c4de966dea
commit a6b7167f3b
2 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sf_manufacturing/controllers/controllers.py
View File

@@ -489,24 +489,9 @@ class Manufacturing_Connect(http.Controller):
res = {'Succeed': False, 'ErrorCode': 204,
'Error': 'DeviceId为%s没有对应的已配送工件数据' % ret['DeviceId']}
if ret['IsComplete'] is True:
# 将RFID_CODE对应的工件配送单对应的AGV任务调度状态设置为已配送
# workorder_id = request.env['mrp.workorder'].sudo().search([
# ('rfid_code', 'in', rfid_codes),
# ('routing_type', '=', '装夹预调'), ('state', '!=', 'rework')
# ])
# workorder_id.agv_scheduling_ids.finish_scheduling()
# 将工件配送单状态设置为已配送
request.env['sf.workpiece.delivery'].sudo().search([
('rfid_code', 'in', rfid_codes),
('type', '=', '上产线'),
('status', '=', '已下发')
]).write({'state': '已配送'})
# 向AGV任务调度下发运送空料架任务
# 获取设备ID对应的接驳站配置
agv_site = request.env['sf.agv.site'].sudo().search(
[('name', '=', ret['DeviceId'])], limit=1)
workorders = request.env['mrp.workorder'].browse(workorder_ids)
request.env['sf.agv.scheduling'].add_scheduling(agv_site.id, '运送空料架', workorders)
request.env['sf.agv.scheduling'].add_scheduling(ret['DeviceId'], '运送空料架', workorders)
else:
res = {'Succeed': False, 'ErrorCode': 203, 'Error': '未传IsComplete字段'}
else:
@@ -591,17 +576,14 @@ class Manufacturing_Connect(http.Controller):
# logging.info('agv下发下产线任务下发完成')
if ret['IsComplete'] is True:
# 向AGV任务调度下发下产线任务
# 获取设备ID对应的接驳站配置
agv_site = request.env['sf.agv.site'].sudo().search(
[('name', '=', ret['DeviceId'])], limit=1)
workorders = request.env['mrp.workorder'].browse(workorder_ids)
request.env['sf.agv.scheduling'].add_scheduling(agv_site.id, '下产线', workorders)
request.env['sf.agv.scheduling'].add_scheduling(ret['DeviceId'], '下产线', workorders)
else:
res = {'Succeed': False, 'ErrorCode': 203, 'Error': '未传IsComplete字段'}
except RepeatTaskException as e:
logging.info('AGVToProduct error:%s' % e)
except Exception as e:
res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
res = {'Succeed': False, 'ErrorCode': 202, 'Error': str(e)}
logging.info('AGVDownProduct error:%s' % e)
return json.JSONEncoder().encode(res)