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

feat: wmaterial增加来源批次和物料

This commit is contained in:
caoqianming 2025-03-19 13:35:27 +08:00
parent b9b418e81f
commit da084e21cb
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/wpm/serializers.py
View File

@ -187,6 +187,7 @@ class WMaterialSerializer(CustomModelSerializer):
mgroup_name = serializers.StringRelatedField(source='mgroup.name', read_only=True) mgroup_name = serializers.StringRelatedField(source='mgroup.name', 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)
material_ofrom_name = serializers.StringRelatedField(source='material_ofrom', read_only=True)
material_origin_name = serializers.StringRelatedField(source='material_origin', read_only=True) material_origin_name = serializers.StringRelatedField(source='material_origin', read_only=True)
notok_sign_name = serializers.SerializerMethodField() notok_sign_name = serializers.SerializerMethodField()
defect_name = serializers.CharField(source="defect.name", read_only=True) defect_name = serializers.CharField(source="defect.name", read_only=True)

2
apps/wpm/views.py
View File

@ -136,7 +136,7 @@ class WMaterialViewSet(ListModelMixin, CustomGenericViewSet):
serializer_class = WMaterialSerializer serializer_class = WMaterialSerializer
select_related_fields = ['material', 'belong_dept', 'material__process', 'supplier'] select_related_fields = ['material', 'belong_dept', 'material__process', 'supplier']
search_fields = ['material__name', search_fields = ['material__name',
'material__number', 'material__specification', 'batch', 'material__model', "defect__name", "notok_sign"] 'material__number', 'material__specification', 'batch', 'material__model', "defect__name", "notok_sign", 'material_ofrom']
filterset_class = WMaterialFilter filterset_class = WMaterialFilter
ordering_fields = ["update_time", "state", "count", "count_xtest"] ordering_fields = ["update_time", "state", "count", "count_xtest"]