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

feat: mlog 增加ticket查询条件

This commit is contained in:
caoqianming 2024-09-03 10:25:59 +08:00
parent 3c99770477
commit 31f8f002aa
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

@ -17,6 +17,7 @@ from django.utils import timezone
from django.core.cache import cache
from django.utils.timezone import localdate
from apps.qm.models import NotOkOption
from apps.wf.serializers import TicketSimpleSerializer
class OtherLogSerializer(CustomModelSerializer):
@ -261,6 +262,7 @@ class MlogSerializer(CustomModelSerializer):
source='handle_users', many=True, read_only=True)
equipments_name = serializers.StringRelatedField(
source='equipments', read_only=True, many=True)
ticket_ = TicketSimpleSerializer(source='ticket', read_only=True)
class Meta:
model = Mlog

2
apps/wpm/views.py
View File

@ -142,7 +142,7 @@ class MlogViewSet(CustomModelViewSet):
queryset = Mlog.objects.all()
serializer_class = MlogSerializer
select_related_fields = ['create_by', 'update_by', 'mtask',
'handle_user', 'handle_user_2', 'equipment', 'equipment_2', 'material_in', 'material_out', 'supplier']
'handle_user', 'handle_user_2', 'equipment', 'equipment_2', 'material_in', 'material_out', 'supplier', 'ticket']
prefetch_related_fields = ['handle_users',
'material_outs', 'b_mlog', 'equipments']
filterset_class = MlogFilter