diff --git a/apps/wpm/filters.py b/apps/wpm/filters.py index ec13f0ba..8dc9dd13 100644 --- a/apps/wpm/filters.py +++ b/apps/wpm/filters.py @@ -1,7 +1,7 @@ from django_filters import rest_framework as filters from apps.wpm.models import (SfLog, StLog, WMaterial, Mlog, Mlogbw, Handover, Mgroup, Mlogb, Mtask, BatchSt) -from apps.mtm.models import Route +from apps.mtm.models import Route, Material from django.db.models import Q from rest_framework.exceptions import ParseError @@ -49,6 +49,7 @@ class WMaterialFilter(filters.FilterSet): if mgroup: process = Mgroup.objects.get(id=mgroup).process matoutIds = process.get_canout_mat_ids() + queryset = queryset.filter(material__type__in=[Material.MA_TYPE_MAINSO, Material.MA_TYPE_HALFGOOD, Material.MA_TYPE_GOOD]) if value == "todo": qs = queryset.exclude(material__id__in=matoutIds).exclude(state=WMaterial.WM_REPAIRED)|queryset.filter(state=WMaterial.WM_REPAIR) return qs