From 03d6a6c99fe386d679e7847a37c1e3bbba883af1 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 27 Dec 2023 09:03:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20mtask=5Fsubmit=E6=97=B6=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E9=87=8D=E5=A4=8D=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/pm/services.py | 2 +- apps/wpm/services.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/pm/services.py b/apps/pm/services.py index 16a6af8e..b65c6daa 100644 --- a/apps/pm/services.py +++ b/apps/pm/services.py @@ -261,7 +261,7 @@ class PmService: from apps.wpm.services import mlog_submit, update_mtask now = timezone.now() if mtask.state == Mtask.MTASK_ASSGINED: - mlogs = Mlog.objects.filter(mtask=mtask) + mlogs = Mlog.objects.filter(mtask=mtask, submit_time=None) if mlogs.count() == 0: raise ParseError(f'{mtask.mgroup.name}_未填写日志') for mlog in mlogs: diff --git a/apps/wpm/services.py b/apps/wpm/services.py index 0e4a5b75..4ee8af54 100644 --- a/apps/wpm/services.py +++ b/apps/wpm/services.py @@ -140,6 +140,8 @@ def mlog_submit(mlog: Mlog, user: User, now: Union[datetime.datetime, None]): """ 生产日志提交后需要执行的操作 """ + if mlog.submit_time is not None: + return if now is None: now = timezone.now() if now.date() < mlog.handle_date: @@ -186,6 +188,8 @@ def mlog_submit(mlog: Mlog, user: User, now: Union[datetime.datetime, None]): def mlog_revert(mlog: Mlog, user: User, now: Union[datetime.datetime, None]): """日志撤回 """ + if mlog.submit_time is None: + return if now is None: now = timezone.now() belong_dept = mlog.mgroup.belong_dept