diff --git a/apps/wpm/services_2.py b/apps/wpm/services_2.py index 0a983d97..c2c9c447 100644 --- a/apps/wpm/services_2.py +++ b/apps/wpm/services_2.py @@ -35,7 +35,7 @@ def get_alldata_with_batch(batch: str): mlog_count_fields = Mlog.count_fields() data["产品规格"] = [] - + if mlogs_blcx_qs.exists(): data["产品规格"] = [] data["棒料成型_出料人"] = [] @@ -163,7 +163,7 @@ def get_alldata_with_batch(batch: str): if item.handle_date: data["管料退火_日期"].append(item.handle_date) if item.handle_user: - data["管料退火_操作人"].append(item.mlog_user) + data["管料退火_操作人"].append(item.handle_user) for field in mlog_count_fields: if getattr(item, field) > 0 or field in ["count", "count_notok"]: if f'管料退火_{field}' not in data: