From 7e9b5597234c75b4c4dd30007182238ae941eca4 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 30 Apr 2026 14:03:53 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20mlog/mlogb=20=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=20wm=5Fin=20=E7=8A=B6=E6=80=81=E5=8F=8A?= =?UTF-8?q?=E7=BC=BA=E9=99=B7=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MlogbDetailSerializer 增加 wm_in_state；MlogListSerializer 与 MlogSerializer 增加 wm_in_defect / wm_in_defect_name / wm_in_state；MlogViewSet 在 select_related 中追加 wm_in__defect。 Co-Authored-By: Claude Opus 4.7 (1M context) --- apps/wpm/serializers.py | 7 +++++++ apps/wpm/views.py | 1 + 2 files changed, 8 insertions(+) diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index 2efd3a2d..5276ed24 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -301,6 +301,9 @@ class MlogListSerializer(CustomModelSerializer): handle_users_ = UserSimpleSerializer( source='handle_users', many=True, read_only=True) + wm_in_defect = serializers.PrimaryKeyRelatedField(source='wm_in.defect', read_only=True) + wm_in_defect_name = serializers.CharField(source='wm_in.defect.name', read_only=True) + wm_in_state = serializers.IntegerField(source='wm_in.state', read_only=True) class Meta: model = Mlog @@ -317,6 +320,7 @@ class MlogbDetailSerializer(CustomModelSerializer): test_user_name = serializers.CharField(source='test_user.name', read_only=True) wm_in_defect = serializers.PrimaryKeyRelatedField(source='wm_in.defect', read_only=True) wm_in_defect_name = serializers.CharField(source='wm_in.defect.name', read_only=True) + wm_in_state = serializers.IntegerField(source='wm_in.state', read_only=True) class Meta: model = Mlogb @@ -370,6 +374,9 @@ class MlogSerializer(CustomModelSerializer): mlogdefect = MlogbDefectSerializer(many=True, required=False) mlogindefect = MlogbDefectSerializer(many=True, label="前道不良", required=False) + wm_in_defect = serializers.PrimaryKeyRelatedField(source='wm_in.defect', read_only=True) + wm_in_defect_name = serializers.CharField(source='wm_in.defect.name', read_only=True) + wm_in_state = serializers.IntegerField(source='wm_in.state', read_only=True) class Meta: model = Mlog fields = '__all__' diff --git a/apps/wpm/views.py b/apps/wpm/views.py index bbf07ae5..7eb091e5 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -274,6 +274,7 @@ class MlogViewSet(CustomModelViewSet): "material_out__process", "mgroup__process", "submit_user", + "wm_in__defect", ] # select_related_fields = ['create_by', 'update_by', 'mtask', 'mtaskb', 'mgroup', # 'handle_user', 'handle_user_2', 'equipment', 'mgroup__belong_dept',