Accept Merge Request #1272: (feature/工单优化_1 -> develop)
Merge Request: 优化工单 Created By: @禹翔辉 Reviewed By: @马广威 Approved By: @马广威 Accepted By: @禹翔辉 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1272
This commit is contained in:
@@ -690,11 +690,12 @@ class MrpProduction(models.Model):
|
||||
raise ValidationError('该产品【加工面板】为空!')
|
||||
else:
|
||||
raise ValidationError('该产品没有选择【模版类型】!')
|
||||
|
||||
logging.info('sequence_list: %s' % sequence_list)
|
||||
for work in rec.workorder_ids:
|
||||
work_name = work.name
|
||||
if '-' in work.name:
|
||||
work_name = work.name.split('-')[0]
|
||||
if '-' in work_name:
|
||||
work_name = work_name.split('-')[0]
|
||||
logging.info(work_name)
|
||||
if sequence_list.get(work_name):
|
||||
work.sequence = sequence_list[work_name]
|
||||
elif sequence_list.get(work.processing_panel):
|
||||
@@ -727,8 +728,8 @@ class MrpProduction(models.Model):
|
||||
panel_sequence_list.update({tmpl_id.route_workcenter_id.name: sequence_max})
|
||||
for work_id in work_ids:
|
||||
work_name = work_id.name
|
||||
if '-' in work_id.name:
|
||||
work_name = work_id.name.split('-')[0]
|
||||
if '-' in work_name:
|
||||
work_name = work_name.split('-')[0]
|
||||
if panel_sequence_list.get(work_name):
|
||||
work_id.sequence = panel_sequence_list[work_name]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user