From cb595711feafd10281c7ce6817dadd24ebd24b26 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 21 Jan 2022 08:59:06 +0800 Subject: [PATCH 1/2] wpm wproduct list bug --- hb_server/apps/wpm/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'] From 50ed7ea9ecc4459f52015d6fca6c2396c4d4914f Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 21 Jan 2022 10:34:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?order=20create=20=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E4=B8=8D=E5=BF=85=E8=BE=93=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/sam/serializers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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__'