diff --git a/apps/wpm/filters.py b/apps/wpm/filters.py index aacabe61..334adab8 100644 --- a/apps/wpm/filters.py +++ b/apps/wpm/filters.py @@ -93,6 +93,7 @@ class WMaterialFilter(filters.FilterSet): } class MlogFilter(filters.FilterSet): + cbatch = filters.CharFilter(label='批次号', method='filter_cbatch') class Meta: model = Mlog fields = { @@ -108,9 +109,13 @@ class MlogFilter(filters.FilterSet): "fmlog": ["exact"], "b_mlog__batch": ["exact"] } + + def filter_cbatch(self, queryset, name, value): + return queryset.filter(b_mlog__batch=value)|queryset.filter(batch=value) class HandoverFilter(filters.FilterSet): + cbatch = filters.CharFilter(label='批次号', method='filter_cbatch') mgroup = filters.CharFilter(label='MgroupId', method='filter_mgroup') dept = filters.CharFilter(label='DeptId', method='filter_dept') @@ -119,6 +124,9 @@ class HandoverFilter(filters.FilterSet): def filter_dept(self, queryset, name, value): return queryset.filter(send_dept__id=value)|queryset.filter(recive_dept__id=value) + + def filter_cbatch(self, queryset, name, value): + return queryset.filter(b_handover__batch=value)|queryset.filter(batch=value) class Meta: model = Handover