From ea94d746576f1d748a43633189a86c386ace3f68 Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Thu, 29 Aug 2024 17:30:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E5=8D=95=E5=B7=A5?= =?UTF-8?q?=E5=BA=8F=E6=8E=92=E5=BA=8F=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_production.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py index c67fd105..22903e80 100644 --- a/sf_manufacturing/models/mrp_production.py +++ b/sf_manufacturing/models/mrp_production.py @@ -692,12 +692,15 @@ class MrpProduction(models.Model): raise ValidationError('该产品没有选择【模版类型】!') for work in rec.workorder_ids: - if sequence_list.get(work.name): - work.sequence = sequence_list[work.name] + work_name = 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): processing_panel = sequence_list.get(work.processing_panel) - if processing_panel.get(work.name): - work.sequence = processing_panel[work.name] + if processing_panel.get(work_name): + work.sequence = processing_panel[work_name] else: raise ValidationError('工序【%s】在产品选择的模版类型中不存在!' % work.name) else: @@ -723,8 +726,11 @@ class MrpProduction(models.Model): sequence_max += 1 panel_sequence_list.update({tmpl_id.route_workcenter_id.name: sequence_max}) for work_id in work_ids: - if panel_sequence_list.get(work_id.name): - work_id.sequence = panel_sequence_list[work_id.name] + work_name = 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):