From 33a7e7320b8230d409fccc949141e1951fd29f74 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 21 Aug 2024 14:12:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20daoru=5Fmaterial=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/mtm/services.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/mtm/services.py b/apps/mtm/services.py index 06cac779..b8d483a6 100644 --- a/apps/mtm/services.py +++ b/apps/mtm/services.py @@ -73,17 +73,17 @@ def daoru_material(path: str): type_str = sheet[f'b{i}'].value.replace(' ', '') try: type = type_dict[type_str] - number = sheet[f'a{i}'].value.replace(' ', '') if sheet[f'a{i}'].value else None + number = str(sheet[f'a{i}'].value).replace(' ', '') if sheet[f'a{i}'].value else None if sheet[f'c{i}'].value: - name = sheet[f'c{i}'].value.replace(' ', '') + name = str(sheet[f'c{i}'].value).replace(' ', '') else: raise ParseError(f'{i}行物料信息错误: 物料名称必填') - specification = sheet[f'd{i}'].value.replace( + specification = str(sheet[f'd{i}'].value).replace( '×', '*').replace(' ', '') if sheet[f'd{i}'].value else None - model = sheet[f'e{i}'].value.replace(' ', '') if sheet[f'e{i}'].value else None + model = str(sheet[f'e{i}'].value).replace(' ', '') if sheet[f'e{i}'].value else None unit = sheet[f'f{i}'].value.replace(' ', '') - count_safe = sheet[f'h{i}'].value - unit_price = sheet[f'i{i}'].value + count_safe = float(sheet[f'h{i}'].value) if sheet[f'h{i}'].value else None + unit_price = float(sheet[f'i{i}'].value) if sheet[f'i{i}'].value else None except Exception as e: raise ParseError(f'{i}行物料信息错误: {e}') if type in [20, 30]: