From 3810860f13e40364814480a7c6659b8ed5798e99 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 25 Aug 2025 11:17:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20mlogbw=20create=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/views.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/apps/wpm/views.py b/apps/wpm/views.py index a1453925..559b9227 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -911,8 +911,11 @@ class MlogbwViewSet(CustomModelViewSet): if route.process.mtype == Process.PRO_NORMAL: Mlogbw.objects.get_or_create(mlogb=mlogb, wpr=ins.wpr, defaults={"number": ins.number, "mlogbw_from": ins}) elif route.process.mtype == Process.PRO_DIV: - for i in range(route.div_number): - Mlogbw.objects.get_or_create(mlogb=mlogb, number=f'{ins.number}-{i+1}', defaults={"mlogbw_from": ins}) + if route.div_number == 1: + Mlogbw.objects.get_or_create(wpr=ins.wpr, mlogb=mlogb, defaults={"number": ins.wpr.number, "mlogbw_from": ins}) + else: + for i in range(route.div_number): + Mlogbw.objects.get_or_create(mlogb=mlogb, number=f'{ins.number}-{i+1}', defaults={"mlogbw_from": ins}) Mlogbw.cal_count_notok(mlogb) elif mtype == Process.PRO_DIV: mlogbin = ins.mlogb @@ -931,8 +934,11 @@ class MlogbwViewSet(CustomModelViewSet): } mlogbout, _ = Mlogb.objects.get_or_create(mlogbw_from=ins, defaults=m_dict) if material_out.tracking == Material.MA_TRACKING_SINGLE: - for i in range(div_number): - Mlogbw.objects.get_or_create(mlogb=mlogbout, number=f"{ins.number}-{i+1}", defaults={"mlogbw_from": ins}) + if div_number == 1: + Mlogbw.objects.get_or_create(wpr=ins.wpr, mlogb=mlogbout, defaults={"number": ins.wpr.number, "mlogbw_from": ins}) + else: + for i in range(div_number): + Mlogbw.objects.get_or_create(mlogb=mlogbout, number=f"{ins.number}-{i+1}", defaults={"mlogbw_from": ins}) Mlogbw.cal_count_notok(mlogbout) elif material_out.tracking == Material.MA_TRACKING_BATCH: number_from = mlogbout.number_from