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

feat: material 返回 __str__修改

This commit is contained in:
caoqianming 2023-12-20 15:05:22 +08:00
parent 570570b517
commit 85a49c4b0f
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/mtm/models.py
View File

@ -72,7 +72,7 @@ class Material(CommonAModel):
ordering = ['sort', '-create_time']
def __str__(self):
return f'{self.name}|{self.specification}|{self.model}'
return f'{self.name}|{self.specification if self.specification else ""}|{self.model if self.model else ""}|{self.process.name if self.process else ""}'
class Shift(CommonBModel):

12
apps/mtm/serializers.py
View File

@ -34,7 +34,7 @@ class MaterialSerializer(CustomModelSerializer):
model = Material
fields = '__all__'
read_only_fields = EXCLUDE_FIELDS
def get_full_name(self, obj):
return f'{obj.name}|{obj.specification if obj.specification else ""}|{obj.model if obj.model else ""}|{obj.process.name if obj.process else ""}'
@ -119,12 +119,10 @@ class RouteSerializer(CustomModelSerializer):
material_ = MaterialSerializer(source='material', read_only=True)
process_name = serializers.CharField(source='process.name', read_only=True)
process_cate = serializers.CharField(source='process.cate', read_only=True)
material_in_ = MaterialSimpleSerializer(source='material_in', read_only=True)
material_out_ = MaterialSimpleSerializer(source='material_out', read_only=True)
material_in_name = serializers.CharField(
source='material_in.name', read_only=True)
material_out_name = serializers.CharField(
source='material_out.name', read_only=True)
material_in_name = serializers.StringRelatedField(
source='material_in', read_only=True)
material_out_name = serializers.StringRelatedField(
source='material_out', read_only=True)
material_out_type = serializers.CharField(
source='material_out.type', read_only=True)
material_out_is_hidden = serializers.BooleanField(