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

feat: get_alldata_with_batch 加入检验备注统计

This commit is contained in:
caoqianming 2024-12-04 11:00:49 +08:00
parent bcbaba330d
commit ffd7bc13b0
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/wpm/services_2.py
View File

@ -68,9 +68,12 @@ def get_alldata_with_batch(batch: str):
mlogs_glcx_qs = Mlog.objects.filter(submit_time__isnull=False, mgroup=mgroup_glcx, batch=batch)
if mlogs_glcx_qs.exists():
data["产品规格"] = []
data["管料成型_备注"] = ""
for item in mlogs_glcx_qs:
last_time = item.update_time if item.update_time > last_time else last_time
data["产品规格"].append(item.material_out) # 对象
if item.note:
data["管料成型_备注"] = ";".join([data["管料成型_备注"], item.note])
for field in mlog_count_fields:
if getattr(item, field) > 0 or field in ["count_real", "count_ok"]:
if f'管料成型_{field}' not in data:
@ -88,9 +91,12 @@ def get_alldata_with_batch(batch: str):
data["七车间入库_日期"] = []
data["七车间入库_车间执行人"] = []
data["七车间入库_仓库执行人"] = []
data["七车间入库_检验备注"] = ""
for item in mioitem_qs:
last_time = item.update_time if item.update_time > last_time else last_time
data["七车间入库_日期"].append(item.mio.inout_date)
if item.test_note:
data["七车间入库_检验备注"] = ";".join([data["七车间入库_检验备注"], item.note])
if item.mio.mio_user:
data["七车间入库_车间执行人"].append(item.mio.mio_user)
if item.mio.do_user:
@ -116,7 +122,10 @@ def get_alldata_with_batch(batch: str):
data["十车间入库_抽检人"] = []
data["十车间入库_仓库执行人"] = []
data["十车间入库_日期"] = []
data["十车间入库_检验备注"] = ""
for item in mioitem10_qs:
if item.test_note:
data["十车间入库_检验备注"] = ";".join([data["十车间入库_检验备注"], item.note])
if item.mio.do_user:
data["十车间入库_仓库执行人"].append(item.mio.do_user)
if item.test_user:
@ -145,7 +154,10 @@ def get_alldata_with_batch(batch: str):
if mlogs_glth_qs.exists():
data["管料退火_日期"] = []
data["管料退火_操作人"] = []
data["管料退火_备注"] = ""
for item in mlogs_glth_qs:
if item.note:
data["管料退火_备注"] = ";".join([data["管料退火_备注"], item.note])
if item.handle_date:
data["管料退火_日期"].append(item.handle_date)
if item.handle_user:
@ -199,7 +211,10 @@ def get_alldata_with_batch(batch: str):
last_time = item.update_time if item.update_time > last_time else last_time
data[f'六车间_{mgroup_name}_日期'] = []
data[f'六车间_{mgroup_name}_操作人'] = []
data[f'六车间_{mgroup_name}_备注'] = ""
for item in mlogs_qs:
if item.note:
data[f'六车间_{mgroup_name}_备注'] = ";".join([data[f'六车间_{mgroup_name}_备注'], item.note])
if item.handle_date:
data[f'六车间_{mgroup_name}_日期'].append(item.handle_date)
if item.handle_user: