优化工单工序排序方法
This commit is contained in:
@@ -692,12 +692,15 @@ class MrpProduction(models.Model):
|
|||||||
raise ValidationError('该产品没有选择【模版类型】!')
|
raise ValidationError('该产品没有选择【模版类型】!')
|
||||||
|
|
||||||
for work in rec.workorder_ids:
|
for work in rec.workorder_ids:
|
||||||
if sequence_list.get(work.name):
|
work_name = work.name
|
||||||
work.sequence = sequence_list[work.name]
|
if '-' in work.name:
|
||||||
|
work_name = work.name.split('-')[0]
|
||||||
|
if sequence_list.get(work_name):
|
||||||
|
work.sequence = sequence_list[work_name]
|
||||||
elif sequence_list.get(work.processing_panel):
|
elif sequence_list.get(work.processing_panel):
|
||||||
processing_panel = sequence_list.get(work.processing_panel)
|
processing_panel = sequence_list.get(work.processing_panel)
|
||||||
if processing_panel.get(work.name):
|
if processing_panel.get(work_name):
|
||||||
work.sequence = processing_panel[work.name]
|
work.sequence = processing_panel[work_name]
|
||||||
else:
|
else:
|
||||||
raise ValidationError('工序【%s】在产品选择的模版类型中不存在!' % work.name)
|
raise ValidationError('工序【%s】在产品选择的模版类型中不存在!' % work.name)
|
||||||
else:
|
else:
|
||||||
@@ -723,8 +726,11 @@ class MrpProduction(models.Model):
|
|||||||
sequence_max += 1
|
sequence_max += 1
|
||||||
panel_sequence_list.update({tmpl_id.route_workcenter_id.name: sequence_max})
|
panel_sequence_list.update({tmpl_id.route_workcenter_id.name: sequence_max})
|
||||||
for work_id in work_ids:
|
for work_id in work_ids:
|
||||||
if panel_sequence_list.get(work_id.name):
|
work_name = work_id.name
|
||||||
work_id.sequence = panel_sequence_list[work_id.name]
|
if '-' in work_id.name:
|
||||||
|
work_name = work_id.name.split('-')[0]
|
||||||
|
if panel_sequence_list.get(work_name):
|
||||||
|
work_id.sequence = panel_sequence_list[work_name]
|
||||||
|
|
||||||
# 创建工单并进行排序
|
# 创建工单并进行排序
|
||||||
def _create_workorder(self, item):
|
def _create_workorder(self, item):
|
||||||
|
|||||||
Reference in New Issue
Block a user