From f58b84a4ee8441a673fd8b69b35b5ebd4078b4eb Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 13 Mar 2025 17:37:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=89=A9=E6=96=99=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E9=9D=9E=E4=B8=8D=E5=90=8C=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E7=9A=84=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wpm/views.py   |  2 +-
 apps/wpmw/models.py | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/apps/wpm/views.py b/apps/wpm/views.py
index 0130b031..774809b3 100644
--- a/apps/wpm/views.py
+++ b/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:
diff --git a/apps/wpmw/models.py b/apps/wpmw/models.py
index 63920dd8..5fbd25aa 100644
--- a/apps/wpmw/models.py
+++ b/apps/wpmw/models.py
@@ -36,13 +36,17 @@ class Wpr(BaseModel):
                 wpr.delete()
                 return
         elif number:
-            # try:
-            #     ins = cls.objects.get(number=number)
-            #     raise ParseError(f"该物料编号{number}-已存在不可使用")
-            # except cls.DoesNotExist:
-            # 创建
-            ins = cls(number=number)
-            ins.version = 0
+            try:
+                if wm:
+                    ins = cls.objects.get(number=number, wm__material=wm.material)
+                elif mb:
+                    ins = cls.objects.get(number=number, mb__material=mb.material)
+                else:
+                    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}-所属仓库批次")