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

feat: 生产日志返回提交人姓名

This commit is contained in:
caoqianming 2025-07-02 16:41:54 +08:00
parent 4b2bcc6d29
commit 1a621aca34
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/wpm/serializers.py
View File

@ -277,6 +277,7 @@ class MlogListSerializer(CustomModelSerializer):
test_user_name = serializers.CharField(source='test_user.name', read_only=True) test_user_name = serializers.CharField(source='test_user.name', read_only=True)
handle_users_ = UserSimpleSerializer( handle_users_ = UserSimpleSerializer(
source='handle_users', many=True, read_only=True) source='handle_users', many=True, read_only=True)
submit_user_name = serializers.CharField(source='submit_user.name', read_only=True)
class Meta: class Meta:
model = Mlog model = Mlog
@ -339,6 +340,7 @@ class MlogSerializer(CustomModelSerializer):
source='handle_users', many=True, read_only=True) source='handle_users', many=True, read_only=True)
ticket_ = TicketSimpleSerializer(source='ticket', read_only=True) ticket_ = TicketSimpleSerializer(source='ticket', read_only=True)
test_user_name = serializers.CharField(source='test_user.name', read_only=True) test_user_name = serializers.CharField(source='test_user.name', read_only=True)
submit_user_name = serializers.CharField(source='submit_user.name', read_only=True)
mlogdefect = MlogbDefectSerializer(many=True, required=False) mlogdefect = MlogbDefectSerializer(many=True, required=False)
mlogindefect = MlogbDefectSerializer(many=True, label="前道不良", required=False) mlogindefect = MlogbDefectSerializer(many=True, label="前道不良", required=False)

2
apps/wpm/views.py
View File

@ -173,7 +173,7 @@ class MlogViewSet(CustomModelViewSet):
list_serializer_class = MlogListSerializer list_serializer_class = MlogListSerializer
select_related_fields = ['create_by', 'update_by', 'mtask', 'mtaskb', select_related_fields = ['create_by', 'update_by', 'mtask', 'mtaskb',
'handle_user', 'handle_user_2', 'equipment', 'mgroup__belong_dept', 'handle_user', 'handle_user_2', 'equipment', 'mgroup__belong_dept',
'equipment_2', 'material_in', 'material_out', 'route__routepack', 'equipment_2', 'material_in', 'material_out', 'route__routepack', 'submit_user',
'supplier', 'ticket', 'mgroup__process', 'test_user', 'handle_leader', 'test_user', 'team'] 'supplier', 'ticket', 'mgroup__process', 'test_user', 'handle_leader', 'test_user', 'team']
prefetch_related_fields = ['handle_users', prefetch_related_fields = ['handle_users',
'material_outs', 'b_mlog', 'equipments'] 'material_outs', 'b_mlog', 'equipments']