1、返工优化
This commit is contained in:
@@ -1137,13 +1137,13 @@ class MrpProduction(models.Model):
|
||||
if self.programming_state in ['已编程']:
|
||||
cloud_programming = self._cron_get_programming_state()
|
||||
result_ids = self.detection_result_ids.filtered(lambda dr: dr.handle_result == '待处理')
|
||||
work_ids = []
|
||||
work_id_list = []
|
||||
if result_ids:
|
||||
for result_id in result_ids:
|
||||
work_ids.append(self.workorder_ids.filtered(
|
||||
lambda wk: (wk.name == result_id.routing_type
|
||||
and wk.processing_panel == result_id.processing_panel
|
||||
and wk.state == 'done')).id)
|
||||
work_id_list = [self.workorder_ids.filtered(
|
||||
lambda wk: (wk.name == result_id.routing_type and wk.processing_panel == result_id.processing_panel
|
||||
and wk.state == 'done')).id
|
||||
for result_id in result_ids]
|
||||
|
||||
return {
|
||||
'name': _('返工'),
|
||||
'type': 'ir.actions.act_window',
|
||||
@@ -1152,7 +1152,8 @@ class MrpProduction(models.Model):
|
||||
'target': 'new',
|
||||
'context': {
|
||||
'default_production_id': self.id,
|
||||
'default_workorder_ids': work_ids,
|
||||
'default_workorder_ids': self.workorder_ids.filtered(lambda wk: wk.state == 'done').ids,
|
||||
'default_hidden_workorder_ids': ','.join(map(str, work_id_list)) if work_id_list != [] else '',
|
||||
'default_reprogramming_num': cloud_programming['reprogramming_num'],
|
||||
'default_programming_state': cloud_programming['programming_state'],
|
||||
'default_is_reprogramming': True if cloud_programming['programming_state'] in ['已下发'] else False
|
||||
|
||||
Reference in New Issue
Block a user