From c6f30f781075dc5087bcdac8cc79c613f310363c Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 17 Feb 2022 15:33:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E7=94=9F=E4=BA=A7=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=A2=9E=E5=8A=A0=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/wpm/views.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py index 98d1a2d..def12c2 100644 --- a/hb_server/apps/wpm/views.py +++ b/hb_server/apps/wpm/views.py @@ -6,7 +6,7 @@ from apps.inm.models import FIFO, FIFOItem, FIFOItemProduct from apps.inm.services import InmService from apps.mtm.models import Material, RecordForm, RecordFormField, Step, SubprodctionMaterial, TechDoc from apps.mtm.serializers import RecordFormDetailSerializer, SubprodctionMaterialListSerializer, TechDocListSerializer -from apps.pm.models import SubProductionPlan, SubProductionProgress +from apps.pm.models import ProductionPlan, SubProductionPlan, SubProductionProgress from apps.pm.serializers import SubProductionPlanListSerializer, SubProductionProgressSerializer from apps.qm.models import TestRecord, TestRecordItem from apps.qm.serializers import TestRecordDetailSerializer @@ -49,7 +49,10 @@ class WPlanViewSet(ListModelMixin, GenericViewSet): """ perms_map = {'get': '*'} queryset = SubProductionPlan.objects.select_related( - 'process', 'workshop', 'subproduction', 'product').exclude(state=0) + 'process', 'workshop', 'subproduction', 'product')\ + .exclude(state= SubProductionPlan.SUBPLAN_STATE_PLANING, + production_plan__state__in=[ProductionPlan.PLAN_STATE_PAUSE, + ProductionPlan.PLAN_STATE_STOP]) search_fields = [] serializer_class = SubProductionPlanListSerializer filterset_fields = ['production_plan',