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

feat: 产品规格还需在管料退火处处理

This commit is contained in:
caoqianming 2024-12-04 13:04:19 +08:00
parent 7ce9ed5a19
commit 5e9ebcdd36
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apps/wpm/services_2.py
View File

@ -34,8 +34,6 @@ def get_alldata_with_batch(batch: str):
mlog_count_fields = Mlog.count_fields() mlog_count_fields = Mlog.count_fields()
data["产品规格"] = []
if mlogs_blcx_qs.exists(): if mlogs_blcx_qs.exists():
data["产品规格"] = [] data["产品规格"] = []
data["棒料成型_出料人"] = [] data["棒料成型_出料人"] = []
@ -126,6 +124,7 @@ def get_alldata_with_batch(batch: str):
data["十车间入库_日期"] = [] data["十车间入库_日期"] = []
data["十车间入库_检验备注"] = "" data["十车间入库_检验备注"] = ""
for item in mioitem10_qs: for item in mioitem10_qs:
last_time = item.update_time if item.update_time > last_time else last_time
if item.test_note: if item.test_note:
data["十车间入库_检验备注"] = ";".join([data["十车间入库_检验备注"], item.test_note]) data["十车间入库_检验备注"] = ";".join([data["十车间入库_检验备注"], item.test_note])
if item.mio.do_user: if item.mio.do_user:
@ -157,7 +156,10 @@ def get_alldata_with_batch(batch: str):
data["管料退火_日期"] = [] data["管料退火_日期"] = []
data["管料退火_操作人"] = [] data["管料退火_操作人"] = []
data["管料退火_备注"] = "" data["管料退火_备注"] = ""
data["产品规格"] = []
for item in mlogs_glth_qs: for item in mlogs_glth_qs:
data["产品规格"].append(item.material_out)
last_time = item.update_time if item.update_time > last_time else last_time
if item.note: if item.note:
data["管料退火_备注"] = ";".join([data["管料退火_备注"], item.note]) data["管料退火_备注"] = ";".join([data["管料退火_备注"], item.note])
if item.handle_date: if item.handle_date:
@ -174,6 +176,8 @@ def get_alldata_with_batch(batch: str):
data["管料退火_日期"] = ";".join([item.strftime("%Y-%m-%d") for item in data["管料退火_日期"]]) data["管料退火_日期"] = ";".join([item.strftime("%Y-%m-%d") for item in data["管料退火_日期"]])
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["产品规格"] = ";".join([item.specification for item in data["产品规格"]])
# 六车间领料数据 # 六车间领料数据
@ -184,15 +188,9 @@ def get_alldata_with_batch(batch: str):
data["六车间领料_日期"] = [] data["六车间领料_日期"] = []
data["六车间领料_车间执行人"] = [] data["六车间领料_车间执行人"] = []
data["六车间领料_仓库执行人"] = [] data["六车间领料_仓库执行人"] = []
add_guige = False data["产品规格"] = []
if data["产品规格"]:
pass
else:
add_guige = True
data["产品规格"] = []
for item in mioitem6_qs: for item in mioitem6_qs:
if add_guige: data["产品规格"].append(item.material)
data["产品规格"].append(item.material)
last_time = item.update_time if item.update_time > last_time else last_time last_time = item.update_time if item.update_time > last_time else last_time
data["六车间领料_日期"].append(item.mio.inout_date) data["六车间领料_日期"].append(item.mio.inout_date)
if item.mio.do_user: if item.mio.do_user:
@ -211,9 +209,8 @@ def get_alldata_with_batch(batch: str):
data["六车间领料_仓库执行人"] = ";".join([item.name for item in data["六车间领料_仓库执行人"]]) data["六车间领料_仓库执行人"] = ";".join([item.name for item in data["六车间领料_仓库执行人"]])
data["六车间领料_车间执行人"] = list(set(data["六车间领料_车间执行人"])) data["六车间领料_车间执行人"] = list(set(data["六车间领料_车间执行人"]))
data["六车间领料_车间执行人"] = ";".join([item.name for item in data["六车间领料_车间执行人"]]) data["六车间领料_车间执行人"] = ";".join([item.name for item in data["六车间领料_车间执行人"]])
if add_guige: data["产品规格"] = list(set(data["产品规格"]))
data["产品规格"] = list(set(data["产品规格"])) data["产品规格"] = ";".join([item.specification for item in data["产品规格"]])
data["产品规格"] = ";".join([item.specification for item in data["产品规格"]])
# 六车间工段生产数据 # 六车间工段生产数据