feat: 物料编号允许非不同物料的重复

apps/wpm/views.py

@@ -763,9 +763,9 @@ class MlogbwViewSet(CustomModelViewSet):
 
 
         ftest = instance.ftest
+        instance.delete()
         if ftest:
             ftest.delete()
-        instance.delete()
         Mlogbw.cal_count_notok(mlogb)
 
         if need_cal_mlogb:

apps/wpmw/models.py

@@ -36,13 +36,17 @@ class Wpr(BaseModel):
                 wpr.delete()
                 return
         elif number:
-            # try:
+            try:
-            #     ins = cls.objects.get(number=number)
+                if wm:
-            #     raise ParseError(f"该物料编号{number}-已存在不可使用")
+                    ins = cls.objects.get(number=number, wm__material=wm.material)
-            # except cls.DoesNotExist:
+                elif mb:
-            # 创建
+                    ins = cls.objects.get(number=number, mb__material=mb.material)
-            ins = cls(number=number)
+                else:
-            ins.version = 0
+                    raise ParseError(f"该物料编号{number}-请指定ID")
+                raise ParseError(f"该物料编号{number}-已存在不可使用")
+            except cls.DoesNotExist:
+                ins = cls(number=number)
+                ins.version = 0
 
         if old_mb and ins.mb != old_mb:
             raise ParseError(f"请检查-{ins.number}-所属仓库批次")