diff --git a/quality_control/models/quality.py b/quality_control/models/quality.py index 9be466f5..f3a4315f 100644 --- a/quality_control/models/quality.py +++ b/quality_control/models/quality.py @@ -258,6 +258,23 @@ class QualityCheck(models.Model): line[field_name] = False self.column_nums = self.column_nums - 1 + def upload_measure_line(self): + """ + 上传测量值 + """ + + for record in self: + if not record.part_name or not record.part_number: + raise UserError(_('零件名称和零件图号均不能为空')) + + # 如果验证通过,返回原动作 + action = self.env.ref('quality_control.import_complex_model_wizard').read()[0] + action['context'] = { + 'default_model_name': 'quality.check.measure.line', + 'default_check_id': self.id, + } + return action + def do_preview(self): """ 预览出厂检验报告 diff --git a/quality_control/views/quality_views.xml b/quality_control/views/quality_views.xml index 528003e3..beed759e 100644 --- a/quality_control/views/quality_views.xml +++ b/quality_control/views/quality_views.xml @@ -334,11 +334,15 @@

diff --git a/quality_control/wizard/import_complex_model.py b/quality_control/wizard/import_complex_model.py index 84674138..1a7e7f59 100644 --- a/quality_control/wizard/import_complex_model.py +++ b/quality_control/wizard/import_complex_model.py @@ -161,6 +161,17 @@ class ImportComplexModelWizard(models.TransientModel): # 从第二行开始读取数据(跳过表头) max_columns = 1 + for row_index in range(1, sheet.nrows): + row = sheet.row_values(row_index) + # 检查行是否有数据 + if not any(row): + continue + + if row[2] == '': + continue + if row[1] != quality_check.part_number: + print(sheet.row_values(row_index)) + raise UserError(_('上传内容图号错误,请修改')) for row_index in range(1, sheet.nrows): row = sheet.row_values(row_index)