diff --git a/hb_server/apps/sam/serializers.py b/hb_server/apps/sam/serializers.py index db2117e..154b1e7 100644 --- a/hb_server/apps/sam/serializers.py +++ b/hb_server/apps/sam/serializers.py @@ -44,7 +44,7 @@ class ContractCreateUpdateSerializer(serializers.ModelSerializer): class OrderCreateUpdateSerializer(serializers.ModelSerializer): class Meta: model = Order - fields = ['number', 'customer', 'contract', 'product', 'count', 'delivery_date'] + fields = ['customer', 'contract', 'product', 'count', 'delivery_date'] def create(self, validated_data): validated_data['number'] = 'DD' + ranstr(7) @@ -60,6 +60,7 @@ class OrderSerializer(serializers.ModelSerializer): class OrderSimpleSerializer(serializers.ModelSerializer): contract_ = ContractSimpleSerializer(source='contract', read_only=True) + customer_ = CustomerSimpleSerializer(source='customer', read_only=True) class Meta: model = Order fields = '__all__' diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py index 47c49dc..e300f40 100644 --- a/hb_server/apps/wpm/views.py +++ b/hb_server/apps/wpm/views.py @@ -148,7 +148,7 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet): """ perms_map = {'*': '*'} queryset = WProduct.objects.select_related('step', 'material', - 'subproduction_plan', 'warehouse', 'order').prefetch_related('wproduct_child') + 'subproduction_plan', 'warehouse', 'to_order').prefetch_related('wproduct_child') serializer_class = WProductListSerializer filterset_class = WProductFilterSet search_fields = ['number']