From ee3dc6a5a2d937ffa650ab0bc7e3000b0a0d9dad Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 10 Jan 2025 14:30:04 +0800
Subject: [PATCH] feat: mlog revert bug

---
 apps/wpm/services.py | 4 ++--
 apps/wpmw/models.py  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/wpm/services.py b/apps/wpm/services.py
index 124617b8..600e24d0 100644
--- a/apps/wpm/services.py
+++ b/apps/wpm/services.py
@@ -230,8 +230,8 @@ def mlog_submit(mlog: Mlog, user: User, now: Union[datetime.datetime, None]):
         into_wm_mgroup = material_out.process.into_wm_mgroup if material_out.process else False
         need_store_notok = material_out.process.store_notok if material_out.process else False
         m_outs = Mlogb.objects.filter(mlog=mlog, material_out__isnull=False)
-        stored_notok = False
-        stored_mgroup = False
+        stored_notok = need_store_notok
+        stored_mgroup = need_store_notok
         if m_outs.exists(): 
             m_outs_list = [(mo.material_out, mo.batch if mo.batch else mlog.batch, mo.count_ok, mlog.count_real_eweight, None, mo) for mo in m_outs.all()]
             if need_store_notok:
diff --git a/apps/wpmw/models.py b/apps/wpmw/models.py
index 82bd126b..b032f930 100644
--- a/apps/wpmw/models.py
+++ b/apps/wpmw/models.py
@@ -52,6 +52,7 @@ class Wpr(BaseModel):
         ins.wm = wm
         if wm:
             ins.material = wm.material
+            ins.state = wm.state
         ins.save()
         if ftest: # 通过检验变更其缺陷项
             WprDefect.objects.filter(wpr=ins).delete()