Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory

apps/wpm/serializers.py

@@ -1197,8 +1197,8 @@ class HandoverSerializer(CustomModelSerializer):
             attrs['type'] = Handover.H_NORMAL
         
         mtype = attrs["mtype"]
-        if mtype == Handover.H_MERGE:
         new_state = None
+        if mtype == Handover.H_MERGE:
             new_wm:WMaterial = attrs.get("new_wm", None)
             if new_wm:
                 attrs['new_batch'] = new_wm.batch