diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py index 33c1bb07..707b391d 100644 --- a/sf_manufacturing/controllers/controllers.py +++ b/sf_manufacturing/controllers/controllers.py @@ -445,7 +445,7 @@ class Manufacturing_Connect(http.Controller): ('production_id', '=', wd.production_id.id)]) if next_workpiece: logging.info('next_workpiece:%s' % next_workpiece.delivery_num) - next_workpiece.write({'status': '待下发'}) + next_workpiece.write({'status': '待下发', 'task_delivery_time': datetime.now()}) else: res = {'Succeed': False, 'ErrorCode': 203, 'Error': '该DeviceId没有对应的已配送工件数据'} else: @@ -497,10 +497,11 @@ class Manufacturing_Connect(http.Controller): ('production_id', '=', wd.production_id.id)]) if next_workpiece: logging.info('next_workpiece:%s' % next_workpiece.delivery_num) - next_workpiece.write({'status': '待下发'}) + next_workpiece.write({'status': '待下发', 'task_delivery_time': datetime.now()}) if delivery_Arr: logging.info('delivery_Arr:%s' % delivery_Arr) - delivery_workpiece = request.env['sf.workpiece.delivery'].sudo().search([('id','in',delivery_Arr)]) + delivery_workpiece = request.env['sf.workpiece.delivery'].sudo().search( + [('id', 'in', delivery_Arr)]) if delivery_workpiece: logging.info('开始向agv下发下产线任务') delivery_workpiece._delivery_avg() diff --git a/sf_manufacturing/controllers/workpiece.py b/sf_manufacturing/controllers/workpiece.py index d8cbabac..820e0002 100644 --- a/sf_manufacturing/controllers/workpiece.py +++ b/sf_manufacturing/controllers/workpiece.py @@ -31,7 +31,7 @@ class Workpiece(http.Controller): [('production_id.name', '=', req_code.rsplit('-', 1)[0]), ('delivery_num', '=', req_code.strip())]) if workpiece_delivery: - workpiece_delivery.write({'status': '已配送', 'task_completion_time': ret['reqTime']}) + workpiece_delivery.write({'status': '已配送', 'task_completion_time': datetime.now()}) else: res = {'Succeed': False, 'ErrorCode': 203, 'Error': '该reqCode暂未查到对应的工件配送记录'} diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index cd1ffab5..7ad53612 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -1128,8 +1128,8 @@ class WorkPieceDelivery(models.Model): is_not_route += 1 else: raise UserError('请选择【任务路线】再进行配送') - if production_type != item.type: - raise UserError('请选择类型为【上产线】的制造订单进行配送') + # if production_type != item.type: + # raise UserError('请选择类型为【上产线】的制造订单进行配送') if down_status != item.status: raise UserError('请选择状态为【待下发】的制造订单进行配送') if same_production_line_id is None: