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

fix: mlog增加handle_users的返回

This commit is contained in:
caoqianming 2023-11-01 14:41:08 +08:00
parent ae629846ab
commit f8b3868467
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/wpm/filters.py
View File

@ -60,6 +60,6 @@ class MlogFilter(filters.FilterSet):
"handle_date": ["exact"], "handle_date": ["exact"],
"handle_user": ["exact"], "handle_user": ["exact"],
"mtask__mgroup__belong_dept__name": ["exact"], "mtask__mgroup__belong_dept__name": ["exact"],
"mgroup__belong_dept__name": ["exact"], "mgroup__belong_dept__name": ["exact", "in"],
"submit_time": ["isnull"] "submit_time": ["isnull"]
} }

3
apps/wpm/serializers.py
View File

@ -5,6 +5,7 @@ from rest_framework.exceptions import ValidationError
from .models import SfLog, StLog, SfLogExp, WMaterial, Mlog, Handover, Mlogb from .models import SfLog, StLog, SfLogExp, WMaterial, Mlog, Handover, Mlogb
from apps.system.models import Dept, User from apps.system.models import Dept, User
from apps.system.serializers import UserSimpleSerializer
from apps.pm.models import Mtask from apps.pm.models import Mtask
from apps.wpm.tasks import cal_enstat_when_pcoal_heat_change, cal_enstat_when_team_change from apps.wpm.tasks import cal_enstat_when_pcoal_heat_change, cal_enstat_when_team_change
from apps.mtm.serializers import MaterialSimpleSerializer from apps.mtm.serializers import MaterialSimpleSerializer
@ -113,6 +114,8 @@ class MlogSerializer(CustomModelSerializer):
shift_name = serializers.CharField(source='shift.name', read_only=True) shift_name = serializers.CharField(source='shift.name', read_only=True)
material_outs_ = MlogbSerializer( material_outs_ = MlogbSerializer(
label='多产出件信息', many=True, source='material_outs') label='多产出件信息', many=True, source='material_outs')
handle_users_ = UserSimpleSerializer(
source='handle_users', many=True, read_only=True)
class Meta: class Meta:
model = Mlog model = Mlog

1
apps/wpm/views.py
View File

@ -123,6 +123,7 @@ class MlogViewSet(CustomModelViewSet):
serializer_class = MlogSerializer serializer_class = MlogSerializer
select_related_fields = ['create_by', 'update_by', 'mtask', select_related_fields = ['create_by', 'update_by', 'mtask',
'handle_user', 'handle_user_2', 'equipment', 'equipment_2'] 'handle_user', 'handle_user_2', 'equipment', 'equipment_2']
prefetch_related_fields = ['handle_users', 'material_outs']
filterset_class = MlogFilter filterset_class = MlogFilter
def perform_destroy(self, instance): def perform_destroy(self, instance):