From d131741f4b06496d203814a6147ed518bbefd044 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 25 Dec 2023 13:04:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20handover=E8=BF=94=E5=9B=9Ematerial=5Fna?= =?UTF-8?q?me?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/serializers.py | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index b832f875..4e6a503e 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -149,7 +149,8 @@ class SflogExpSerializer(CustomModelSerializer): class WMaterialSerializer(CustomModelSerializer): material_ = MaterialSimpleSerializer(source='material', read_only=True) - material_name = serializers.StringRelatedField(source='material', read_only=True) + material_name = serializers.StringRelatedField( + source='material', read_only=True) belong_dept_name = serializers.CharField( source='belong_dept.name', read_only=True) @@ -161,11 +162,13 @@ class WMaterialSerializer(CustomModelSerializer): class MlogbSerializer(CustomModelSerializer): material_out_ = MaterialSimpleSerializer( source='material_out', read_only=True) - material_out_name = serializers.StringRelatedField(source='material_out', read_only=True) + material_out_name = serializers.StringRelatedField( + source='material_out', read_only=True) class Meta: model = Mlogb - fields = ['id', 'material_out', 'count_ok', 'material_out_', 'material_out_name'] + fields = ['id', 'material_out', 'count_ok', + 'material_out_', 'material_out_name'] class MlogSerializer(CustomModelSerializer): @@ -185,16 +188,20 @@ class MlogSerializer(CustomModelSerializer): source='handover_mlog', read_only=True, many=True) material_out_ = MaterialSimpleSerializer( source='material_out', read_only=True) - material_out_name = serializers.StringRelatedField(source='material_out', read_only=True) - material_in_name = serializers.StringRelatedField(source='material_in', read_only=True) + material_out_name = serializers.StringRelatedField( + source='material_out', read_only=True) + material_in_name = serializers.StringRelatedField( + source='material_in', read_only=True) handle_user_name = serializers.CharField( source='handle_user.name', read_only=True) handle_user_2_name = serializers.CharField( source='handle_user_2.name', read_only=True) handle_leader_name = serializers.CharField( source='handle_leader.name', read_only=True) - equipment_name = serializers.StringRelatedField(source='equipment', read_only=True) - equipment_2_name = serializers.StringRelatedField(source='equipment_2', read_only=True) + equipment_name = serializers.StringRelatedField( + source='equipment', read_only=True) + equipment_2_name = serializers.StringRelatedField( + source='equipment_2', read_only=True) shift = serializers.PrimaryKeyRelatedField( label='班次ID', queryset=Shift.objects.all(), required=True) mgroup = serializers.PrimaryKeyRelatedField( @@ -305,6 +312,7 @@ class MlogRelatedSerializer(serializers.Serializer): class DeptBatchSerializer(serializers.Serializer): belong_dept_name = serializers.CharField(label='车间名称') + class HandoverSerializer(CustomModelSerializer): material = serializers.PrimaryKeyRelatedField( required=True, label='物料ID', queryset=Material.objects.all()) @@ -313,6 +321,8 @@ class HandoverSerializer(CustomModelSerializer): recive_user_name = serializers.CharField( source='recive_user.name', read_only=True) material_ = MaterialSimpleSerializer(source='material', read_only=True) + material_name = serializers.StringRelatedField( + source='material', read_only=True) def validate(self, attrs): if attrs.get('mlog', None):