From 6efcf19716ec9b1295e4ee4829e1ecc1154a8f85 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 1 Aug 2024 15:15:00 +0800 Subject: [PATCH 1/2] fix: mlog_revert bug --- apps/wpm/services.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/wpm/services.py b/apps/wpm/services.py index a20d11f9..7da15c62 100644 --- a/apps/wpm/services.py +++ b/apps/wpm/services.py @@ -365,7 +365,7 @@ def mlog_revert(mlog: Mlog, user: User, now: Union[datetime.datetime, None]): list_m = Mlogb.objects.filter(mlog=mlog).values_list('mtask__id', flat=True).distinct() update_mtaskIds += list(list_m) if update_mtaskIds: - Mtask.objects.filter(id__in=update_mtaskIds, state=Mtask.MTASK_SUBMIT).update(status=Mtask.MTASK_ASSGINED) + Mtask.objects.filter(id__in=update_mtaskIds, state=Mtask.MTASK_SUBMIT).update(state=Mtask.MTASK_ASSGINED) def cal_mlog_count_from_mlogb(mlog: Mlog): From cbe516ccf53b7ac59bda1bdad4d9eb4ffee57007 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 1 Aug 2024 15:25:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20handover=20submit=E6=97=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/services.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/wpm/services.py b/apps/wpm/services.py index 7da15c62..66f416f7 100644 --- a/apps/wpm/services.py +++ b/apps/wpm/services.py @@ -511,11 +511,11 @@ def handover_submit(handover: Handover, user: User, now: Union[datetime.datetime wm_from.save() if need_add: if handover.recive_mgroup: - # 处理返工交接 if handover.type == Handover.H_NORMAL: - wm_to, _ = WMaterial.objects.get_or_create(batch=batch, material=material, mgroup=handover.recive_mgroup, defaults={ + wm_to, _ = WMaterial.objects.get_or_create(batch=batch, material=material, mgroup=handover.recive_mgroup, material_origin=None, defaults={ 'batch': batch, 'material': material, 'mgroup': handover.recive_mgroup, 'belong_dept': handover.recive_dept }) + # 处理返工交接 elif handover.type == Handover.H_REPAIR: wm_to, _ = WMaterial.objects.get_or_create( batch=batch,