fix: batch_gxerp bug
This commit is contained in:
parent
356310db3f
commit
c50e4bf3a7
|
|
@ -35,7 +35,7 @@ def main(batch: str):
|
||||||
data[f"{mgroup_name}_count_ok_full"] += item.count_ok_full
|
data[f"{mgroup_name}_count_ok_full"] += item.count_ok_full
|
||||||
|
|
||||||
try:
|
try:
|
||||||
data[f"{mgroup_name}_合格率"] = round((data[f"{mgroup_name}-count_ok"] / data[f"{mgroup_name}-count_real"])*100, 2)
|
data[f"{mgroup_name}_合格率"] = round((data[f"{mgroup_name}_count_ok"] / data[f"{mgroup_name}_count_real"])*100, 2)
|
||||||
except decimal.InvalidOperation:
|
except decimal.InvalidOperation:
|
||||||
data[f"{mgroup_name}_合格率"] = 0
|
data[f"{mgroup_name}_合格率"] = 0
|
||||||
|
|
||||||
|
|
@ -43,7 +43,7 @@ def main(batch: str):
|
||||||
|
|
||||||
for item in mlogbd1_qs:
|
for item in mlogbd1_qs:
|
||||||
data[f"{mgroup_name}_缺陷_{item['defect__name']}"] = item["total"]
|
data[f"{mgroup_name}_缺陷_{item['defect__name']}"] = item["total"]
|
||||||
data[f"{mgroup_name}_缺陷_{item['defect__name']}-比例"] = round((item["total"] / data[f"{mgroup_name}-count_real"])*100, 2)
|
data[f"{mgroup_name}_缺陷_{item['defect__name']}_比例"] = round((item["total"] / data[f"{mgroup_name}_count_real"])*100, 2)
|
||||||
|
|
||||||
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}_日期"]])
|
||||||
|
|
@ -75,7 +75,7 @@ def main(batch: str):
|
||||||
|
|
||||||
for item in mlogbd2_qs:
|
for item in mlogbd2_qs:
|
||||||
data[f"外观检验_返修_缺陷_{item['defect__name']}"] = item["total"]
|
data[f"外观检验_返修_缺陷_{item['defect__name']}"] = item["total"]
|
||||||
data[f"外观检验_返修_缺陷_{item['defect__name']}-比例"] = round((item["total"] / data["外观检验_返修-count_real"])*100, 2)
|
data[f"外观检验_返修_缺陷_{item['defect__name']}_比例"] = round((item["total"] / data["外观检验_返修_count_real"])*100, 2)
|
||||||
|
|
||||||
if "外观检验_count_ok" in data:
|
if "外观检验_count_ok" in data:
|
||||||
data["外观检验_总合格数"] = data["外观检验_count_ok"] + data["外观检验_返修_count_ok"] if "外观检验_返修_count_ok" in data else 0
|
data["外观检验_总合格数"] = data["外观检验_count_ok"] + data["外观检验_返修_count_ok"] if "外观检验_返修_count_ok" in data else 0
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue