From d130f7507667a8effc497946e29fe496a325dfa7 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 5 Aug 2025 16:01:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=89=E5=AD=90=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=A2=9E=E5=8A=A0=E7=BB=84=E5=90=88=E4=BB=B6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/scripts/batch_gzerp.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/apps/wpm/scripts/batch_gzerp.py b/apps/wpm/scripts/batch_gzerp.py index 6a3693ed..8b07f37a 100644 --- a/apps/wpm/scripts/batch_gzerp.py +++ b/apps/wpm/scripts/batch_gzerp.py @@ -486,11 +486,6 @@ def main(batch: str, mgroup_obj=None): if "销售发货_日期" in data: - if getattr(data, "棒料成型_count_real", 0) > 0: - data["七车间_批次发货合格率"] = round(data["销售发货_count"] * 100/ data["棒料成型_count_real"], 1) - if getattr(data, "六车间领料_count", 0) > 0: - data["六车间_批次发货合格率"] = round(data["销售发货_count"] * 100/ data["六车间领料_count"], 1) - data['销售发货_仓库执行人'] = list(set(data['销售发货_仓库执行人'])) data['销售发货_仓库执行人'] = ";".join([item.name for item in data['销售发货_仓库执行人']]) data["销售发货_日期"] = list(set(data["销售发货_日期"])) @@ -498,9 +493,9 @@ def main(batch: str, mgroup_obj=None): data["销售发货_小日期"] = max(data["销售发货_日期"]).strftime("%Y-%m-%d") data["销售发货_大日期"] = min(data["销售发货_日期"]).strftime("%Y-%m-%d") data["销售发货_日期"] = ";".join([item.strftime("%Y-%m-%d") for item in data["销售发货_日期"]]) - if getattr(data, "六车间领料_count", 0) > 0: + if data.get("六车间领料_count", 0) > 0: data["六车间_批次生产合格率"] = round(data["销售发货_count"] * 100/ data["六车间领料_count"], 1) - if getattr(data, "棒料成型_count_real", 0) > 0: + if data.get("棒料成型_count_real", 0) > 0: data["七车间_批次应出合格率"] = round(data["销售发货_count"] * 100/ data["棒料成型_count_real"], 1) res = get_f_l_date(data)