Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
This commit is contained in:
commit
2ae7dc2635
|
@ -535,6 +535,7 @@ class Mlogbw(BaseModel):
|
||||||
defect_ids = defect_ids.union(tqs_has_a.values_list("defect", flat=True))
|
defect_ids = defect_ids.union(tqs_has_a.values_list("defect", flat=True))
|
||||||
defects = {defect.id: defect for defect in Defect.objects.filter(id__in=defect_ids)}
|
defects = {defect.id: defect for defect in Defect.objects.filter(id__in=defect_ids)}
|
||||||
md_ids = []
|
md_ids = []
|
||||||
|
MlogbDefect.objects.filter(mlogb=mlogb).delete()
|
||||||
for t in tqs_a:
|
for t in tqs_a:
|
||||||
md, _ = MlogbDefect.objects.get_or_create(mlogb=mlogb, defect=defects[t["ftest__defect_main"]])
|
md, _ = MlogbDefect.objects.get_or_create(mlogb=mlogb, defect=defects[t["ftest__defect_main"]])
|
||||||
md.count = t["xcount"]
|
md.count = t["xcount"]
|
||||||
|
@ -550,7 +551,6 @@ class Mlogbw(BaseModel):
|
||||||
md.save()
|
md.save()
|
||||||
md_ids.append(md.id)
|
md_ids.append(md.id)
|
||||||
|
|
||||||
MlogbDefect.objects.filter(mlogb=mlogb).exclude(id__in=md_ids).delete()
|
|
||||||
mlogb.count_notok = count_notok
|
mlogb.count_notok = count_notok
|
||||||
mlogb.count_ok = count - mlogb.count_notok
|
mlogb.count_ok = count - mlogb.count_notok
|
||||||
mlogb.count_ok_full = count - count_notok_full
|
mlogb.count_ok_full = count - count_notok_full
|
||||||
|
|
Loading…
Reference in New Issue