zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: mlog和handover添加cbatch查询条件

This commit is contained in:
caoqianming 2025-05-20 14:26:58 +08:00
parent 5011ef8076
commit 8fb204a93d
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/wpm/filters.py
View File

@ -93,6 +93,7 @@ class WMaterialFilter(filters.FilterSet):
} }
class MlogFilter(filters.FilterSet): class MlogFilter(filters.FilterSet):
cbatch = filters.CharFilter(label='批次号', method='filter_cbatch')
class Meta: class Meta:
model = Mlog model = Mlog
fields = { fields = {
@ -108,9 +109,13 @@ class MlogFilter(filters.FilterSet):
"fmlog": ["exact"], "fmlog": ["exact"],
"b_mlog__batch": ["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): class HandoverFilter(filters.FilterSet):
cbatch = filters.CharFilter(label='批次号', method='filter_cbatch')
mgroup = filters.CharFilter(label='MgroupId', method='filter_mgroup') mgroup = filters.CharFilter(label='MgroupId', method='filter_mgroup')
dept = filters.CharFilter(label='DeptId', method='filter_dept') dept = filters.CharFilter(label='DeptId', method='filter_dept')
@ -119,6 +124,9 @@ class HandoverFilter(filters.FilterSet):
def filter_dept(self, queryset, name, value): def filter_dept(self, queryset, name, value):
return queryset.filter(send_dept__id=value)|queryset.filter(recive_dept__id=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: class Meta:
model = Handover model = Handover