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

fix: wmaterial search bug

This commit is contained in:
caoqianming 2025-03-20 09:33:11 +08:00
parent 3a263735b0
commit a581d40ef9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/wpm/filters.py
View File

@ -39,7 +39,7 @@ class WMaterialFilter(filters.FilterSet):
tag = filters.CharFilter(label="todo/done", method="filter_tag") tag = filters.CharFilter(label="todo/done", method="filter_tag")
mtaskx = filters.CharFilter(label='MtaskId', method='filter_mtaskx') mtaskx = filters.CharFilter(label='MtaskId', method='filter_mtaskx')
route = filters.CharFilter(label='routeId', method='filter_route') route = filters.CharFilter(label='routeId', method='filter_route')
# material__process__exclude = filters.CharFilter(field_name="material__process", lookup_expr="exact", exclude=True) material__process__exclude = filters.CharFilter(field_name="material__process", lookup_expr="exact", exclude=True)
def filter_mgroupx(self, queryset, name, value): def filter_mgroupx(self, queryset, name, value):
return queryset.filter(mgroup__id=value)|queryset.filter(belong_dept=Mgroup.objects.get(id=value).belong_dept, mgroup=None) return queryset.filter(mgroup__id=value)|queryset.filter(belong_dept=Mgroup.objects.get(id=value).belong_dept, mgroup=None)

2
apps/wpm/views.py
View File

@ -134,7 +134,7 @@ class WMaterialViewSet(ListModelMixin, CustomGenericViewSet):
perms_map = {'get': '*'} perms_map = {'get': '*'}
queryset = WMaterial.objects.filter(count__gt=0) queryset = WMaterial.objects.filter(count__gt=0)
serializer_class = WMaterialSerializer serializer_class = WMaterialSerializer
select_related_fields = ['material', 'belong_dept', 'material__process', 'supplier'] select_related_fields = ['material', 'belong_dept', 'material__process__name', 'supplier']
search_fields = ['material__name', search_fields = ['material__name',
'material__number', 'material__specification', 'batch', 'material__model', "defect__name", "notok_sign", 'material_ofrom'] 'material__number', 'material__specification', 'batch', 'material__model', "defect__name", "notok_sign", 'material_ofrom']
filterset_class = WMaterialFilter filterset_class = WMaterialFilter