feat: 光芯批次统计增加班次返回
This commit is contained in:
parent
872e59ffe1
commit
c4539260a8
|
@ -29,6 +29,7 @@ def main(batch: str, mgroup_obj):
|
||||||
if mlogb1_qs.exists():
|
if mlogb1_qs.exists():
|
||||||
data[f"{mgroup_name}_日期"] = []
|
data[f"{mgroup_name}_日期"] = []
|
||||||
data[f"{mgroup_name}_操作人"] = []
|
data[f"{mgroup_name}_操作人"] = []
|
||||||
|
data[f"{mgroup_name}_班次"] = []
|
||||||
data[f"{mgroup_name}_count_use"] = 0
|
data[f"{mgroup_name}_count_use"] = 0
|
||||||
data[f"{mgroup_name}_count_real"] = 0
|
data[f"{mgroup_name}_count_real"] = 0
|
||||||
data[f"{mgroup_name}_count_ok"] = 0
|
data[f"{mgroup_name}_count_ok"] = 0
|
||||||
|
@ -47,6 +48,8 @@ def main(batch: str, mgroup_obj):
|
||||||
data[f"{mgroup_name}_操作人"].append(item.mlog.handle_user)
|
data[f"{mgroup_name}_操作人"].append(item.mlog.handle_user)
|
||||||
if item.mlog.handle_date:
|
if item.mlog.handle_date:
|
||||||
data[f"{mgroup_name}_日期"].append(item.mlog.handle_date)
|
data[f"{mgroup_name}_日期"].append(item.mlog.handle_date)
|
||||||
|
if item.mlog.shift:
|
||||||
|
data[f"{mgroup_name}_班次"].append(item.mlog.shift.name)
|
||||||
data[f"{mgroup_name}_count_real"] += item.count_real
|
data[f"{mgroup_name}_count_real"] += item.count_real
|
||||||
data[f"{mgroup_name}_count_ok"] += item.count_ok
|
data[f"{mgroup_name}_count_ok"] += item.count_ok
|
||||||
data[f"{mgroup_name}_count_ok_full"] += item.count_ok_full if item.count_ok_full else 0
|
data[f"{mgroup_name}_count_ok_full"] += item.count_ok_full if item.count_ok_full else 0
|
||||||
|
@ -80,6 +83,8 @@ def main(batch: str, mgroup_obj):
|
||||||
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}_班次"] = list(set(data[f"{mgroup_name}_班次"]))
|
||||||
|
data[f"{mgroup_name}_班次"] = ";".join([item for item in data[f"{mgroup_name}_班次"]])
|
||||||
|
|
||||||
|
|
||||||
mlogb2_qs = Mlogb.objects.filter(mlog__submit_time__isnull=False,
|
mlogb2_qs = Mlogb.objects.filter(mlog__submit_time__isnull=False,
|
||||||
|
|
Loading…
Reference in New Issue