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

fix: handovermerge时new_state未定义
2025-12-17 14:11:00 +08:00 · 2025-12-17 14:10:59 +08:00
1 changed files with 1 additions and 1 deletions
--- a/apps/wpm/serializers.py
+++ b/apps/wpm/serializers.py
@ -1197,8 +1197,8 @@ class HandoverSerializer(CustomModelSerializer):
            attrs['type'] = Handover.H_NORMAL
        
        mtype = attrs["mtype"]
+        new_state = None
        if mtype == Handover.H_MERGE:
-            new_state = None
            new_wm:WMaterial = attrs.get("new_wm", None)
            if new_wm:
                attrs['new_batch'] = new_wm.batch
Author	SHA1	Message	Date
caoqianming	57459cc7dc	Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory	2025-12-17 14:11:00 +08:00
caoqianming	ec7b0cd987	fix: handovermerge时new_state未定义	2025-12-17 14:10:59 +08:00