From c5a7a19f745be76a9f64b64cec551ed94b1327ba Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 28 Apr 2025 14:12:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B0=9D=E8=AF=95=E4=BB=8E=E4=B8=AA?= =?UTF-8?q?=E5=8F=B7=E8=BF=BD=E8=B8=AA=E5=88=B0=E5=8E=86=E5=8F=B2=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=9A=84=E4=B8=AA=E5=8F=B72?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/services.py | 15 ++++++++++----- apps/wpm/views.py | 7 ++++--- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/apps/wpm/services.py b/apps/wpm/services.py index a5126879..c4274799 100644 --- a/apps/wpm/services.py +++ b/apps/wpm/services.py @@ -802,7 +802,8 @@ def handover_submit(handover:Handover, user: User, now: Union[datetime.datetime, defaults={ "batch_ofrom": wm_from.batch_ofrom, "material_ofrom": wm_from.material_ofrom, - "create_by": user + "create_by": user, + "number_from": wm_from.number_from } ) elif handover.type == Handover.H_REPAIR: @@ -825,7 +826,8 @@ def handover_submit(handover:Handover, user: User, now: Union[datetime.datetime, defaults={ "batch_ofrom": wm_from.batch_ofrom, "material_ofrom": wm_from.material_ofrom, - "create_by": user + "create_by": user, + "number_from": wm_from.number_from } ) else: @@ -857,7 +859,8 @@ def handover_submit(handover:Handover, user: User, now: Union[datetime.datetime, defaults={ "batch_ofrom": wm_from.batch_ofrom, "material_ofrom": wm_from.material_ofrom, - "create_by": user + "create_by": user, + "number_from": wm_from.number_from } ) else: @@ -876,7 +879,8 @@ def handover_submit(handover:Handover, user: User, now: Union[datetime.datetime, defaults={ "batch_ofrom": wm_from.batch_ofrom, "material_ofrom": wm_from.material_ofrom, - "create_by": user + "create_by": user, + "number_from": wm_from.number_from } ) else: @@ -896,7 +900,8 @@ def handover_submit(handover:Handover, user: User, now: Union[datetime.datetime, defaults={ "batch_ofrom": wm_from.batch_ofrom, "material_ofrom": wm_from.material_ofrom, - "create_by": user + "create_by": user, + "number_from": wm_from.number_from } ) else: diff --git a/apps/wpm/views.py b/apps/wpm/views.py index fcc012f7..2277e10e 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -617,14 +617,15 @@ class MlogbInViewSet(CreateModelMixin, UpdateModelMixin, DestroyModelMixin, Cust if Mlogbw.objects.filter(mlogb=mlogbin).count() == 1: mlogbwin = Mlogbw.objects.filter(mlogb=mlogbin).first() 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.number_from = mlogbwin.number - mlogbout.save(update_fields=["count_json_from"]) + mlogbout.save(update_fields=["number_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})) + mlogbout, _ = Mlogb.objects.get_or_create(mlogbw_from=mlogbwin, defaults=update_dict(m_dict, {"count_real": div_number, "count_ok": div_number})) + mlogbout.number_from = mlogbwin.number + mlogbout.save(update_fields=["number_from"]) 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_ok = d_count_real