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

fix: 光子get_alldata_with_batch 人员获取错误

This commit is contained in:
caoqianming 2025-06-24 13:52:44 +08:00
parent 9ff72b2da1
commit 037008d7c9
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/wpm/services_2.py
View File

@ -150,9 +150,9 @@ def get_alldata_with_batch(batch: str):
data["七车间入库_日期"].append(item.mio.inout_date) data["七车间入库_日期"].append(item.mio.inout_date)
if item.test_note: if item.test_note:
data["七车间入库_检验备注"] = ";".join([data["七车间入库_检验备注"], item.test_note]) data["七车间入库_检验备注"] = ";".join([data["七车间入库_检验备注"], item.test_note])
if item.mio.mio_user:
data["七车间入库_车间执行人"].append(item.mio.do_user)
if item.mio.do_user: if item.mio.do_user:
data["七车间入库_车间执行人"].append(item.mio.do_user)
if item.mio.mio_user:
data["七车间入库_仓库执行人"].append(item.mio.mio_user) data["七车间入库_仓库执行人"].append(item.mio.mio_user)
for field in mioitem_count_fields: for field in mioitem_count_fields:
f_v = getattr(item, field) f_v = getattr(item, field)
@ -167,8 +167,6 @@ def get_alldata_with_batch(batch: str):
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["七车间入库_仓库执行人"]))
if None in data["七车间入库_仓库执行人"]:
data["七车间入库_仓库执行人"].remove(None)
data["七车间入库_仓库执行人"] = ";".join([item.name for item in data["七车间入库_仓库执行人"]]) data["七车间入库_仓库执行人"] = ";".join([item.name for item in data["七车间入库_仓库执行人"]])
# 十车间入库检验 # 十车间入库检验
@ -216,7 +214,7 @@ def get_alldata_with_batch(batch: str):
if material_start is None: if material_start is None:
material_start = item.material material_start = item.material
data["其他入库_日期"].append(item.mio.inout_date) data["其他入库_日期"].append(item.mio.inout_date)
if item.mio.do_user: if item.mio.mio_user:
data["其他入库_仓库执行人"].append(item.mio.mio_user) data["其他入库_仓库执行人"].append(item.mio.mio_user)
for field in mioitem_count_fields: for field in mioitem_count_fields:
if getattr(item, field) is not None and (getattr(item, field) > 0 or field in ["count", "count_notok", "count_sampling"]): if getattr(item, field) is not None and (getattr(item, field) > 0 or field in ["count", "count_notok", "count_sampling"]):
@ -275,9 +273,9 @@ def get_alldata_with_batch(batch: str):
if material_start is None: if material_start is None:
material_start = item.material material_start = item.material
data["六车间领料_日期"].append(item.mio.inout_date) data["六车间领料_日期"].append(item.mio.inout_date)
if item.mio.do_user:
data["六车间领料_仓库执行人"].append(item.mio.mio_user)
if item.mio.mio_user: if item.mio.mio_user:
data["六车间领料_仓库执行人"].append(item.mio.mio_user)
if item.mio.do_user:
data["六车间领料_车间执行人"].append(item.mio.do_user) data["六车间领料_车间执行人"].append(item.mio.do_user)
for field in mioitem_count_fields: for field in mioitem_count_fields:
if getattr(item, field) is not None and getattr(item, field) > 0: if getattr(item, field) is not None and getattr(item, field) > 0:
@ -461,7 +459,7 @@ def get_alldata_with_batch(batch: str):
material_start = item.material material_start = item.material
if item.mio.inout_date: if item.mio.inout_date:
data["销售发货_日期"].append(item.mio.inout_date) data["销售发货_日期"].append(item.mio.inout_date)
if item.mio.do_user: if item.mio.mio_user:
data['销售发货_仓库执行人'].append(item.mio.mio_user) data['销售发货_仓库执行人'].append(item.mio.mio_user)
data['销售发货_count']+= item.count data['销售发货_count']+= item.count
if getattr(data, "棒料成型_count_real", 0) > 0: if getattr(data, "棒料成型_count_real", 0) > 0: