From e9e9835b5d6bbb7d0b4628a901d946a0f96c038a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com> Date: Thu, 19 May 2022 15:46:21 +0800 Subject: [PATCH] =?UTF-8?q?OperationListSerializer=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/wpm/serializers.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hb_server/apps/wpm/serializers.py b/hb_server/apps/wpm/serializers.py index aab801d..911d318 100644 --- a/hb_server/apps/wpm/serializers.py +++ b/hb_server/apps/wpm/serializers.py @@ -287,14 +287,16 @@ class OperationListSerializer(serializers.ModelSerializer): 'subproduction_plan__production_plan', 'subproduction_plan__production_plan__product' ).annotate(count=Sum('count')) - ret = {} + rets = [] for i in qs: + ret = {} ret['plan'] = ProductionPlanSimpleSerializer(instance=ProductionPlan.objects.get( id= i['subproduction_plan__production_plan'])).data ret['product'] = MaterialSimpleSerializer(instance=Material.objects.get( id=i['subproduction_plan__production_plan__product'])).data ret['count'] = i['count'] - return ret + rets.append(ret) + return rets def get_count_work(self, obj):