diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index 8d2b0325..a5ba5049 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -829,6 +829,8 @@ class MlogbInUpdateSerializer(CustomModelSerializer): class MlogbwCreateUpdateSerializer(CustomModelSerializer): ftest = FtestProcessSerializer(required=False) + equip_name = serializers.CharField(source='equip.name', read_only=True) + equip_number = serializers.CharField(source='equip.number', read_only=True) class Meta: model = Mlogbw fields = ["id", "number", "wpr", "note", "mlogb", "ftest", "equip", "work_start_time", "work_end_time", "mlogbw_from"] diff --git a/apps/wpm/views.py b/apps/wpm/views.py index 45db024f..40be2044 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -798,6 +798,7 @@ class MlogbwViewSet(CustomModelViewSet): queryset = Mlogbw.objects.all() serializer_class = MlogbwCreateUpdateSerializer filterset_class = MlogbwFilter + select_related_fields = ["ftest", "equip"] ordering = ["number", "create_time"] ordering_fields = ["number", "create_time"]