From 6ad6670a9092890e501dbe7524cf3dff48f14a13 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 28 Feb 2025 17:06:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20mlogbdetail=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BF=94=E5=9B=9Emlogbdefect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/serializers.py | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index 633aa545..0ba2f91b 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -216,15 +216,6 @@ class MlogbSerializer(CustomModelSerializer): extra_kwargs = { 'material_out': {'required': True, 'allow_null': False}} -class MlogbDetailSerializer(CustomModelSerializer): - material_out_name = serializers.StringRelatedField( - source='material_out', read_only=True) - material_in_name = serializers.StringRelatedField(source='material_in', read_only=True) - material_out_tracking = serializers.IntegerField(source="material_out.tracking", read_only=True) - - class Meta: - model = Mlogb - fields = '__all__' class MlogListSerializer(CustomModelSerializer): mstate_json = serializers.JSONField(source='mgroup.process.mstate_json', read_only=True) @@ -270,6 +261,24 @@ class MlogListSerializer(CustomModelSerializer): model = Mlog fields = '__all__' +class MlogbDefectSerializer(CustomModelSerializer): + defect_name = serializers.CharField(source="defect.name", read_only=True) + class Meta: + model = MlogbDefect + fields = ["id", "defect_name", "count", "mlogb", "defect"] + + +class MlogbDetailSerializer(CustomModelSerializer): + material_out_name = serializers.StringRelatedField( + source='material_out', read_only=True) + material_in_name = serializers.StringRelatedField(source='material_in', read_only=True) + material_out_tracking = serializers.IntegerField(source="material_out.tracking", read_only=True) + mlogbdefect = MlogbDefectSerializer(many=True, read_only=True) + + class Meta: + model = Mlogb + fields = '__all__' + class MlogSerializer(CustomModelSerializer): mstate_json = serializers.JSONField(source='mgroup.process.mstate_json', read_only=True) supplier_name = serializers.CharField(source='supplier.name', read_only=True) @@ -688,12 +697,6 @@ class MlogbwCreateUpdateSerializer(CustomModelSerializer): mlogbw = self.save_ftest(mlogbw, ftest_data) return mlogbw -class MlogbDefectSerializer(CustomModelSerializer): - defect_name = serializers.CharField(source="defect.name", read_only=True) - class Meta: - model = MlogbDefect - fields = ["id", "defect_name", "count", "mlogb", "defect"] - class MlogbOutUpdateSerializer(CustomModelSerializer): mlogbdefect = MlogbDefectSerializer(many=True, required=False)