feat: 检验工作增加查询条件

This commit is contained in:
caoqianming 2024-08-12 16:57:22 +08:00
parent b9dc211df3
commit 274a0df0eb
2 changed files with 13 additions and 3 deletions

View File

@ -1,5 +1,5 @@
from django_filters import rest_framework as filters from django_filters import rest_framework as filters
from apps.qm.models import QuaStat, TestItem from apps.qm.models import QuaStat, TestItem, FtestWork
class QuaStatFilter(filters.FilterSet): class QuaStatFilter(filters.FilterSet):
@ -22,3 +22,13 @@ class TestItemFilter(filters.FilterSet):
class Meta: class Meta:
model = TestItem model = TestItem
fields = ['tags__contains', 'mcate_tags__contains'] fields = ['tags__contains', 'mcate_tags__contains']
class FtestWorkFilter(filters.FilterSet):
class Meta:
model = FtestWork
fields = {
"material__process__name": ["exact", "contains"],
"material": ["exact"],
"batch": ["exact"],
}

View File

@ -14,7 +14,7 @@ import datetime
from apps.utils.viewsets import CustomGenericViewSet, CustomModelViewSet from apps.utils.viewsets import CustomGenericViewSet, CustomModelViewSet
from apps.wpm.models import SfLog from apps.wpm.models import SfLog
from apps.qm.filters import QuaStatFilter, TestItemFilter from apps.qm.filters import QuaStatFilter, TestItemFilter, FtestWorkFilter
from django.db import transaction from django.db import transaction
from apps.qm.models import NotOkOption from apps.qm.models import NotOkOption
from apps.qm.services import ftestwork_submit from apps.qm.services import ftestwork_submit
@ -126,7 +126,7 @@ class FtestWorkViewSet(CustomModelViewSet):
create_serializer_class = FtestWorkCreateUpdateSerializer create_serializer_class = FtestWorkCreateUpdateSerializer
update_serializer_class = FtestWorkCreateUpdateSerializer update_serializer_class = FtestWorkCreateUpdateSerializer
select_related_fields = ['material'] select_related_fields = ['material']
filterset_fields = ['material', 'batch'] filterset_class = FtestWorkFilter
def update(self, request, *args, **kwargs): def update(self, request, *args, **kwargs):
ins:FtestWork = self.get_object() ins:FtestWork = self.get_object()