zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/pm/services.py
View File

@ -125,11 +125,11 @@ class PmService:
锁定生产任务 锁定生产任务
""" """
from apps.wpm.models import Mlog 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: for mtask in mtasks:
mlogs = Mlog.objects.filter(mtask=mtask) mlogs = Mlog.objects.filter(mtask=mtask)
for mlog in mlogs: for mlog in mlogs:
mlog_confirm(mlog) mlog_confirm(mlog)
update_mtask_count(mtask) update_mtask(mtask)
mtask.state = Mtask.MTASK_DONE mtask.state = Mtask.MTASK_DONE
mtask.save() mtask.save()

2
apps/pm/views.py
View File

@ -69,6 +69,6 @@ class MtaskViewSet(CustomModelViewSet):
""" """
ids = request.data.get('ids', []) ids = request.data.get('ids', [])
mtasks = Mtask.objects.filter( 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) PmService.mtasks_submit(mtasks)
return Response() return Response()