From c3cb7e36dc76351ce8825b49176a76ffd89246d8 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 8 Oct 2021 17:00:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=94=9F=E6=88=90=E8=AE=A1?= =?UTF-8?q?=E5=88=92bug-=E4=BA=A7=E5=93=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/pm/serializers.py | 2 ++ hb_server/apps/pm/views.py | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hb_server/apps/pm/serializers.py b/hb_server/apps/pm/serializers.py index 6fc6e31..e3975c1 100644 --- a/hb_server/apps/pm/serializers.py +++ b/hb_server/apps/pm/serializers.py @@ -1,6 +1,7 @@ from apps.pm.models import ProductionPlan from rest_framework import serializers from apps.sam.serializers import OrderSerializer +from apps.mtm.serializers import MaterialSimpleSerializer class ProductionPlanCreateFromOrderSerializer(serializers.ModelSerializer): @@ -10,6 +11,7 @@ class ProductionPlanCreateFromOrderSerializer(serializers.ModelSerializer): class ProductionPlanSerializer(serializers.ModelSerializer): order_ = OrderSerializer(source='order', read_only=True) + product_ = MaterialSimpleSerializer(source='product', read_only=True) class Meta: model = ProductionPlan fields ='__all__' diff --git a/hb_server/apps/pm/views.py b/hb_server/apps/pm/views.py index 4745835..25509dc 100644 --- a/hb_server/apps/pm/views.py +++ b/hb_server/apps/pm/views.py @@ -25,7 +25,7 @@ class ProductionPlanViewSet(CreateUpdateModelAMixin, ListModelMixin, CreateModel 生产计划 """ perms_map = {'*': '*'} - queryset = ProductionPlan.objects.select_related('order', 'order__contract') + queryset = ProductionPlan.objects.select_related('order', 'order__contract', 'product') serializer_class = ProductionPlanSerializer search_fields = ['number'] filterset_fields = [] @@ -47,6 +47,6 @@ class ProductionPlanViewSet(CreateUpdateModelAMixin, ListModelMixin, CreateModel pass else: raise APIException('排产数量错误') - instance = serializer.save() - updateOrderPlanedCount(instance.order) + instance = serializer.save(create_by=request.user, product=order.product) + updateOrderPlanedCount(instance.order) return Response() \ No newline at end of file