From 6d904341a0e92900a830562d39805044980265d8 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 17 Apr 2025 13:30:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BA=A4=E6=8E=A5=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=89=A9=E6=96=99=E6=98=AF=E5=90=A6=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wpm/serializers.py | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py
index febe52e6..5f728a50 100644
--- a/apps/wpm/serializers.py
+++ b/apps/wpm/serializers.py
@@ -952,9 +952,9 @@ class HandoverSerializer(CustomModelSerializer):
         if attrs["type"] == Handover.H_CHANGE:
             if "material_changed" not in attrs:
                 raise ParseError("必须指定改版后的物料")
-            
+        
+        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
@@ -992,15 +992,17 @@ class HandoverSerializer(CustomModelSerializer):
         tracking = attrs["material"].tracking
         for ind, item in enumerate(attrs['handoverb']):
             wm = item["wm"]
-            if mtype == Handover.H_MERGE:
-                if new_state is None:
-                    new_state = wm.state
-                    new_defect = wm.defect
-                else:
-                    if new_state != wm.state:
-                        raise ParseError(f'第{ind+1}行-合并的物料状态不一致')
-                    if new_defect != wm.defect:
-                        raise ParseError(f'第{ind+1}行-合并的物料缺陷不一致')
+            if new_state is None:
+                new_material = wm.material
+                new_state = wm.state
+                new_defect = wm.defect
+            else:
+                if new_material != wm.material:
+                    raise ParseError(f'第{ind+1}行-的物料不一致')
+                if new_state != wm.state:
+                    raise ParseError(f'第{ind+1}行-的物料状态不一致')
+                if new_defect != wm.defect:
+                    raise ParseError(f'第{ind+1}行-的物料缺陷不一致')
             if tracking == Material.MA_TRACKING_SINGLE:
                 handoverbw = item.get("handoverbw", [])
                 if handoverbw: