diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index 8592e42f..6e18bf69 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -187,6 +187,7 @@ class WMaterialSerializer(CustomModelSerializer): mgroup_name = serializers.StringRelatedField(source='mgroup.name', read_only=True) belong_dept_name = serializers.CharField( source='belong_dept.name', read_only=True) + material_ofrom_name = serializers.StringRelatedField(source='material_ofrom', read_only=True) material_origin_name = serializers.StringRelatedField(source='material_origin', read_only=True) notok_sign_name = serializers.SerializerMethodField() defect_name = serializers.CharField(source="defect.name", read_only=True) diff --git a/apps/wpm/views.py b/apps/wpm/views.py index f70758ec..86ec8601 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -136,7 +136,7 @@ class WMaterialViewSet(ListModelMixin, CustomGenericViewSet): serializer_class = WMaterialSerializer select_related_fields = ['material', 'belong_dept', 'material__process', 'supplier'] search_fields = ['material__name', - 'material__number', 'material__specification', 'batch', 'material__model', "defect__name", "notok_sign"] + 'material__number', 'material__specification', 'batch', 'material__model', "defect__name", "notok_sign", 'material_ofrom'] filterset_class = WMaterialFilter ordering_fields = ["update_time", "state", "count", "count_xtest"]