From 32158dfa776c4605f10910063ce40f568974ebd0 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 21 Nov 2024 13:34:15 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20WMaterialFilter=20mtaskx=E6=A0=B9?= =?UTF-8?q?=E6=8D=AEbatch=5Fbind=E8=BF=9B=E8=A1=8C=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/filters.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/wpm/filters.py b/apps/wpm/filters.py index 30b484dd..fb4d629b 100644 --- a/apps/wpm/filters.py +++ b/apps/wpm/filters.py @@ -37,7 +37,11 @@ class WMaterialFilter(filters.FilterSet): return queryset.filter(mgroup__id=value)|queryset.filter(belong_dept=Mgroup.objects.get(id=value).belong_dept, mgroup=None) def filter_mtaskx(self, queryset, name, value): - return WMaterial.mat_in_qs(mtask=Mtask.objects.get(id=value), qs=queryset) + mtask = Mtask.objects.get(id=value) + if mtask.route and mtask.route.batch_bind: + return WMaterial.mat_in_qs(mtask=Mtask.objects.get(id=value), qs=queryset) + return queryset + class Meta: model = WMaterial fields = {