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 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=B7=A5=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): From 778896a6707fbe12b7427133a332bd88f6600dd1 Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Thu, 29 Aug 2024 17:52:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_workorder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index d6a5ea9f..c3842d30 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -1169,8 +1169,8 @@ class ResMrpWorkOrder(models.Model): if not record.rfid_code and record.is_rework is False: raise UserError("请扫RFID码进行绑定") if record.is_rework is False: - if not record.material_center_point or record.X_deviation_angle <= 0: - raise UserError("请对前置三元检测定位参数进行计算定位") + if not record.material_center_point and record.X_deviation_angle > 0: + raise UserError("坯料中心点为空或X偏差角度小于等于0") record.process_state = '待加工' # record.write({'process_state': '待加工'}) record.production_id.process_state = '待加工' From d2c5fdb50903e99325eb97e636193bd61b93359a Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Thu, 29 Aug 2024 18:18:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_production.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py index 83e4026a..dd86621b 100644 --- a/sf_manufacturing/models/mrp_production.py +++ b/sf_manufacturing/models/mrp_production.py @@ -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] From 1b710b205f247267bec7c3b40bc222c240a4115a Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Thu, 29 Aug 2024 19:23:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_production.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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]