From 13dbd18efc1b53c1eaf9fbf011187739f7b2e4a5 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 6 Sep 2021 09:12:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E5=B7=A5=E5=BA=8F=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/mtm/views.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hb_server/apps/mtm/views.py b/hb_server/apps/mtm/views.py index d218d7b..d9c9eaf 100644 --- a/hb_server/apps/mtm/views.py +++ b/hb_server/apps/mtm/views.py @@ -53,13 +53,13 @@ class ProcessViewSet(PageOrNot, CreateUpdateModelAMixin, ModelViewSet): ordering_fields = ['number'] ordering = ['number'] - @action(methods=['get'], detail=True, perms_map={'get':'process_update'}, pagination_class=None, serializer_class=StepSerializer) + @action(methods=['get'], detail=True, perms_map={'get':'process_update'}, pagination_class=None, serializer_class=StepDetailSerializer) def steps(self, request, pk=None): """ 工序下的子工序 """ process = self.get_object() - serializer = self.serializer_class(instance=Step.objects.filter(process=process, is_deleted=False), many=True) + serializer = self.serializer_class(instance=Step.objects.prefetch_related('equipments').filter(process=process, is_deleted=False), many=True) return Response(serializer.data) class StepViewSet(OptimizationMixin, CreateUpdateModelAMixin, CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet): @@ -74,7 +74,9 @@ class StepViewSet(OptimizationMixin, CreateUpdateModelAMixin, CreateModelMixin, ordering = ['sort'] def get_serializer_class(self): - return StepDetailSerializer + if self.action == 'retrieve': + return StepDetailSerializer + return StepSerializer # class ProductProcessViewSet(PageOrNot, CreateModelMixin, UpdateModelMixin, ListModelMixin, DestroyModelMixin, GenericViewSet): # """