diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index b2b75406..968ae690 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -1199,20 +1199,17 @@ class HandoverSerializer(CustomModelSerializer): mtype = attrs["mtype"] 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 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): raise ParseError("必须指定合并后的批次") if 'undefined' in attrs['new_batch'] or 'null' in attrs['new_batch'] or '#' in attrs['new_batch']: raise ParseError("新批次号含有不允许信息!") - else: - attrs['new_batch'] = None - attrs['new_wm'] = None if attrs["type"] == Handover.H_CHANGE: if "material_changed" in attrs and attrs["material_changed"]: