From 0238e09d0ace6b4b0bf486a449d39685480cb248 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 22 Nov 2021 14:59:45 +0800 Subject: [PATCH] wmaterial filterset --- hb_server/apps/wpm/filters.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hb_server/apps/wpm/filters.py b/hb_server/apps/wpm/filters.py index 6f96092..f11be8b 100644 --- a/hb_server/apps/wpm/filters.py +++ b/hb_server/apps/wpm/filters.py @@ -1,4 +1,5 @@ from django_filters import rest_framework as filters +from apps.mtm.models import Step from apps.wpm.services import WpmServies from .models import Operation, WMaterial, WProduct @@ -13,8 +14,12 @@ class WMaterialFilterSet(filters.FilterSet): def filter_operation(self, queryset, name, value): operation = Operation.objects.get(pk=value) wproducts = WProduct.objects.filter(ow_wproduct__operation=value) + step = operation.step if wproducts.exists(): subplans = WpmServies.get_subplans_queryset_from_wproducts(wproducts) else: - subplans = WpmServies.get_subplans_queyset_from_step(operation.step) - return queryset.filter(subproduction_plan__in=subplans) \ No newline at end of file + subplans = WpmServies.get_subplans_queyset_from_step(step) + queryset = queryset.filter(subproduction_plan__in=subplans) + # if step.type == Step.STEP_TYPE_NOM: + # queryset = queryset.filter() + return queryset \ No newline at end of file