From 0a129275187f80b13e04b020d0a1e485d89882a5 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 8 Sep 2025 15:18:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20batch=20bxerp=E5=90=AB=E7=BC=BA?= =?UTF-8?q?=E9=99=B7=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/scripts/batch_bxerp.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/wpm/scripts/batch_bxerp.py b/apps/wpm/scripts/batch_bxerp.py index d16dc40a..1395389a 100644 --- a/apps/wpm/scripts/batch_bxerp.py +++ b/apps/wpm/scripts/batch_bxerp.py @@ -69,6 +69,7 @@ def main(batch: str, mgroup_obj:Mgroup=None): data[f"{mgroup_name}_合格率"] = 0 mlogbd1_qs = MlogbDefect.objects.filter(mlogb__in=mlogb1_qs, count__gt=0).values("defect__name").annotate(total=Sum("count")) + mlogbd1_qs_x = MlogbDefect.objects.filter(mlogb__in=mlogb1_qs, count_has__gt=0).values("defect__name").annotate(total=Sum("count_has")) mlogbd1_q_qs = MlogbDefect.objects.filter(mlogb__id__in=mlogb_q_ids, count__gt=0).values("defect__name").annotate(total=Sum("count")) for item in mlogbd1_q_qs: @@ -79,6 +80,10 @@ def main(batch: str, mgroup_obj:Mgroup=None): 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) + for item in mlogbd1_qs_x: + 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}_日期"] = list(set(data[f"{mgroup_name}_日期"])) data[f"{mgroup_name}_小日期"] = max(data[f"{mgroup_name}_日期"]).strftime("%Y-%m-%d") data[f"{mgroup_name}_大日期"] = min(data[f"{mgroup_name}_日期"]).strftime("%Y-%m-%d")