diff --git a/hb_server/apps/inm/serializers.py b/hb_server/apps/inm/serializers.py index 34d26f4..e983108 100644 --- a/hb_server/apps/inm/serializers.py +++ b/hb_server/apps/inm/serializers.py @@ -4,7 +4,7 @@ from rest_framework import serializers from apps.inm.models import FIFO, FIFOItem, FIFOItemProduct, IProduct, MaterialBatch, WareHouse, Inventory from apps.qm.models import TestRecord, TestRecordItem -from apps.system.serializers import UserSimpleSerializer +from apps.system.serializers import FileSimpleSerializer, UserSimpleSerializer from apps.mtm.serializers import MaterialSimpleSerializer from django.db import transaction @@ -71,7 +71,7 @@ class FIFOListSerializer(serializers.ModelSerializer): class FIFOItemSerializer(serializers.ModelSerializer): warehouse_ = WareHouseSimpleSerializer(source='warehouse', read_only=True) material_ = MaterialSimpleSerializer(source='material', read_only=True) - + files_ = FileSimpleSerializer(source='files', many=True, read_only=True) class Meta: model = FIFOItem fields = '__all__' diff --git a/hb_server/apps/inm/views.py b/hb_server/apps/inm/views.py index 932a1d1..a0d9fb5 100644 --- a/hb_server/apps/inm/views.py +++ b/hb_server/apps/inm/views.py @@ -82,7 +82,7 @@ class FIFOItemViewSet(ListModelMixin, DestroyModelMixin, UpdateModelMixin, Gener 出入库记录详情表 """ perms_map = {'*': '*'} - queryset = FIFOItem.objects.select_related('material', 'fifo').all() + queryset = FIFOItem.objects.select_related('material', 'fifo').prefetch_related('files').all() serializer_class = FIFOItemSerializer filterset_fields = ['material', 'fifo', 'fifo__type', 'need_test', 'is_testok']