fix: 生产日志提交时逻辑bug

This commit is contained in:
caoqianming 2023-10-19 14:05:16 +08:00
parent 80b2685417
commit 4a1996c4e9
2 changed files with 3 additions and 3 deletions

View File

@ -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()

View File

@ -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()