From 1eb990d3d5911d12f1fb3856d6821255d75ad709 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 20 Jan 2025 10:33:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20mlogbw=20submit=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 006db3af..a99e6428 100644 --- a/apps/wpm/services.py +++ b/apps/wpm/services.py @@ -298,10 +298,11 @@ def mlog_submit(mlog: Mlog, user: User, now: Union[datetime.datetime, None]): wm.save() if material_out.tracking == Material.MA_TRACKING_SINGLE: if notok_sign_or_defect: - mlogbws = Mlogbw.objects.filter(mlogb=mlog_or_b, ftest__is_ok=False, ftest__defects_ftest__defect=defect) + mlogbws = Mlogbw.objects.filter(mlogb=mlog_or_b, ftest__is_ok=False, ftest__defect_main=notok_sign_or_defect) else: mlogbws = Mlogbw.objects.filter(Q(ftest=None) | Q(ftest__is_ok=True), mlogb=mlog_or_b) - if mlogbws.count() != mo_count: + mlogbws_count = mlogbws.count() + if mlogbws_count != mo_count: raise ParseError("日志与明细数量不一致,操作失败") for item in mlogbws: if item.wpr: @@ -412,7 +413,7 @@ def mlog_revert(mlog: Mlog, user: User, now: Union[datetime.datetime, None]): wm.save() if material_out.tracking == Material.MA_TRACKING_SINGLE: if notok_sign_or_defect: - mlogbws = Mlogbw.objects.filter(mlogb=mlog_or_b, ftest__is_ok=False, ftest__defects_ftest__defect=defect) + mlogbws = Mlogbw.objects.filter(mlogb=mlog_or_b, ftest__is_ok=False, ftest__defect_main=notok_sign_or_defect) else: mlogbws = Mlogbw.objects.filter(Q(ftest=None) | Q(ftest__is_ok=True), mlogb=mlog_or_b) if mlogbws.count() != mo_count: