feat:wpr/cquery返回子工序的使用设备
This commit is contained in:
parent
e5bf9d58c0
commit
68b70476ba
|
|
@ -39,10 +39,12 @@ def main(wprId, mgroup:Mgroup=None):
|
||||||
# 子工序操作人和日期
|
# 子工序操作人和日期
|
||||||
mlogusers = MlogUser.objects.filter(mlog=mlog)
|
mlogusers = MlogUser.objects.filter(mlog=mlog)
|
||||||
if mlogusers.exists():
|
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):
|
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_user__name"]
|
||||||
data[f"{mgroup_name}_{item['process__name']}_日期"] = item["handle_date"].strftime("%Y-%m-%d")
|
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,
|
ftestitems = FtestItem.objects.filter(ftest__mlogbw_ftest__wpr=wpr,
|
||||||
ftest__mlogbw_ftest__mlogb__mlog__mgroup=mgroup,
|
ftest__mlogbw_ftest__mlogb__mlog__mgroup=mgroup,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue