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})