apps/wpm/models.py

@@ -706,15 +706,12 @@ class BatchSt(BaseModel):
         unique_together = [("batch", "version")]
 
     @classmethod
-    def g_create(cls, batch:str, mio=None, mioitem=None, handover=None, mlog=None, material_start=None, check_mat_start=False, exclude_batchst_ids=[], check_batch_exist=False):
+    def g_create(cls, batch:str, mio=None, mioitem=None, handover=None, mlog=None, material_start=None, check_mat_start=False, exclude_batchst_ids=[]):
         """
         创建新的批次
         """
         if mioitem:
             mio = mioitem.mio
-        if check_batch_exist:
-            if cls.objects.filter(batch=batch).exclude(id__in=exclude_batchst_ids).exists():
-                raise ParseError(f"{batch}-该批次号已存在不可使用")
         node, created = cls.safe_get_or_create(batch=batch, version=1, defaults={
             "mio":mio, "mioitem":mioitem, "handover":handover, "mlog":mlog, "material_start":material_start})
         if not created and check_mat_start:

apps/wpm/serializers.py

@@ -1197,12 +1197,13 @@ class HandoverSerializer(CustomModelSerializer):
             attrs['type'] = Handover.H_NORMAL
         
         mtype = attrs["mtype"]
-
-        new_wm:WMaterial = attrs.get("new_wm", None)
-
+        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
+                new_state = new_wm.state
+                new_defect = new_wm.defect
                 if attrs["type"] == Handover.H_CHANGE:
                     attrs["material_changed"] = new_wm.material
                     attrs["state_changed"] = new_wm.state
@@ -1251,14 +1252,6 @@ class HandoverSerializer(CustomModelSerializer):
         #     raise ParseError('正常交接收料工段与送料工段不能相同')
         t_count = 0
         tracking = attrs["material"].tracking
-        
-        next_mat = None
-        next_state = None
-        next_defect = None
-        if new_wm:
-            next_mat = new_wm.material
-            next_state = new_wm.state
-            next_defect = new_wm.defect
         for ind, item in enumerate(attrs['handoverb']):
             if item["count"] > 0:
                 pass
@@ -1266,16 +1259,16 @@ class HandoverSerializer(CustomModelSerializer):
                 raise ParseError(f'第{ind+1}行-交接数量必须大于0')
             wm = item["wm"]
             if mtype == Handover.H_MERGE:
-                if next_mat is None:
-                    next_mat = wm.material
-                    next_state = wm.state
-                    next_defect = wm.defect
+                if new_state is None:
+                    new_mat = wm.material
+                    new_state = wm.state
+                    new_defect = wm.defect
                 else:
-                    if next_mat != wm.material:
+                    if new_mat != wm.material:
                         raise ParseError(f'第{ind+1}行-合并的物料不一致')
-                    if next_state != wm.state:
+                    if new_state != wm.state:
                         raise ParseError(f'第{ind+1}行-合并的物料状态不一致')
-                    if next_defect != wm.defect:
+                    if new_defect != wm.defect:
                         raise ParseError(f'第{ind+1}行-合并的物料缺陷不一致')
             if tracking == Material.MA_TRACKING_SINGLE:
                 handoverbw = item.get("handoverbw", [])

apps/wpm/services.py

@@ -727,15 +727,12 @@ def handover_submit(handover:Handover, user: User, now: Union[datetime.datetime,
     batches = []
     mids = []
     exclude_batchst_ids = []
-    check_batch_exist = False
     if mtype == Handover.H_MERGE:
         if new_batch:
             batches = [new_batch]
         else:
             raise ParseError("合并批次时请提供新批次号")
-        if handover.new_wm is None:
-            check_batch_exist = True
-        target_b, _ = BatchSt.g_create(batch=new_batch, handover=handover, material_start=material, check_batch_exist=check_batch_exist)
+        target_b, _ = BatchSt.g_create(batch=new_batch, handover=handover, material_start=material)
         exclude_batchst_ids.append(target_b.id)
     elif mtype == Handover.H_DIV:
         if handover.wm is None:
@@ -764,7 +761,6 @@ def handover_submit(handover:Handover, user: User, now: Union[datetime.datetime,
                 batches_to_limit.append(batch)
             target, _ = BatchSt.g_create(batch=batch, handover=handover, material_start=material)
             exclude_batchst_ids.append(target.id)
-            # 这里暂时忽略check_batch_exist，因为拆批一般不会重复
             BatchLog.g_create(source=source_b, target=target, handover=handover, relation_type="split")
         else:
             batch = wm_from.batch