zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 完善get_alldata_with_batch -改_

This commit is contained in:
caoqianming 2024-12-03 11:41:23 +08:00
parent 91bc99a135
commit 67be714355
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
apps/wpm/services_2.py
View File

@ -195,24 +195,24 @@ def get_alldata_with_batch(batch: str):
mlogs_qs = Mlog.objects.filter(submit_time__isnull=False, mgroup=mgroup, batch=batch) mlogs_qs = Mlog.objects.filter(submit_time__isnull=False, mgroup=mgroup, batch=batch)
if mlogs_qs.exists(): if mlogs_qs.exists():
last_time = item.update_time if item.update_time > last_time else last_time 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: for item in mlogs_qs:
if item.handle_date: if item.handle_date:
data[f'六车间_{mgroup_name}-日期'].append(item.handle_date) data[f'六车间_{mgroup_name}_日期'].append(item.handle_date)
if item.handle_user: 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: for field in mlog_count_fields:
if getattr(item, field) > 0 or field in ["count_ok", "count_real"]: if getattr(item, field) > 0 or field in ["count_ok", "count_real"]:
if f'六车间_{mgroup_name}-{field}' not in data: if f'六车间_{mgroup_name}_{field}' not in data:
data[f'六车间_{mgroup_name}-{field}'] = getattr(item, field) data[f'六车间_{mgroup_name}_{field}'] = getattr(item, field)
else: else:
data[f'六车间_{mgroup_name}-{field}'] += getattr(item, field) data[f'六车间_{mgroup_name}_{field}'] += getattr(item, field)
data[f'六车间_{mgroup_name}-日期'] = list(set(data[f'六车间_{mgroup_name}-日期'])) 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}_日期'] = ";".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}_操作人'] = list(set(data[f'六车间_{mgroup_name}_操作人']))
data[f'六车间_{mgroup_name}-操作人'] = ";".join([item.name for item in 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}_合格率'] = 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", # mioitem6_qs2 = MIOItem.objects.filter(mio__belong_dept=dept6, mio__type="do_in",