From dd77d842d9b57110340dcd5723725c39183ce91f Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 23 Feb 2022 09:36:44 +0800 Subject: [PATCH] =?UTF-8?q?pack=20get=20=E8=BF=94=E5=9B=9E=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/mtm/serializers.py | 2 +- hb_server/apps/sam/serializers_sale.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hb_server/apps/mtm/serializers.py b/hb_server/apps/mtm/serializers.py index b3e3b71..942ae3b 100644 --- a/hb_server/apps/mtm/serializers.py +++ b/hb_server/apps/mtm/serializers.py @@ -44,7 +44,7 @@ class PackItemUpdateSerializer(serializers.ModelSerializer): class MaterialSimpleSerializer(serializers.ModelSerializer): class Meta: model = Material - fields = ['id', 'name', 'number', 'unit','specification', 'type'] + fields = ['id', 'name', 'number', 'unit','specification', 'type', 'count', 'count_safe'] class PackItemDetailSerializer(serializers.ModelSerializer): material_ = MaterialSimpleSerializer(source='material', read_only=True) diff --git a/hb_server/apps/sam/serializers_sale.py b/hb_server/apps/sam/serializers_sale.py index 04434fc..a3606b5 100644 --- a/hb_server/apps/sam/serializers_sale.py +++ b/hb_server/apps/sam/serializers_sale.py @@ -77,7 +77,7 @@ class SaleProductPackDetailSerializer(serializers.ModelSerializer): detail = serializers.SerializerMethodField() class Meta: model = SaleProduct - fields = ['packnum', 'detail'] + fields = ['packnum', 'detail', 'remark'] def get_detail(self, obj): return SPackItemSerializer(instance=SalePack.objects.filter(sale_product=obj) @@ -91,4 +91,4 @@ class SaleProductPackSerializer(serializers.ModelSerializer): detail = SPackItemCreateSerializer(many=True) class Meta: model = SaleProduct - fields = ['packnum', 'detail'] + fields = ['packnum', 'detail', 'remark']