diff --git a/hb_server/apps/pm/services.py b/hb_server/apps/pm/services.py index a3771c9..0b6894d 100644 --- a/hb_server/apps/pm/services.py +++ b/hb_server/apps/pm/services.py @@ -10,11 +10,11 @@ class PmService: """ ret = {} subplans = SubProductionPlan.objects.filter(production_plan=plan, is_deleted=False) - qs = subplans.values('process', 'process__name', 'process_number').annotate(count=Sum('main_count'), + qs = subplans.values('process', 'process__name', 'process__number').annotate(count=Sum('main_count'), count_real=Sum('main_count_real'), count_ok=Sum('main_count_ok')) qs_list = list(qs) for i in qs_list: - ret[i['process_number']] = { + ret[i['process__number']] = { 'count':i['count'], 'count_real':i['count_real'], 'count_ok':i['count_ok'],