diff --git a/apps/pm/services.py b/apps/pm/services.py index f5d11499..9771bc5f 100644 --- a/apps/pm/services.py +++ b/apps/pm/services.py @@ -125,11 +125,11 @@ class PmService: 锁定生产任务 """ from apps.wpm.models import Mlog - from apps.wpm.services import mlog_confirm, update_mtask_count + from apps.wpm.services import mlog_confirm, update_mtask for mtask in mtasks: mlogs = Mlog.objects.filter(mtask=mtask) for mlog in mlogs: mlog_confirm(mlog) - update_mtask_count(mtask) + update_mtask(mtask) mtask.state = Mtask.MTASK_DONE mtask.save() diff --git a/apps/pm/views.py b/apps/pm/views.py index f8a68709..be93b2e0 100644 --- a/apps/pm/views.py +++ b/apps/pm/views.py @@ -69,6 +69,6 @@ class MtaskViewSet(CustomModelViewSet): """ ids = request.data.get('ids', []) mtasks = Mtask.objects.filter( - id__in=ids, parent=None, state=Mtask.MTASK_ASSGINED) + id__in=ids, state=Mtask.MTASK_ASSGINED).exclude(parent=None) PmService.mtasks_submit(mtasks) return Response()