diff --git a/hb_server/apps/mtm/filters.py b/hb_server/apps/mtm/filters.py index 6f6b28b..ca4c2dd 100644 --- a/hb_server/apps/mtm/filters.py +++ b/hb_server/apps/mtm/filters.py @@ -5,11 +5,11 @@ from apps.mtm.models import TechDoc class TechDocFilterset(filters.FilterSet): - # operation = filters.NumberFilter(method='filter_operation') - operation = filters.CharFilter(field_name="subproduction__subplan_subprod__ow_subplan__operation") + operation = filters.NumberFilter(method='filter_operation') + # operation = filters.CharFilter(field_name="subproduction__subplan_subprod__ow_subplan__operation") class Meta: model = TechDoc fields = ['subproduction', 'operation'] - # def filter_operation(self, queryset, name, value): - # return queryset.filter(subproduction__subplan_subprod__ow_subplan__operation=value) + def filter_operation(self, queryset, name, value): + return queryset.filter(subproduction__subplan_subprod__ow_subplan__operation=value).distinct() diff --git a/hb_server/apps/qm/views.py b/hb_server/apps/qm/views.py index beee64d..8b3b80e 100644 --- a/hb_server/apps/qm/views.py +++ b/hb_server/apps/qm/views.py @@ -50,7 +50,7 @@ class TestRecordViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet): perms_map = {'*': '*'} queryset = TestRecord.objects.select_related('fifo_item', 'form').all() serializer_class = TestRecordListSerializer - filterset_fields = ['wproduct', 'material', 'step', 'subproduction_plan', 'fifo_item', 'origin_test'] + filterset_fields = ['wproduct', 'material', 'step', 'subproduction_plan', 'fifo_item', 'origin_test', 'type'] ordering = ['-id'] def get_serializer_class(self):