From 321be5032308a476a762bfdefb291660f87c15f4 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 30 Jul 2024 17:05:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20MaterialBatchSerializer=20=E6=94=B9?= =?UTF-8?q?=E5=8F=98material=5Fname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/inm/serializers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/inm/serializers.py b/apps/inm/serializers.py index 31850e11..1984cc16 100644 --- a/apps/inm/serializers.py +++ b/apps/inm/serializers.py @@ -30,8 +30,8 @@ class MaterialBatchAListSerializer(CustomModelSerializer): class MaterialBatchSerializer(CustomModelSerializer): warehouse_name = serializers.CharField( source='warehouse.name', read_only=True) - material_name = serializers.CharField( - source='material.name', read_only=True) + material_name = serializers.StringRelatedField( + source='material', read_only=True) material_ = MaterialSerializer(source='material', read_only=True) class Meta: From 1003e0aea74a7874e37ee415fea648038c8b96d3 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 2 Aug 2024 21:00:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20route=E6=B7=BB=E5=8A=A0filter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/mtm/filters.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/mtm/filters.py b/apps/mtm/filters.py index 1ba30f9f..c36c4568 100644 --- a/apps/mtm/filters.py +++ b/apps/mtm/filters.py @@ -51,6 +51,8 @@ class RouteFilter(filters.FilterSet): "material_out": ["exact", "in"], "process": ["exact", "in"], "is_autotask": ["exact"], + "routepack": ["exact", "isnull"], + "routepack__state": ["exact"], "mgroup": ["exact", "in", "isnull"], "mgroup__name": ["exact", "contains"], "mgroup__belong_dept": ["exact"],