diff --git a/apps/pum/serializers.py b/apps/pum/serializers.py index 014b6364..bc59e3d9 100644 --- a/apps/pum/serializers.py +++ b/apps/pum/serializers.py @@ -61,6 +61,13 @@ class PuPlanItemSerializer(CustomModelSerializer): class PuOrderSerializer(CustomModelSerializer): + supplier_name = serializers.CharField( + source='supplier.name', read_only=True) + create_by_name = serializers.CharField( + source='create_by.name', read_only=True) + update_by_name = serializers.CharField( + source='update_by.name', read_only=True) + class Meta: model = PuOrder fields = '__all__' diff --git a/apps/pum/views.py b/apps/pum/views.py index 34453471..2ed81254 100644 --- a/apps/pum/views.py +++ b/apps/pum/views.py @@ -96,6 +96,7 @@ class PuOrderViewSet(CustomModelViewSet): serializer_class = PuOrderSerializer filterset_fields = ['state', 'supplier'] search_fields = ['number', 'supplier__name'] + select_related_fields = ['create_by', 'update_by', 'supplier'] @transaction.atomic def perform_destroy(self, instance): diff --git a/apps/sam/serializers.py b/apps/sam/serializers.py index 34dde57e..1830ec4c 100644 --- a/apps/sam/serializers.py +++ b/apps/sam/serializers.py @@ -21,6 +21,15 @@ class ContractSerializer(CustomModelSerializer): class OrderSerializer(CustomModelSerializer): + customer_name = serializers.CharField( + source='customer.name', read_only=True) + contract_number = serializers.CharField( + source='contract.number', read_only=True) + create_by_name = serializers.CharField( + source='create_by.name', read_only=True) + update_by_name = serializers.CharField( + source='update_by.name', read_only=True) + class Meta: model = Order fields = '__all__'