From 2e0727a2c05832884f89dd76811b64b75ea6932c Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 16 May 2025 16:50:57 +0800 Subject: [PATCH] feat: wpr detail --- apps/wpmw/serializers.py | 6 ++++++ apps/wpmw/views.py | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/wpmw/serializers.py b/apps/wpmw/serializers.py index 926ee60b..b5984710 100644 --- a/apps/wpmw/serializers.py +++ b/apps/wpmw/serializers.py @@ -1,6 +1,8 @@ from apps.wpmw.models import Wpr, WprDefect from apps.utils.serializers import CustomModelSerializer from rest_framework import serializers +from apps.inm.serializers import MaterialBatchSerializer +from apps.wpm.serializers import WMaterialSerializer class WprDefectSerializer(CustomModelSerializer): defect_name = serializers.CharField(source="defect.name", read_only=True) @@ -19,6 +21,10 @@ class WprSerializer(CustomModelSerializer): model = Wpr fields = '__all__' +class WprDetailSerializer(WprSerializer): + mb_ = MaterialBatchSerializer(source='mb', read_only=True) + wm_ = WMaterialSerializer(source='wm', read_only=True) + class WprNewSerializer(serializers.Serializer): year = serializers.IntegerField() diff --git a/apps/wpmw/views.py b/apps/wpmw/views.py index c6acf360..458398f2 100644 --- a/apps/wpmw/views.py +++ b/apps/wpmw/views.py @@ -3,7 +3,7 @@ from apps.utils.viewsets import CustomModelViewSet, CustomGenericViewSet from apps.utils.mixins import CustomListModelMixin, RetrieveModelMixin from apps.wpmw.models import Wpr, WprDefect -from apps.wpmw.serializers import WprSerializer, WprNewSerializer +from apps.wpmw.serializers import WprSerializer, WprNewSerializer, WprDetailSerializer from rest_framework.response import Response from apps.mtm.models import Material @@ -18,6 +18,7 @@ class WprViewSet(CustomListModelMixin, RetrieveModelMixin, CustomGenericViewSet) prefetch_related_fields = ["defects"] queryset = Wpr.objects.all() serializer_class = WprSerializer + retrieve_serializer_class = WprDetailSerializer filterset_fields = { "mb": ["exact", "isnull"], "wm": ["exact", "isnull"],