zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 完善get_alldata_with_batch4

This commit is contained in:
caoqianming 2024-12-03 11:13:55 +08:00
parent 4253b39cc6
commit 91bc99a135
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/wpm/services_2.py
View File

@ -127,8 +127,9 @@ def get_alldata_with_batch(batch: str):
data[f'十车间入库_{field}'] += int(getattr(item, field)) data[f'十车间入库_{field}'] += int(getattr(item, field))
data["十车间入库_抽检人"] = list(set(data["十车间入库_抽检人"])) data["十车间入库_抽检人"] = list(set(data["十车间入库_抽检人"]))
data["十车间入库_抽检人"] = ";".join([item.name for item in data["十车间入库_抽检人"]]) data["十车间入库_抽检人"] = ";".join([item.name for item in data["十车间入库_抽检人"]])
data["十车间入库_抽检合格数"] = data["十车间入库_count_sampling"] - data["十车间入库_count_notok"] if data["十车间入库_count_sampling"] > 0:
data["十车间入库_抽检合格率"] = round(data["十车间入库_抽检合格数"] * 100/ data["十车间入库_count_sampling"], 1) data["十车间入库_抽检合格数"] = data["十车间入库_count_sampling"] - data["十车间入库_count_notok"]
data["十车间入库_抽检合格率"] = round(data["十车间入库_抽检合格数"] * 100/ data["十车间入库_count_sampling"], 1)
data["十车间入库_仓库执行人"] = list(set(data["十车间入库_仓库执行人"])) data["十车间入库_仓库执行人"] = list(set(data["十车间入库_仓库执行人"]))
data["十车间入库_仓库执行人"] = ";".join([item.name for item in data["十车间入库_仓库执行人"]]) data["十车间入库_仓库执行人"] = ";".join([item.name for item in data["十车间入库_仓库执行人"]])
data["十车间入库_日期"] = list(set(data["十车间入库_日期"])) data["十车间入库_日期"] = list(set(data["十车间入库_日期"]))
@ -145,7 +146,7 @@ def get_alldata_with_batch(batch: str):
for item in mlogs_glth_qs: for item in mlogs_glth_qs:
if item.handle_date: if item.handle_date:
data["管料退火_日期"].append(item.handle_date) data["管料退火_日期"].append(item.handle_date)
if item.mlog_user: if item.handle_user:
data["管料退火_操作人"].append(item.mlog_user) data["管料退火_操作人"].append(item.mlog_user)
for field in mlog_count_fields: for field in mlog_count_fields:
if getattr(item, field) > 0 or field in ["count", "count_notok"]: if getattr(item, field) > 0 or field in ["count", "count_notok"]: