From 79cb50709e7cf9726c1142eb721e2c510fde6e2f Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 10 Jan 2025 15:51:49 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/views.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/apps/wpm/views.py b/apps/wpm/views.py index 6cf17101..7af96c82 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -494,7 +494,11 @@ class MlogbInViewSet(CreateModelMixin, UpdateModelMixin, DestroyModelMixin, Cust qs = Mlogb.objects.none() if ins.mlogb_to: qs = qs|Mlogb.objects.filter(id=ins.mlogb_to.id) - if ins.mtask: + 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: query_dict = {"material_out__isnull": False, "mlog": ins.mlog, "mtask": ins.mtask} route = ins.mtask.route if route.batch_bind: @@ -503,8 +507,9 @@ class MlogbInViewSet(CreateModelMixin, UpdateModelMixin, DestroyModelMixin, Cust # 需要删除子集ftest记录 ftestIds = list(Ftest.objects.filter(mlogbw_ftest__mlogb__in=qs).values_list('id', flat=True)) qs.delete() - Ftest.objects.filter(id__in=ftestIds).delete() - instance.delete() + if ftestIds: + Ftest.objects.filter(id__in=ftestIds).delete() + ins.delete() @transaction.atomic def perform_create(self, serializer):