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

fix: handoverserializer 关于new_wm的处理3

This commit is contained in:
caoqianming 2025-12-17 15:47:25 +08:00
parent 07134f32bb
commit 7fc995c7c9
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/wpm/serializers.py
View File

@ -1199,20 +1199,17 @@ class HandoverSerializer(CustomModelSerializer):
mtype = attrs["mtype"] mtype = attrs["mtype"]
new_wm:WMaterial = attrs.get("new_wm", None) new_wm:WMaterial = attrs.get("new_wm", None)
if new_wm:
attrs['new_batch'] = new_wm.batch
if attrs["type"] == Handover.H_CHANGE:
attrs["material_changed"] = new_wm.material
attrs["state_changed"] = new_wm.state
if mtype == Handover.H_MERGE: if mtype == Handover.H_MERGE:
if new_wm:
attrs['new_batch'] = new_wm.batch
if attrs["type"] == Handover.H_CHANGE:
attrs["material_changed"] = new_wm.material
attrs["state_changed"] = new_wm.state
if not attrs.get("new_batch", None): if not attrs.get("new_batch", None):
raise ParseError("必须指定合并后的批次") raise ParseError("必须指定合并后的批次")
if 'undefined' in attrs['new_batch'] or 'null' in attrs['new_batch'] or '#' in attrs['new_batch']: if 'undefined' in attrs['new_batch'] or 'null' in attrs['new_batch'] or '#' in attrs['new_batch']:
raise ParseError("新批次号含有不允许信息!") raise ParseError("新批次号含有不允许信息!")
else:
attrs['new_batch'] = None
attrs['new_wm'] = None
if attrs["type"] == Handover.H_CHANGE: if attrs["type"] == Handover.H_CHANGE:
if "material_changed" in attrs and attrs["material_changed"]: if "material_changed" in attrs and attrs["material_changed"]: