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

feat: wm增加查询条件

This commit is contained in:
caoqianming 2023-12-01 11:33:23 +08:00
parent c827c7d55d
commit dc47570a5b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/mtm/serializers.py
View File

@ -15,10 +15,12 @@ class ShiftSerializer(CustomModelSerializer):
class MaterialSimpleSerializer(CustomModelSerializer): class MaterialSimpleSerializer(CustomModelSerializer):
process_name = serializers.CharField(source='process.name', read_only=True)
class Meta: class Meta:
model = Material model = Material
fields = ['id', 'name', 'number', 'model', fields = ['id', 'name', 'number', 'model',
'specification', 'type', 'cate', 'brothers'] 'specification', 'type', 'cate', 'brothers', 'process_name']
class MaterialSerializer(CustomModelSerializer): class MaterialSerializer(CustomModelSerializer):

2
apps/wpm/views.py
View File

@ -102,7 +102,7 @@ class WMaterialViewSet(ListModelMixin, CustomGenericViewSet):
perms_map = {'get': '*'} perms_map = {'get': '*'}
queryset = WMaterial.objects.all() queryset = WMaterial.objects.all()
serializer_class = WMaterialSerializer serializer_class = WMaterialSerializer
select_related_fields = ['material', 'belong_dept'] select_related_fields = ['material', 'belong_dept', 'material__process']
search_fields = ['material__name', search_fields = ['material__name',
'material__number', 'material__specification'] 'material__number', 'material__specification']
filterset_class = WMaterialFilter filterset_class = WMaterialFilter