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',