From 8fb204a93d19b6e00e611bdb4ab406bc82de7888 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 20 May 2025 14:26:58 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20mlog=E5=92=8Chandover=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?cbatch=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/wpm/filters.py | 8 ++++++++ 1 file changed, 8 insertions(+) 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