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

Merge branch 'erp1'

This commit is contained in:
caoqianming 2024-07-29 17:24:42 +08:00
parent 93d26ec100 e853fe33b1
commit f5c22d460b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/mtm/serializers.py
View File

@ -182,6 +182,10 @@ class RouteSerializer(CustomModelSerializer):
material_out = Material.objects.get_queryset(all=True).filter(type=Material.MA_TYPE_HALFGOOD, parent=material, process=process).first() material_out = Material.objects.get_queryset(all=True).filter(type=Material.MA_TYPE_HALFGOOD, parent=material, process=process).first()
if material_out: if material_out:
material_out.is_deleted = False material_out.is_deleted = False
if material_out.parent == material:
material_out.name = material.name
material_out.model = material.model
material_out.specification = material.specification
material_out.save() material_out.save()
instance.material_out = material_out instance.material_out = material_out
instance.save() instance.save()
@ -189,6 +193,8 @@ class RouteSerializer(CustomModelSerializer):
material_out = Material.objects.get_queryset(all=True).filter(name=material.name, model=material.model, process=process, specification=material.specification).first() material_out = Material.objects.get_queryset(all=True).filter(name=material.name, model=material.model, process=process, specification=material.specification).first()
if material_out: if material_out:
material_out.is_deleted = False material_out.is_deleted = False
if material_out.parent is None:
material_out.parent = material
material_out.save() material_out.save()
instance.material_out = material_out instance.material_out = material_out
instance.save() instance.save()