From 6b7f1aedbeed75aa4ff360847b547369d35d0db2 Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Tue, 22 Apr 2025 11:50:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=82=E9=85=8D=E9=9B=B6?= =?UTF-8?q?=E4=BB=B6=E5=9B=BE=E5=8F=B7=E4=B8=BA=E6=95=B0=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- quality_control/wizard/import_complex_model.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/quality_control/wizard/import_complex_model.py b/quality_control/wizard/import_complex_model.py index 1a7e7f59..3925c4f2 100644 --- a/quality_control/wizard/import_complex_model.py +++ b/quality_control/wizard/import_complex_model.py @@ -97,7 +97,7 @@ class ImportComplexModelWizard(models.TransientModel): """导入Excel数据""" if not self.file_data: raise UserError(_('请先上传Excel文件')) - + if self.check_id.measure_line_ids: self.sudo().check_id.measure_line_ids.unlink() @@ -169,7 +169,12 @@ class ImportComplexModelWizard(models.TransientModel): if row[2] == '': continue - if row[1] != quality_check.part_number: + logging.info('================%s, %s==' % (row[1], type(row[1]))) + + compare_value = row[1] + if type(compare_value) == float: + compare_value = str(int(compare_value)) + if compare_value != quality_check.part_number: print(sheet.row_values(row_index)) raise UserError(_('上传内容图号错误，请修改')) for row_index in range(1, sheet.nrows): @@ -205,7 +210,7 @@ class ImportComplexModelWizard(models.TransientModel): self.env['quality.check.measure.line'].create(measure_line_vals) valid_data_imported = True - + quality_check.column_nums = max_columns # 检查是否有有效数据被导入 @@ -435,7 +440,8 @@ class ImportComplexModelWizard(models.TransientModel): # ) def download_excel_template(self): - base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url') + '/quality_control/static/src/binary/出厂检验报告上传模版.xlsx' + base_url = self.env['ir.config_parameter'].sudo().get_param( + 'web.base.url') + '/quality_control/static/src/binary/出厂检验报告上传模版.xlsx' # 只有当原始 URL 使用 http 时才替换为 https if base_url.startswith("http://"):