diff --git a/apps/mtm/serializers.py b/apps/mtm/serializers.py index b84114c8..04ee0381 100644 --- a/apps/mtm/serializers.py +++ b/apps/mtm/serializers.py @@ -172,26 +172,38 @@ class RouteSerializer(CustomModelSerializer): raise ParseError('未提供操作工序') return super().validate(attrs) - def gen_material_out(self, instance): + def gen_material_out(self, instance: Route): """ 自动形成物料 """ - name = f'{instance.material.name}' - material_out, _ = Material.objects.get_queryset(all=True).get_or_create(type=Material.MA_TYPE_HALFGOOD, parent=instance.material, process=instance.process, - defaults={'parent': instance.material, 'process': instance.process, - 'is_hidden': True, 'name': name, - 'number': instance.material.number, - 'specification': instance.material.specification, - 'model': instance.material.model, + material = instance.material + process = instance.process + material_out = Material.objects.get_queryset(all=True).filter(type=Material.MA_TYPE_HALFGOOD, parent=material, process=process).first() + if material_out: + material_out.is_deleted = False + material_out.save() + instance.material_out = material_out + instance.save() + return + material_out = Material.objects.get_queryset(all=True).filter(name=material.name, model=material.model, process=process).first() + if material_out: + material_out.is_deleted = False + material_out.save() + instance.material_out = material_out + instance.save() + return + material_out = Material.objects.create(**{'parent': instance.material, 'process': instance.process, + 'is_hidden': True, 'name': material.name, + 'number': material.number, + 'specification': material.specification, + 'model': material.model, 'type': Material.MA_TYPE_HALFGOOD, 'create_by': self.request.user, 'update_by': self.request.user, }) - if material_out.is_deleted: - material_out.is_deleted = False - material_out.save() instance.material_out = material_out instance.save() + return def create(self, validated_data): process = validated_data['process']