From 93de5ea879efde104630df71bdb95d1d5a1564d1 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 22 Dec 2023 13:47:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20wmaterialserializer=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=85=A8=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/serializers.py | 2 +- apps/wpm/views.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index 2e32adab..b832f875 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -149,6 +149,7 @@ class SflogExpSerializer(CustomModelSerializer): class WMaterialSerializer(CustomModelSerializer): material_ = MaterialSimpleSerializer(source='material', read_only=True) + material_name = serializers.StringRelatedField(source='material', read_only=True) belong_dept_name = serializers.CharField( source='belong_dept.name', read_only=True) @@ -304,7 +305,6 @@ class MlogRelatedSerializer(serializers.Serializer): class DeptBatchSerializer(serializers.Serializer): belong_dept_name = serializers.CharField(label='车间名称') - class HandoverSerializer(CustomModelSerializer): material = serializers.PrimaryKeyRelatedField( required=True, label='物料ID', queryset=Material.objects.all()) diff --git a/apps/wpm/views.py b/apps/wpm/views.py index 91a7703d..d8290f19 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -112,15 +112,15 @@ class WMaterialViewSet(ListModelMixin, CustomGenericViewSet): @action(methods=['post'], detail=False, perms_map={'post': '*'}, serializer_class=DeptBatchSerializer) @transaction.atomic def batchs(self, request): - """获取车间出现过的批次号 + """获取车间的批次号(废弃) - 获取车间出现过的批次号 + 获取车间的批次号 """ sr = DeptBatchSerializer(data=request.data) sr.is_valid(raise_exception=True) vdata = sr.validated_data batchs = WMaterial.objects.filter( - belong_dept__name=vdata['belong_dept_name']).values_list('batch', flat=True).distinct() + belong_dept__name=vdata['belong_dept_name'], count__gt=0).values_list('batch', flat=True).distinct() return Response(list(batchs))