diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py index dd86621b..8e6fe9b7 100644 --- a/sf_manufacturing/models/mrp_production.py +++ b/sf_manufacturing/models/mrp_production.py @@ -664,7 +664,7 @@ class MrpProduction(models.Model): # 表面工艺工序 # 模型类型的表面工艺工序模版 surface_tmpl_ids = model_type_id.surface_technics_routing_tmpl_ids - # 产品选择的表面工艺 + # 产品选择的表面工艺参数 model_process_parameters_ids = rec.product_id.model_process_parameters_ids process_dict = {} if model_process_parameters_ids: @@ -673,7 +673,7 @@ class MrpProduction(models.Model): for surface_tmpl_id in surface_tmpl_ids: if process_id == surface_tmpl_id.route_workcenter_id.surface_technics_id: surface_tmpl_name = surface_tmpl_id.route_workcenter_id.name - process_dict.update({int(process_id.category_id.code): '%s-%s' % ( + process_dict.update({int(process_id.code): '%s-%s' % ( surface_tmpl_name, process_parameters_id.name)}) process_list = sorted(process_dict.keys()) for process_num in process_list: @@ -693,8 +693,6 @@ class MrpProduction(models.Model): 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] logging.info(work_name) if sequence_list.get(work_name): work.sequence = sequence_list[work_name] @@ -728,8 +726,6 @@ 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_name: - work_name = work_name.split('-')[0] if panel_sequence_list.get(work_name): work_id.sequence = panel_sequence_list[work_name]