From b5889374eb085798a9a5a9b91d96e8424bd8136d Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 30 Jul 2025 13:27:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9D=A5=E6=96=99=E6=9C=AA=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E7=9A=84=E7=AD=9B=E9=80=89=E6=8E=A7=E5=88=B6=E7=89=A9?= =?UTF-8?q?=E6=96=99=E7=B1=BB=E5=9E=8B=E4=B8=BA=E5=8D=8A=E6=88=90=E5=93=81?= =?UTF-8?q?=E3=80=81=E6=88=90=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/filters.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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