feat: batch_gxerp 添加need_inout查询条件
This commit is contained in:
parent
b500ad6615
commit
d03f106055
|
@ -21,7 +21,9 @@ def main(batch: str):
|
|||
mgroup_qs = Mgroup.objects.all().order_by("sort")
|
||||
for mgroup in mgroup_qs:
|
||||
mgroup_name = mgroup.name
|
||||
mlogb1_qs = Mlogb.objects.filter(mlog__submit_time__isnull=False, material_out__isnull=False, mlog__mgroup=mgroup, mlog__is_fix=False, batch=batch)
|
||||
mlogb1_qs = Mlogb.objects.filter(mlog__submit_time__isnull=False,
|
||||
material_out__isnull=False, mlog__mgroup=mgroup,
|
||||
mlog__is_fix=False, batch=batch, need_inout=True)
|
||||
if mlogb1_qs.exists():
|
||||
data[f"{mgroup_name}_日期"] = []
|
||||
data[f"{mgroup_name}_操作人"] = []
|
||||
|
@ -72,7 +74,10 @@ def main(batch: str):
|
|||
data[f"{mgroup_name}_操作人"] = ";".join([item.name for item in data[f"{mgroup_name}_操作人"]])
|
||||
|
||||
|
||||
mlogb2_qs = Mlogb.objects.filter(mlog__submit_time__isnull=False, material_out__isnull=False, mlog__mgroup__name="外观检验", mlog__is_fix=True, batch=batch)
|
||||
mlogb2_qs = Mlogb.objects.filter(mlog__submit_time__isnull=False,
|
||||
material_out__isnull=False,
|
||||
mlog__mgroup__name="外观检验",
|
||||
mlog__is_fix=True, batch=batch, need_inout=True)
|
||||
if mlogb2_qs.exists():
|
||||
data["外观检验_返修_日期"] = []
|
||||
data["外观检验_返修_操作人"] = []
|
||||
|
|
Loading…
Reference in New Issue