From d94424131f1a1cce3fb4c0179b88f879db39f4d6 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 30 Nov 2023 17:05:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20materialbatch=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/inm/filters.py | 2 ++ apps/inm/views.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/inm/filters.py b/apps/inm/filters.py index 8fd8edd9..097b76e5 100644 --- a/apps/inm/filters.py +++ b/apps/inm/filters.py @@ -9,5 +9,7 @@ class MaterialBatchFilter(filters.FilterSet): fields = { "warehouse": ["exact"], "material": ["exact"], + "material__type": ["exact", "in"], + "material__process": ["exact", "in"], "count": ["exact", "gte", "lte"] } diff --git a/apps/inm/views.py b/apps/inm/views.py index ff055cf4..3be9d42f 100644 --- a/apps/inm/views.py +++ b/apps/inm/views.py @@ -49,7 +49,8 @@ class MaterialBatchViewSet(ListModelMixin, CustomGenericViewSet): retrieve_serializer_class = MaterialBatchDetailSerializer select_related_fields = ['warehouse', 'material'] filterset_class = MaterialBatchFilter - search_fields = ['material__name'] + search_fields = ['material__name', 'material__number', + 'material__model', 'material__specification', 'batch'] class MioDoViewSet(BulkCreateModelMixin, BulkUpdateModelMixin, CustomGenericViewSet):