From d03f10605563acc1995d2beedc13840e4a170a19 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 26 Jun 2025 09:07:12 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20batch=5Fgxerp=20=E6=B7=BB=E5=8A=A0need?= =?UTF-8?q?=5Finout=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/scripts/batch_gxerp.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/wpm/scripts/batch_gxerp.py b/apps/wpm/scripts/batch_gxerp.py index bffa7f28..31fa2538 100644 --- a/apps/wpm/scripts/batch_gxerp.py +++ b/apps/wpm/scripts/batch_gxerp.py @@ -21,7 +21,9 @@ def main(batch: str): mgroup_qs = Mgroup.objects.all().order_by("sort") for mgroup in mgroup_qs: mgroup_name = mgroup.name - mlogb1_qs = Mlogb.objects.filter(mlog__submit_time__isnull=False, material_out__isnull=False, mlog__mgroup=mgroup, mlog__is_fix=False, batch=batch) + mlogb1_qs = Mlogb.objects.filter(mlog__submit_time__isnull=False, + material_out__isnull=False, mlog__mgroup=mgroup, + mlog__is_fix=False, batch=batch, need_inout=True) if mlogb1_qs.exists(): data[f"{mgroup_name}_日期"] = [] data[f"{mgroup_name}_操作人"] = [] @@ -72,7 +74,10 @@ def main(batch: str): data[f"{mgroup_name}_操作人"] = ";".join([item.name for item in data[f"{mgroup_name}_操作人"]]) - mlogb2_qs = Mlogb.objects.filter(mlog__submit_time__isnull=False, material_out__isnull=False, mlog__mgroup__name="外观检验", mlog__is_fix=True, batch=batch) + mlogb2_qs = Mlogb.objects.filter(mlog__submit_time__isnull=False, + material_out__isnull=False, + mlog__mgroup__name="外观检验", + mlog__is_fix=True, batch=batch, need_inout=True) if mlogb2_qs.exists(): data["外观检验_返修_日期"] = [] data["外观检验_返修_操作人"] = []