From 67be71435571ab41d0ee0a7bf58214c4654d7ba7 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 3 Dec 2024 11:41:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84get=5Falldata=5Fwith?= =?UTF-8?q?=5Fbatch=20-=E6=94=B9=5F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/services_2.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/wpm/services_2.py b/apps/wpm/services_2.py index c4eb78ff..1adbd10a 100644 --- a/apps/wpm/services_2.py +++ b/apps/wpm/services_2.py @@ -195,24 +195,24 @@ def get_alldata_with_batch(batch: str): mlogs_qs = Mlog.objects.filter(submit_time__isnull=False, mgroup=mgroup, batch=batch) if mlogs_qs.exists(): last_time = item.update_time if item.update_time > last_time else last_time - data[f'六车间_{mgroup_name}-日期'] = [] - data[f'六车间_{mgroup_name}-操作人'] = [] + data[f'六车间_{mgroup_name}_日期'] = [] + data[f'六车间_{mgroup_name}_操作人'] = [] for item in mlogs_qs: if item.handle_date: - data[f'六车间_{mgroup_name}-日期'].append(item.handle_date) + data[f'六车间_{mgroup_name}_日期'].append(item.handle_date) if item.handle_user: - data[f'六车间_{mgroup_name}-操作人'].append(item.handle_user) + data[f'六车间_{mgroup_name}_操作人'].append(item.handle_user) for field in mlog_count_fields: if getattr(item, field) > 0 or field in ["count_ok", "count_real"]: - if f'六车间_{mgroup_name}-{field}' not in data: - data[f'六车间_{mgroup_name}-{field}'] = getattr(item, field) + if f'六车间_{mgroup_name}_{field}' not in data: + data[f'六车间_{mgroup_name}_{field}'] = getattr(item, field) else: - data[f'六车间_{mgroup_name}-{field}'] += getattr(item, field) - data[f'六车间_{mgroup_name}-日期'] = list(set(data[f'六车间_{mgroup_name}-日期'])) - 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) + data[f'六车间_{mgroup_name}_{field}'] += getattr(item, field) + data[f'六车间_{mgroup_name}_日期'] = list(set(data[f'六车间_{mgroup_name}_日期'])) + 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) # 六车间入库/检验数据 # mioitem6_qs2 = MIOItem.objects.filter(mio__belong_dept=dept6, mio__type="do_in",