From 05fcc4a00a99e86bb8230dde5e06f3523ed56042 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 7 Aug 2025 13:44:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20mlogbw=E8=BF=94=E5=9B=9Ewpr=5Fnumber=5F?= =?UTF-8?q?out?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/serializers.py | 5 ++++- apps/wpm/views.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index 42d8fe94..87089c3b 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -831,9 +831,12 @@ class MlogbwCreateUpdateSerializer(CustomModelSerializer): ftest = FtestProcessSerializer(required=False, allow_null=True) equip_name = serializers.CharField(source='equip.name', read_only=True) equip_number = serializers.CharField(source='equip.number', read_only=True) + wpr_number_out = serializers.CharField(source='wpr.number_out', read_only=True) class Meta: model = Mlogbw - fields = ["id", "number", "wpr", "note", "mlogb", "ftest", "equip", "work_start_time", "work_end_time", "mlogbw_from", "equip_name", "equip_number"] + fields = ["id", "number", "wpr", "note", + "mlogb", "ftest", "equip", "work_start_time", + "work_end_time", "mlogbw_from", "equip_name", "equip_number", "wpr_number_out"] read_only_fields = ["mlogbw_from"] def validate(self, attrs): diff --git a/apps/wpm/views.py b/apps/wpm/views.py index a52a33dc..f803f763 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -825,7 +825,7 @@ class MlogbwViewSet(CustomModelViewSet): queryset = Mlogbw.objects.all() serializer_class = MlogbwCreateUpdateSerializer filterset_class = MlogbwFilter - select_related_fields = ["ftest", "equip"] + select_related_fields = ["ftest", "equip", "wpr"] ordering = ["number", "create_time"] ordering_fields = ["number", "create_time"]