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

fix: mlog submit defect_qs

This commit is contained in:
caoqianming 2025-01-09 15:57:23 +08:00
parent 56808f21ca
commit aca5cd8a63
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/wpm/services.py
View File

@ -19,7 +19,7 @@ import logging
from apps.wpm.services_2 import get_alldata_with_batch_and_store from apps.wpm.services_2 import get_alldata_with_batch_and_store
from datetime import timedelta from datetime import timedelta
from apps.wpmw.models import Wpr, WprDefect from apps.wpmw.models import Wpr, WprDefect
from ..qm.models import Defect from ..qm.models import Defect, FtestDefect
myLogger = logging.getLogger('log') myLogger = logging.getLogger('log')
@ -237,8 +237,9 @@ def mlog_submit(mlog: Mlog, user: User, now: Union[datetime.datetime, None]):
if Mlogbw.objects.filter(mlogb=item).exists(): if Mlogbw.objects.filter(mlogb=item).exists():
# 获取所有主要的不合格项 # 获取所有主要的不合格项
bw_qs = Mlogbw.objects.filter(mlogb=item) bw_qs = Mlogbw.objects.filter(mlogb=item)
defect_qs = Mlogbw.objects.filter(mlogb=item, ftest__defects_ftest__is_main=True).values_list( defect_qs = FtestDefect.objects.filter(ftest__is_ok=False,
"defect", flat=True) ftest__mlogbw_ftest__mlogb=item, is_main=True).values_list(
"defect", flat=True).distinct()
for defect in defect_qs: for defect in defect_qs:
xcount = bw_qs.filter(ftest__defects_ftest__defect=defect).count() xcount = bw_qs.filter(ftest__defects_ftest__defect=defect).count()
if xcount > 0: if xcount > 0: