From aca5cd8a6330bcb3d1213969cd6d455557d546a5 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 9 Jan 2025 15:57:23 +0800 Subject: [PATCH] fix: mlog submit defect_qs --- apps/wpm/services.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/wpm/services.py b/apps/wpm/services.py index 067c6e59..43d946ff 100644 --- a/apps/wpm/services.py +++ b/apps/wpm/services.py @@ -19,7 +19,7 @@ import logging from apps.wpm.services_2 import get_alldata_with_batch_and_store from datetime import timedelta from apps.wpmw.models import Wpr, WprDefect -from ..qm.models import Defect +from ..qm.models import Defect, FtestDefect 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(): # 获取所有主要的不合格项 bw_qs = Mlogbw.objects.filter(mlogb=item) - defect_qs = Mlogbw.objects.filter(mlogb=item, ftest__defects_ftest__is_main=True).values_list( - "defect", flat=True) + defect_qs = FtestDefect.objects.filter(ftest__is_ok=False, + ftest__mlogbw_ftest__mlogb=item, is_main=True).values_list( + "defect", flat=True).distinct() for defect in defect_qs: xcount = bw_qs.filter(ftest__defects_ftest__defect=defect).count() if xcount > 0: