diff --git a/apps/wpm/services_2.py b/apps/wpm/services_2.py index d2a25062..66bfea14 100644 --- a/apps/wpm/services_2.py +++ b/apps/wpm/services_2.py @@ -272,7 +272,11 @@ def get_alldata_with_batch(batch: str): data[f'六车间_{mgroup_name}_日期'] = ";".join([item.strftime("%Y-%m-%d") for item in data[f'六车间_{mgroup_name}_日期']]) data[f'六车间_{mgroup_name}_操作人'] = list(set(data[f'六车间_{mgroup_name}_操作人'])) data[f'六车间_{mgroup_name}_操作人'] = ";".join([item.name for item in data[f'六车间_{mgroup_name}_操作人']]) - data[f'六车间_{mgroup_name}_合格率'] = round(data[f'六车间_{mgroup_name}_count_ok'] * 100/ data[f'六车间_{mgroup_name}_count_real'], 1) + try: + data[f'六车间_{mgroup_name}_合格率'] = round(data[f'六车间_{mgroup_name}_count_ok'] * 100/ data[f'六车间_{mgroup_name}_count_real'], 1) + except decimal.InvalidOperation: + myLogger.error(f"六车间_{mgroup_name}_合格率decimal.InvalidOperation-{data}") + data[f'六车间_{mgroup_name}_合格率'] = 0 # 六车间入库/检验数据 # mioitem6_qs2 = MIOItem.objects.filter(mio__belong_dept=dept6, mio__type="do_in",