From 68b70476ba8f2637e1ac86f80ab377e1c3afc74c Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 24 Jun 2026 16:03:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:wpr/cquery=E8=BF=94=E5=9B=9E=E5=AD=90?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E7=9A=84=E4=BD=BF=E7=94=A8=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/scripts/wpr_bxerp.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/wpm/scripts/wpr_bxerp.py b/apps/wpm/scripts/wpr_bxerp.py index 7efb4cba..daf6239b 100644 --- a/apps/wpm/scripts/wpr_bxerp.py +++ b/apps/wpm/scripts/wpr_bxerp.py @@ -39,10 +39,12 @@ def main(wprId, mgroup:Mgroup=None): # 子工序操作人和日期 mlogusers = MlogUser.objects.filter(mlog=mlog) if mlogusers.exists(): - datab = mlogusers.values("handle_user__name", "process__name", "handle_date") + datab = mlogusers.values("handle_user__name", "process__name", "handle_date", "equipment__name") for ind, item in enumerate(datab): data[f"{mgroup_name}_{item['process__name']}_操作人"] = item["handle_user__name"] data[f"{mgroup_name}_{item['process__name']}_日期"] = item["handle_date"].strftime("%Y-%m-%d") + if item["equipment__name"]: + data[f"{mgroup_name}_{item['process__name']}_使用设备"] = item["equipment__name"] # 检测数据 ftestitems = FtestItem.objects.filter(ftest__mlogbw_ftest__wpr=wpr, ftest__mlogbw_ftest__mlogb__mlog__mgroup=mgroup,