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',