From b108b48714d9f7a7c8b88f9a8eada308ff9ba0d0 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 22 May 2026 09:42:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:wpm/mloguser=E8=BF=94=E5=9B=9E=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/serializers.py | 1 + apps/wpm/views.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index 14d8c5c3..2095b7bf 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -1558,6 +1558,7 @@ class MlogUserSerializer(CustomModelSerializer): handle_user_name = serializers.CharField(source='handle_user.name', read_only=True) process_name = serializers.CharField(source='process.name', read_only=True) shift_name = serializers.CharField(source='shift.name', read_only=True) + equipment_name = serializers.CharField(source='equipment.name', read_only=True, default=None) class Meta: model = MlogUser fields = "__all__" diff --git a/apps/wpm/views.py b/apps/wpm/views.py index 7eb091e5..dc6181be 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -1273,7 +1273,7 @@ class MlogUserViewSet(BulkCreateModelMixin, CustomListModelMixin, BulkDestroyMod perms_map = {"get": "*", "post": "mlog.update", "delete": "mlog.update"} queryset = MlogUser.objects.all() serializer_class = MlogUserSerializer - select_related_fields = ["handle_user", "shift", "process"] + select_related_fields = ["handle_user", "shift", "process", "equipment"] filterset_fields = ["mlog"] def get_queryset(self):