zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: wmaterialserializer返回全名

This commit is contained in:
caoqianming 2023-12-22 13:47:59 +08:00
parent c80b486a00
commit 93de5ea879
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/wpm/serializers.py
View File

@ -149,6 +149,7 @@ class SflogExpSerializer(CustomModelSerializer):
class WMaterialSerializer(CustomModelSerializer): class WMaterialSerializer(CustomModelSerializer):
material_ = MaterialSimpleSerializer(source='material', read_only=True) material_ = MaterialSimpleSerializer(source='material', read_only=True)
material_name = serializers.StringRelatedField(source='material', read_only=True)
belong_dept_name = serializers.CharField( belong_dept_name = serializers.CharField(
source='belong_dept.name', read_only=True) source='belong_dept.name', read_only=True)
@ -304,7 +305,6 @@ class MlogRelatedSerializer(serializers.Serializer):
class DeptBatchSerializer(serializers.Serializer): class DeptBatchSerializer(serializers.Serializer):
belong_dept_name = serializers.CharField(label='车间名称') belong_dept_name = serializers.CharField(label='车间名称')
class HandoverSerializer(CustomModelSerializer): class HandoverSerializer(CustomModelSerializer):
material = serializers.PrimaryKeyRelatedField( material = serializers.PrimaryKeyRelatedField(
required=True, label='物料ID', queryset=Material.objects.all()) required=True, label='物料ID', queryset=Material.objects.all())

6
apps/wpm/views.py
View File

@ -112,15 +112,15 @@ class WMaterialViewSet(ListModelMixin, CustomGenericViewSet):
@action(methods=['post'], detail=False, perms_map={'post': '*'}, serializer_class=DeptBatchSerializer) @action(methods=['post'], detail=False, perms_map={'post': '*'}, serializer_class=DeptBatchSerializer)
@transaction.atomic @transaction.atomic
def batchs(self, request): def batchs(self, request):
"""获取车间出现过的批次号 """获取车间的批次号(废弃)
获取车间出现过的批次号 获取车间的批次号
""" """
sr = DeptBatchSerializer(data=request.data) sr = DeptBatchSerializer(data=request.data)
sr.is_valid(raise_exception=True) sr.is_valid(raise_exception=True)
vdata = sr.validated_data vdata = sr.validated_data
batchs = WMaterial.objects.filter( 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)) return Response(list(batchs))