From a1871a3763807aef4236eb1e415b4fe5a26b0bcb Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 5 Sep 2024 13:14:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20mloginit=20=E5=8F=AF=E5=A1=ABend=5Ftime?=
 =?UTF-8?q?=E5=8F=8Atest=5Fuser=5Fname=20=E8=BF=94=E5=9B=9E?=
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 0f4fa288..1821b34a 100644
--- a/apps/wpm/serializers.py
+++ b/apps/wpm/serializers.py
@@ -264,6 +264,7 @@ class MlogSerializer(CustomModelSerializer):
     equipments_name = serializers.StringRelatedField(
         source='equipments', read_only=True, many=True)
     ticket_ = TicketSimpleSerializer(source='ticket', read_only=True)
+    test_user_name = serializers.CharField(source='test_user.name', read_only=True)
 
     class Meta:
         model = Mlog
@@ -409,7 +410,7 @@ class MlogSerializer(CustomModelSerializer):
 class MlogInitSerializer(CustomModelSerializer):
     class Meta:
         model = Mlog
-        fields = ['id', 'work_start_time', 'mgroup', 'reminder_interval_list', 'route', 'equipment', 'handle_user', 'note', 'mtype', 'supplier']
+        fields = ['id', 'work_start_time', 'work_end_time', 'mgroup', 'reminder_interval_list', 'route', 'equipment', 'handle_user', 'note', 'mtype', 'supplier']
         extra_kwargs = {
             'work_start_time': {'required': True},
             'route':{'required': True},
@@ -431,6 +432,8 @@ class MlogInitSerializer(CustomModelSerializer):
             supplier = attrs.get('supplier', None)
             if not supplier:
                 raise ValidationError('外协必须选择外协单位')
+        if attrs.get('work_end_time', None):
+            attrs['handle_date'] = localdate(attrs['work_end_time'])
         return attrs
     
 class MlogChangeSerializer(CustomModelSerializer):
diff --git a/apps/wpm/views.py b/apps/wpm/views.py
index 81566e30..071a4794 100644
--- a/apps/wpm/views.py
+++ b/apps/wpm/views.py
@@ -151,7 +151,7 @@ class MlogViewSet(CustomModelViewSet):
     select_related_fields = ['create_by', 'update_by', 'mtask',
                              'handle_user', 'handle_user_2', 'equipment', 
                              'equipment_2', 'material_in', 'material_out', 
-                             'supplier', 'ticket', 'mgroup__process']
+                             'supplier', 'ticket', 'mgroup__process', 'test_user']
     prefetch_related_fields = ['handle_users',
                                'material_outs', 'b_mlog', 'equipments']
     filterset_class = MlogFilter