From a581d40ef97637e9b83d65ab9377d377aa316d71 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 20 Mar 2025 09:33:11 +0800 Subject: [PATCH] fix: wmaterial search bug --- apps/wpm/filters.py | 2 +- apps/wpm/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/wpm/filters.py b/apps/wpm/filters.py index 496445ac..2a6b458d 100644 --- a/apps/wpm/filters.py +++ b/apps/wpm/filters.py @@ -39,7 +39,7 @@ class WMaterialFilter(filters.FilterSet): tag = filters.CharFilter(label="todo/done", method="filter_tag") mtaskx = filters.CharFilter(label='MtaskId', method='filter_mtaskx') route = filters.CharFilter(label='routeId', method='filter_route') - # material__process__exclude = filters.CharFilter(field_name="material__process", lookup_expr="exact", exclude=True) + material__process__exclude = filters.CharFilter(field_name="material__process", lookup_expr="exact", exclude=True) def filter_mgroupx(self, queryset, name, value): return queryset.filter(mgroup__id=value)|queryset.filter(belong_dept=Mgroup.objects.get(id=value).belong_dept, mgroup=None) diff --git a/apps/wpm/views.py b/apps/wpm/views.py index 86ec8601..d0d41f3a 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -134,7 +134,7 @@ class WMaterialViewSet(ListModelMixin, CustomGenericViewSet): perms_map = {'get': '*'} queryset = WMaterial.objects.filter(count__gt=0) serializer_class = WMaterialSerializer - select_related_fields = ['material', 'belong_dept', 'material__process', 'supplier'] + select_related_fields = ['material', 'belong_dept', 'material__process__name', 'supplier'] search_fields = ['material__name', 'material__number', 'material__specification', 'batch', 'material__model', "defect__name", "notok_sign", 'material_ofrom'] filterset_class = WMaterialFilter