From 31f8f002aa31bc82f10bc1d5f08b9e13f05a08a7 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 3 Sep 2024 10:25:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20mlog=20=E5=A2=9E=E5=8A=A0ticket?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wpm/serializers.py | 2 ++
 apps/wpm/views.py       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py
index d2c815ff..ed3e21c0 100644
--- a/apps/wpm/serializers.py
+++ b/apps/wpm/serializers.py
@@ -17,6 +17,7 @@ from django.utils import timezone
 from django.core.cache import cache
 from django.utils.timezone import localdate
 from apps.qm.models import NotOkOption
+from apps.wf.serializers import TicketSimpleSerializer
 
 
 class OtherLogSerializer(CustomModelSerializer):
@@ -261,6 +262,7 @@ class MlogSerializer(CustomModelSerializer):
         source='handle_users', many=True, read_only=True)
     equipments_name = serializers.StringRelatedField(
         source='equipments', read_only=True, many=True)
+    ticket_ = TicketSimpleSerializer(source='ticket', read_only=True)
 
     class Meta:
         model = Mlog
diff --git a/apps/wpm/views.py b/apps/wpm/views.py
index 4ed5031c..ec2fd45a 100644
--- a/apps/wpm/views.py
+++ b/apps/wpm/views.py
@@ -142,7 +142,7 @@ class MlogViewSet(CustomModelViewSet):
     queryset = Mlog.objects.all()
     serializer_class = MlogSerializer
     select_related_fields = ['create_by', 'update_by', 'mtask',
-                             'handle_user', 'handle_user_2', 'equipment', 'equipment_2', 'material_in', 'material_out', 'supplier']
+                             'handle_user', 'handle_user_2', 'equipment', 'equipment_2', 'material_in', 'material_out', 'supplier', 'ticket']
     prefetch_related_fields = ['handle_users',
                                'material_outs', 'b_mlog', 'equipments']
     filterset_class = MlogFilter