From dc47570a5b95e0f17abc9dd5bca32fd0a865d6be Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 1 Dec 2023 11:33:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20wm=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/mtm/serializers.py | 4 +++- apps/wpm/views.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/mtm/serializers.py b/apps/mtm/serializers.py index 93485e14..7ad7228e 100644 --- a/apps/mtm/serializers.py +++ b/apps/mtm/serializers.py @@ -15,10 +15,12 @@ class ShiftSerializer(CustomModelSerializer): class MaterialSimpleSerializer(CustomModelSerializer): + process_name = serializers.CharField(source='process.name', read_only=True) + class Meta: model = Material fields = ['id', 'name', 'number', 'model', - 'specification', 'type', 'cate', 'brothers'] + 'specification', 'type', 'cate', 'brothers', 'process_name'] class MaterialSerializer(CustomModelSerializer): diff --git a/apps/wpm/views.py b/apps/wpm/views.py index 1bab03c0..b13d51e0 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -102,7 +102,7 @@ class WMaterialViewSet(ListModelMixin, CustomGenericViewSet): perms_map = {'get': '*'} queryset = WMaterial.objects.all() serializer_class = WMaterialSerializer - select_related_fields = ['material', 'belong_dept'] + select_related_fields = ['material', 'belong_dept', 'material__process'] search_fields = ['material__name', 'material__number', 'material__specification'] filterset_class = WMaterialFilter