From c4539260a80e57fb71eed3ddf8e44da7cd7acdcf Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 2 Sep 2025 16:45:40 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=89=E8=8A=AF=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=A2=9E=E5=8A=A0=E7=8F=AD=E6=AC=A1=E8=BF=94?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/scripts/batch_gxerp.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/wpm/scripts/batch_gxerp.py b/apps/wpm/scripts/batch_gxerp.py index 11f8d633..8758d880 100644 --- a/apps/wpm/scripts/batch_gxerp.py +++ b/apps/wpm/scripts/batch_gxerp.py @@ -29,6 +29,7 @@ def main(batch: str, mgroup_obj): if mlogb1_qs.exists(): data[f"{mgroup_name}_日期"] = [] data[f"{mgroup_name}_操作人"] = [] + data[f"{mgroup_name}_班次"] = [] data[f"{mgroup_name}_count_use"] = 0 data[f"{mgroup_name}_count_real"] = 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) if 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_ok"] += item.count_ok 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}_操作人"] = list(set(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,