From 1d741719880d1766308ce81a14a9698670d09ae8 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 13 Nov 2025 10:54:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20material=E5=A2=9E=E5=8A=A0count=5F=5Fgt?= =?UTF-8?q?=E7=AD=89=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/mtm/filters.py | 3 +++ apps/mtm/views.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/mtm/filters.py b/apps/mtm/filters.py index 72be6443..138b48de 100644 --- a/apps/mtm/filters.py +++ b/apps/mtm/filters.py @@ -6,6 +6,9 @@ from rest_framework.exceptions import ParseError class MaterialFilter(filters.FilterSet): tag = filters.CharFilter(method='filter_tag', label="low_inm:库存不足") + count__gt = filters.NumberFilter(field_name='count', lookup_expr='gt') + count_mb__gt = filters.NumberFilter(field_name='count_mb', lookup_expr='gt') + count_wm__gt = filters.NumberFilter(field_name='count_wm', lookup_expr='gt') class Meta: model = Material diff --git a/apps/mtm/views.py b/apps/mtm/views.py index 67b240f5..ec7c93e7 100644 --- a/apps/mtm/views.py +++ b/apps/mtm/views.py @@ -46,12 +46,12 @@ class MaterialViewSet(CustomModelViewSet): qs = super().get_queryset() if self.action in ["list", "retrieve"]: return qs.annotate( - count_wm=Coalesce( + count_mb=Coalesce( Sum('mb_m__count', filter=Q(mb_m__state=10)), Value(0), output_field=DecimalField() ), - count_mb=Coalesce( + count_wm=Coalesce( Sum('wm_m__count', filter=Q(wm_m__state=10)), Value(0), output_field=DecimalField()