From 84723967dca2a16e5c0eb16ff5ff45e09fef9048 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 6 Jan 2025 10:33:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20mlogbin=E5=88=9B=E5=BB=BAmlogbw=E7=9A=84?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/views.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/apps/wpm/views.py b/apps/wpm/views.py index 04641e7e..32a30149 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -499,14 +499,15 @@ class MlogbInViewSet(CreateModelMixin, UpdateModelMixin, DestroyModelMixin, Cust "material_ofrom": wm_in.material_ofrom}) mlogbin.mlogb_to = mlogbout mlogbin.save() - if material_out.tracking == Material.MA_TRACKING_SINGLE: - if material_in.tracking == Material.MA_TRACKING_SINGLE: - if mlogbin.count_use == wm_in.count: # 自动创建mlogbw - # 先暂时不考虑合并与拆分 - mlogbout.count_real = wm_in.count - mlogbout.save() - for wpr in Wpr.objects.filter(wm=wm_in).order_by("number"): - Mlogbw.objects.get_or_create(wpr=wpr, mlogb=mlogbin, defaults={"number": wpr.number}) + if material_in.tracking == Material.MA_TRACKING_SINGLE: + if mlogbin.count_use == wm_in.count: # 自动创建mlogbw + # 先暂时不考虑合并与拆分 + mlogbout.count_real = wm_in.count + mlogbout.save() + m_out_t = material_out.tracking + for wpr in Wpr.objects.filter(wm=wm_in).order_by("number"): + Mlogbw.objects.get_or_create(wpr=wpr, mlogb=mlogbin, defaults={"number": wpr.number}) + if m_out_t == Material.MA_TRACKING_SINGLE: Mlogbw.objects.get_or_create(wpr=wpr, mlogb=mlogbout, defaults={"number": wpr.number})