From 58b38637635a4bc6fa64160d790eec278e2b527c Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 10 Jan 2025 16:00:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=A0=E9=99=A4=E6=AC=A1=E6=89=B9?=
 =?UTF-8?q?=E6=97=B6=E6=97=A0=E9=9C=80=E5=88=A0=E9=99=A4=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wpm/views.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/wpm/views.py b/apps/wpm/views.py
index 7af96c82..3b7d5df2 100644
--- a/apps/wpm/views.py
+++ b/apps/wpm/views.py
@@ -491,20 +491,21 @@ class MlogbInViewSet(CreateModelMixin, UpdateModelMixin, DestroyModelMixin, Cust
         ins: Mlogb = instance
         if ins.mlog.submit_time is not None:
             raise ParseError('生产日志已提交不可编辑')
-        qs = Mlogb.objects.none()
+        qs = None
         if ins.mlogb_to:
-            qs = qs|Mlogb.objects.filter(id=ins.mlogb_to.id)
+            qs = Mlogb.objects.filter(id=ins.mlogb_to.id)
             ftestIds = list(Ftest.objects.filter(mlogbw_ftest__mlogb__in=qs).values_list('id', flat=True))
             qs.delete()
             if ftestIds:
                 Ftest.objects.filter(id__in=ftestIds).delete()
-        elif ins.mtask:
+        elif ins.parent is None and ins.mtask:
             query_dict = {"material_out__isnull": False, "mlog": ins.mlog, "mtask": ins.mtask}
             route = ins.mtask.route
             if route.batch_bind:
                 query_dict["batch__contains"] = ins.batch
-            qs = Mlogb.objects.filter(**query_dict) | qs
-            # 需要删除子集ftest记录
+            qs = Mlogb.objects.filter(**query_dict)
+        # 需要删除子集ftest记录
+        if qs:
             ftestIds = list(Ftest.objects.filter(mlogbw_ftest__mlogb__in=qs).values_list('id', flat=True))
             qs.delete()
             if ftestIds: