feat:wpr/cquery返回子工序的使用设备

This commit is contained in:
shijing 2026-06-24 16:03:02 +08:00
parent e5bf9d58c0
commit 68b70476ba
1 changed files with 3 additions and 1 deletions

View File

@ -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,