From f34356057d6de3b31305ddb847c91b676167ed03 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 26 Sep 2025 10:33:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20mlog=20quick=E8=B7=B3=E8=BF=87=E5=88=9B?= =?UTF-8?q?=E5=BB=BAmlogbw?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/views.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/wpm/views.py b/apps/wpm/views.py index e2aaec22..2a3e46bd 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -484,7 +484,7 @@ class MlogViewSet(CustomModelViewSet): sr_2 = MlogbInSerializer(data=mlogbin_data) sr_2.is_valid(raise_exception=True) mlogbin = sr_2.save() - MlogbInViewSet.p_create_after(mlogbin) + MlogbInViewSet.p_create_after(mlogbin, skip_mlogbw=True) return Response({"mlog": str(mlog.id), "mlogbin": str(mlogbin.id)}) class HandoverViewSet(CustomModelViewSet): @@ -714,7 +714,7 @@ class MlogbInViewSet(BulkCreateModelMixin, BulkUpdateModelMixin, BulkDestroyMode mlog.cal_mlog_count_from_mlogb() @classmethod - def p_create_after(cls, mlogbin:Mlogb): + def p_create_after(cls, mlogbin:Mlogb, skip_mlogbw=False): mlogbin_parent:Mlogb = mlogbin.parent mlog:Mlog = mlogbin.mlog mgroup:Mgroup = mlog.mgroup @@ -744,8 +744,8 @@ class MlogbInViewSet(BulkCreateModelMixin, BulkUpdateModelMixin, BulkDestroyMode wm_in: WMaterial = mlogbin.wm_in if material_in.tracking == Material.MA_TRACKING_SINGLE: - if mlogbin.count_use == wm_in.count: # 自动创建mlogbw - for wpr in Wpr.objects.filter(wm=wm_in).order_by("number"): + if mlogbin.count_use == wm_in.count - wm_in.count_working and skip_mlogbw is False: # 自动创建mlogbw + for wpr in Wpr.objects.filter(wm=wm_in, wpr_mlogbw__mlogb__mlog__submit_time__isnull=True).order_by("number"): Mlogbw.objects.get_or_create(wpr=wpr, mlogb=mlogbin, defaults={"number": wpr.number}) # if qct is None: