From 45f9f27cbe98c82a95d1ab7fc8772cb3fae55c37 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 18 Dec 2025 10:13:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=89=E5=AD=90=E5=85=AD=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E6=89=B9=E6=AC=A1=E7=94=9F=E4=BA=A7=E5=90=88=E6=A0=BC?= =?UTF-8?q?=E7=8E=87=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/scripts/batch_gzerp.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/apps/wpm/scripts/batch_gzerp.py b/apps/wpm/scripts/batch_gzerp.py index 8e7a61b5..a6587e77 100644 --- a/apps/wpm/scripts/batch_gzerp.py +++ b/apps/wpm/scripts/batch_gzerp.py @@ -500,12 +500,14 @@ 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 data.get("六车间领料_count", 0) > 0: - data["六车间_批次生产合格率"] = round(data["销售发货_count"] * 100/ data["六车间领料_count"], 1) - if data.get("棒料成型_count_real", 0) > 0: - data["七车间_批次应出合格率"] = round(data["销售发货_count"] * 100/ data["棒料成型_count_real"], 1) - if data.get("管料成型_count_real", 0) > 0: - data["十车间_批次应出合格率"] = round(data["销售发货_count"] * 100/ data["管料成型_count_real"], 1) + + if data.get("六车间领料_count", 0) > 0 or data.get("六车间交接领料_count", 0) > 0: + data["六车间总领料_count"] = data.get("六车间领料_count", 0) + data.get("六车间交接领料_count", 0) + data["六车间_批次生产合格率"] = round((data.get("销售发货_count", 0) + data["六车间库存_count"]) * 100/ data["六车间总领料_count"], 1) + if data.get("棒料成型_count_real", 0) > 0: + data["七车间_批次应出合格率"] = round(data.get("销售发货_count", 0) * 100/ data["棒料成型_count_real"], 1) + if data.get("管料成型_count_real", 0) > 0: + data["十车间_批次应出合格率"] = round(data.get("销售发货_count", 0) * 100/ data["管料成型_count_real"], 1) res = get_f_l_date(data)