feat: 个到批时支持若是一个还是沿用原有批号
This commit is contained in:
parent
76adab1571
commit
76a48d46ee
|
@ -614,9 +614,15 @@ class MlogbInViewSet(CreateModelMixin, UpdateModelMixin, DestroyModelMixin, Cust
|
||||||
elif mtype == Process.PRO_DIV: # 切分 支持批到批,个到个, 个到批
|
elif mtype == Process.PRO_DIV: # 切分 支持批到批,个到个, 个到批
|
||||||
div_number = route.div_number
|
div_number = route.div_number
|
||||||
if material_in.tracking == Material.MA_TRACKING_SINGLE and material_out.tracking == Material.MA_TRACKING_BATCH:
|
if material_in.tracking == Material.MA_TRACKING_SINGLE and material_out.tracking == Material.MA_TRACKING_BATCH:
|
||||||
for mlogbwin in Mlogbw.objects.filter(mlogb=mlogbin).order_by("number"):
|
if Mlogbw.objects.filter(mlogb=mlogbin).count() == 1:
|
||||||
m_dict["batch"] = mlogbwin.number
|
mlogbwin = Mlogbw.objects.filter(mlogb=mlogbin).first()
|
||||||
Mlogb.objects.get_or_create(mlogbw_from=mlogbwin, defaults=update_dict(m_dict, {"count_real": div_number, "count_ok": div_number}))
|
mlogbout, _ = Mlogb.objects.get_or_create(mlogbw_from=mlogbwin, mlogb_from=mlogbin, defaults=update_dict(m_dict,{"count_real": div_number, "count_ok": div_number}))
|
||||||
|
mlogbout.count_json_from = mlogbin.count_json_from
|
||||||
|
mlogbout.save(update_fields=["count_json_from"])
|
||||||
|
else:
|
||||||
|
for mlogbwin in Mlogbw.objects.filter(mlogb=mlogbin).order_by("number"):
|
||||||
|
m_dict["batch"] = mlogbwin.number
|
||||||
|
Mlogb.objects.get_or_create(mlogbw_from=mlogbwin, defaults=update_dict(m_dict, {"count_real": div_number, "count_ok": div_number}))
|
||||||
elif material_in.tracking == Material.MA_TRACKING_SINGLE and material_out.tracking == Material.MA_TRACKING_SINGLE:
|
elif material_in.tracking == Material.MA_TRACKING_SINGLE and material_out.tracking == Material.MA_TRACKING_SINGLE:
|
||||||
d_count_real = mlogbin.count_use * div_number
|
d_count_real = mlogbin.count_use * div_number
|
||||||
d_count_ok = d_count_real
|
d_count_ok = d_count_real
|
||||||
|
|
Loading…
Reference in New Issue