From 3c931040cf0b884bce56a950ae2df2387296a752 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 14 Apr 2026 14:16:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20batch=5Fbxerp=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=90=E5=B7=A5=E5=BA=8F=E6=93=8D=E4=BD=9C=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/scripts/batch_bxerp.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/apps/wpm/scripts/batch_bxerp.py b/apps/wpm/scripts/batch_bxerp.py index 1395389a..cf1e351c 100644 --- a/apps/wpm/scripts/batch_bxerp.py +++ b/apps/wpm/scripts/batch_bxerp.py @@ -1,6 +1,6 @@ from apps.wpm.models import BatchSt import logging -from apps.wpm.models import Mlogb, Mlogbw, MlogbDefect +from apps.wpm.models import Mlogb, Mlogbw, MlogbDefect, MlogUser from apps.mtm.models import Mgroup import decimal from django.db.models import Sum @@ -27,7 +27,7 @@ def main(batch: str, mgroup_obj:Mgroup=None): 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, need_inout=True) + mlog__is_fix=False, batch=batch, need_inout=True).order_by("mlog__submit_time") if mlogb1_qs.exists(): data[f"{mgroup_name}_日期"] = [] data[f"{mgroup_name}_操作人"] = [] @@ -38,6 +38,7 @@ def main(batch: str, mgroup_obj:Mgroup=None): data[f"{mgroup_name}_count_ok_full"] = 0 data[f"{mgroup_name}_count_pn_jgqbl"] = 0 mlogb_q_ids = [] + cal_mlog = [] for item in mlogb1_qs: # 找到对应的输入 mlogb_from:Mlogb = item.mlogb_from @@ -51,6 +52,13 @@ def main(batch: str, mgroup_obj:Mgroup=None): data[f"{mgroup_name}_count_pn_jgqbl"] += 0 if item.mlog.handle_user: data[f"{mgroup_name}_操作人"].append(item.mlog.handle_user) + # 子工序操作人 + if item.mlog not in cal_mlog: + mlog_users_qs = MlogUser.objects.filter(mlog=item.mlog) + if mlog_users_qs.exists(): + for mlog_user in mlog_users_qs: + data[f"{mgroup_name}_{mlog_user.process.name}_操作人"] = mlog_user.handle_user.name + cal_mlog.append(item.mlog) if item.mlog.handle_date: data[f"{mgroup_name}_日期"].append(item.mlog.handle_date) data[f"{mgroup_name}_count_real"] += item.count_real