From 30c330eb0c4f6be4588eb6e1be3878f04615622c Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 10 Dec 2021 14:00:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=8C=87=E5=AF=BC=E4=B9=A6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8E=BB=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/mtm/filters.py | 8 ++++---- hb_server/apps/qm/views.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) 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):