feat: 删除次批时无需删除输出
This commit is contained in:
parent
155f305071
commit
79cb50709e
|
@ -494,7 +494,11 @@ class MlogbInViewSet(CreateModelMixin, UpdateModelMixin, DestroyModelMixin, Cust
|
||||||
qs = Mlogb.objects.none()
|
qs = Mlogb.objects.none()
|
||||||
if ins.mlogb_to:
|
if ins.mlogb_to:
|
||||||
qs = qs|Mlogb.objects.filter(id=ins.mlogb_to.id)
|
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}
|
query_dict = {"material_out__isnull": False, "mlog": ins.mlog, "mtask": ins.mtask}
|
||||||
route = ins.mtask.route
|
route = ins.mtask.route
|
||||||
if route.batch_bind:
|
if route.batch_bind:
|
||||||
|
@ -503,8 +507,9 @@ class MlogbInViewSet(CreateModelMixin, UpdateModelMixin, DestroyModelMixin, Cust
|
||||||
# 需要删除子集ftest记录
|
# 需要删除子集ftest记录
|
||||||
ftestIds = list(Ftest.objects.filter(mlogbw_ftest__mlogb__in=qs).values_list('id', flat=True))
|
ftestIds = list(Ftest.objects.filter(mlogbw_ftest__mlogb__in=qs).values_list('id', flat=True))
|
||||||
qs.delete()
|
qs.delete()
|
||||||
Ftest.objects.filter(id__in=ftestIds).delete()
|
if ftestIds:
|
||||||
instance.delete()
|
Ftest.objects.filter(id__in=ftestIds).delete()
|
||||||
|
ins.delete()
|
||||||
|
|
||||||
@transaction.atomic
|
@transaction.atomic
|
||||||
def perform_create(self, serializer):
|
def perform_create(self, serializer):
|
||||||
|
|
Loading…
Reference in New Issue