zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: handover返回material_name

This commit is contained in:
caoqianming 2023-12-25 13:04:37 +08:00
parent 4f318d823a
commit d131741f4b
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
apps/wpm/serializers.py
View File

@ -149,7 +149,8 @@ class SflogExpSerializer(CustomModelSerializer):
class WMaterialSerializer(CustomModelSerializer): class WMaterialSerializer(CustomModelSerializer):
material_ = MaterialSimpleSerializer(source='material', read_only=True) 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( belong_dept_name = serializers.CharField(
source='belong_dept.name', read_only=True) source='belong_dept.name', read_only=True)
@ -161,11 +162,13 @@ class WMaterialSerializer(CustomModelSerializer):
class MlogbSerializer(CustomModelSerializer): class MlogbSerializer(CustomModelSerializer):
material_out_ = MaterialSimpleSerializer( material_out_ = MaterialSimpleSerializer(
source='material_out', read_only=True) 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: class Meta:
model = Mlogb 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): class MlogSerializer(CustomModelSerializer):
@ -185,16 +188,20 @@ class MlogSerializer(CustomModelSerializer):
source='handover_mlog', read_only=True, many=True) source='handover_mlog', read_only=True, many=True)
material_out_ = MaterialSimpleSerializer( material_out_ = MaterialSimpleSerializer(
source='material_out', read_only=True) source='material_out', read_only=True)
material_out_name = serializers.StringRelatedField(source='material_out', read_only=True) material_out_name = serializers.StringRelatedField(
material_in_name = serializers.StringRelatedField(source='material_in', read_only=True) source='material_out', read_only=True)
material_in_name = serializers.StringRelatedField(
source='material_in', read_only=True)
handle_user_name = serializers.CharField( handle_user_name = serializers.CharField(
source='handle_user.name', read_only=True) source='handle_user.name', read_only=True)
handle_user_2_name = serializers.CharField( handle_user_2_name = serializers.CharField(
source='handle_user_2.name', read_only=True) source='handle_user_2.name', read_only=True)
handle_leader_name = serializers.CharField( handle_leader_name = serializers.CharField(
source='handle_leader.name', read_only=True) source='handle_leader.name', read_only=True)
equipment_name = serializers.StringRelatedField(source='equipment', read_only=True) equipment_name = serializers.StringRelatedField(
equipment_2_name = serializers.StringRelatedField(source='equipment_2', read_only=True) source='equipment', read_only=True)
equipment_2_name = serializers.StringRelatedField(
source='equipment_2', read_only=True)
shift = serializers.PrimaryKeyRelatedField( shift = serializers.PrimaryKeyRelatedField(
label='班次ID', queryset=Shift.objects.all(), required=True) label='班次ID', queryset=Shift.objects.all(), required=True)
mgroup = serializers.PrimaryKeyRelatedField( mgroup = serializers.PrimaryKeyRelatedField(
@ -305,6 +312,7 @@ class MlogRelatedSerializer(serializers.Serializer):
class DeptBatchSerializer(serializers.Serializer): class DeptBatchSerializer(serializers.Serializer):
belong_dept_name = serializers.CharField(label='车间名称') belong_dept_name = serializers.CharField(label='车间名称')
class HandoverSerializer(CustomModelSerializer): class HandoverSerializer(CustomModelSerializer):
material = serializers.PrimaryKeyRelatedField( material = serializers.PrimaryKeyRelatedField(
required=True, label='物料ID', queryset=Material.objects.all()) required=True, label='物料ID', queryset=Material.objects.all())
@ -313,6 +321,8 @@ class HandoverSerializer(CustomModelSerializer):
recive_user_name = serializers.CharField( recive_user_name = serializers.CharField(
source='recive_user.name', read_only=True) source='recive_user.name', read_only=True)
material_ = MaterialSimpleSerializer(source='material', read_only=True) material_ = MaterialSimpleSerializer(source='material', read_only=True)
material_name = serializers.StringRelatedField(
source='material', read_only=True)
def validate(self, attrs): def validate(self, attrs):
if attrs.get('mlog', None): if attrs.get('mlog', None):