diff --git a/apps/wpm/views.py b/apps/wpm/views.py index 1cf92d14..4efcaf80 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -208,8 +208,11 @@ class MlogViewSet(CustomModelViewSet): raise ParseError('该日志已提交!') if ins.mtask and ins.mtask.state == Mtask.MTASK_STOP: raise ParseError('该任务已停止!') - if ins.fill_way == Mlog.MLOG_STEP and not Mlogb.objects.filter(material_out__isnull=False).exists(): - raise ParseError('该日志未指定产出!') + if ins.fill_way == Mlog.MLOG_STEP: + if not Mlogb.objects.filter(material_out__isnull=False).exists(): + raise ParseError('该日志未指定产出!') + if not Mlogb.objects.filter(material_in__isnull=False).exists(): + raise ParseError('该日志未指定消耗!') with transaction.atomic(): mlog_submit(ins, self.request.user, now) vdata_new = MlogSerializer(ins).data