fix: material增加count__gt等查询条件
This commit is contained in:
parent
7a10da7e2b
commit
1d74171988
|
|
@ -6,6 +6,9 @@ from rest_framework.exceptions import ParseError
|
||||||
|
|
||||||
class MaterialFilter(filters.FilterSet):
|
class MaterialFilter(filters.FilterSet):
|
||||||
tag = filters.CharFilter(method='filter_tag', label="low_inm:库存不足")
|
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:
|
class Meta:
|
||||||
model = Material
|
model = Material
|
||||||
|
|
|
||||||
|
|
@ -46,12 +46,12 @@ class MaterialViewSet(CustomModelViewSet):
|
||||||
qs = super().get_queryset()
|
qs = super().get_queryset()
|
||||||
if self.action in ["list", "retrieve"]:
|
if self.action in ["list", "retrieve"]:
|
||||||
return qs.annotate(
|
return qs.annotate(
|
||||||
count_wm=Coalesce(
|
count_mb=Coalesce(
|
||||||
Sum('mb_m__count', filter=Q(mb_m__state=10)),
|
Sum('mb_m__count', filter=Q(mb_m__state=10)),
|
||||||
Value(0),
|
Value(0),
|
||||||
output_field=DecimalField()
|
output_field=DecimalField()
|
||||||
),
|
),
|
||||||
count_mb=Coalesce(
|
count_wm=Coalesce(
|
||||||
Sum('wm_m__count', filter=Q(wm_m__state=10)),
|
Sum('wm_m__count', filter=Q(wm_m__state=10)),
|
||||||
Value(0),
|
Value(0),
|
||||||
output_field=DecimalField()
|
output_field=DecimalField()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue