From 29f4e2f76aafa79a82447dbcf60a19db94ed91a9 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 29 Dec 2025 15:09:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96mlog=5Fsubmit=20?=
 =?UTF-8?q?=E8=BF=94=E5=B7=A5=E5=90=8E=E4=BA=A7=E5=93=81=E6=94=BE=E5=9C=A8?=
 =?UTF-8?q?=E6=9C=AC=E5=B7=A5=E6=AE=B5=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wpm/services.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/wpm/services.py b/apps/wpm/services.py
index d560efc8..86d18917 100644
--- a/apps/wpm/services.py
+++ b/apps/wpm/services.py
@@ -172,13 +172,15 @@ def mlog_submit(mlog: Mlog, user: User, now: Union[datetime.datetime, None]):
     
     mgroup = mlog.mgroup
     process = mgroup.process
-    into_wm_mgroup = process.into_wm_mgroup
+    stored_mgroup = process.into_wm_mgroup
     need_store_notok = process.store_notok
     belong_dept = mgroup.belong_dept
     material_out: Material = mlog.material_out
     material_in: Material = mlog.material_in
     supplier = mlog.supplier  # 外协
     is_fix = mlog.is_fix
+    if is_fix: # 如果是返工，直接放到工段下
+        stored_mgroup = True
     m_ins_list = []
     m_ins_bl_list = []
 
@@ -275,8 +277,6 @@ def mlog_submit(mlog: Mlog, user: User, now: Union[datetime.datetime, None]):
                 
 
     mlogb_out_qs = Mlogb.objects.filter(mlog=mlog, material_out__isnull=False)
-    stored_mgroup = into_wm_mgroup
-    stored_notok = need_store_notok
     if mlogb_out_qs.exists():
         mlogb_out_qs = mlogb_out_qs.filter(need_inout=True)
         m_outs_list = [(mo.material_out, mo.batch if mo.batch else mlog.batch, mo.count_ok_full if mo.count_ok_full is not None else mo.count_ok, mlog.count_real_eweight, None, mo) for mo in mlogb_out_qs.all()]
@@ -339,7 +339,7 @@ def mlog_submit(mlog: Mlog, user: User, now: Union[datetime.datetime, None]):
             lookup['defect'] = notok_sign_or_defect
         elif notok_sign_or_defect is not None:
             lookup['notok_sign'] = notok_sign_or_defect
-        if into_wm_mgroup:
+        if stored_mgroup:
             lookup['mgroup'] = mgroup
         else:
             lookup['belong_dept'] = belong_dept
@@ -529,7 +529,6 @@ def mlog_revert(mlog: Mlog, user: User, now: Union[datetime.datetime, None]):
     # 再生成消耗
     m_ins_list = []
     m_ins_bl_list = []
-    into_wm_mgroup = process.into_wm_mgroup
     m_ins = Mlogb.objects.filter(mlog=mlog, material_in__isnull=False)
     if m_ins.exists():
         m_ins = m_ins.filter(need_inout=True)
@@ -553,7 +552,7 @@ def mlog_revert(mlog: Mlog, user: User, now: Union[datetime.datetime, None]):
         else:
             # 针对光子的情况，实际上必须需要wm_in
             lookup = {'batch': mi_batch, 'material': mi_ma, 'mgroup': None, 'state': WMaterial.WM_OK}
-            if into_wm_mgroup:
+            if stored_mgroup:
                 # 退回到本工段
                 lookup['mgroup'] = mgroup
             else: