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

feat: mloginit 可填end_time及test_user_name 返回

This commit is contained in:
caoqianming 2024-09-05 13:14:12 +08:00
parent c2e2465439
commit a1871a3763
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/wpm/serializers.py
View File

@ -264,6 +264,7 @@ class MlogSerializer(CustomModelSerializer):
equipments_name = serializers.StringRelatedField( equipments_name = serializers.StringRelatedField(
source='equipments', read_only=True, many=True) source='equipments', read_only=True, many=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)
class Meta: class Meta:
model = Mlog model = Mlog
@ -409,7 +410,7 @@ class MlogSerializer(CustomModelSerializer):
class MlogInitSerializer(CustomModelSerializer): class MlogInitSerializer(CustomModelSerializer):
class Meta: class Meta:
model = Mlog model = Mlog
fields = ['id', 'work_start_time', 'mgroup', 'reminder_interval_list', 'route', 'equipment', 'handle_user', 'note', 'mtype', 'supplier'] fields = ['id', 'work_start_time', 'work_end_time', 'mgroup', 'reminder_interval_list', 'route', 'equipment', 'handle_user', 'note', 'mtype', 'supplier']
extra_kwargs = { extra_kwargs = {
'work_start_time': {'required': True}, 'work_start_time': {'required': True},
'route':{'required': True}, 'route':{'required': True},
@ -431,6 +432,8 @@ class MlogInitSerializer(CustomModelSerializer):
supplier = attrs.get('supplier', None) supplier = attrs.get('supplier', None)
if not supplier: if not supplier:
raise ValidationError('外协必须选择外协单位') raise ValidationError('外协必须选择外协单位')
if attrs.get('work_end_time', None):
attrs['handle_date'] = localdate(attrs['work_end_time'])
return attrs return attrs
class MlogChangeSerializer(CustomModelSerializer): class MlogChangeSerializer(CustomModelSerializer):

2
apps/wpm/views.py
View File

@ -151,7 +151,7 @@ class MlogViewSet(CustomModelViewSet):
select_related_fields = ['create_by', 'update_by', 'mtask', select_related_fields = ['create_by', 'update_by', 'mtask',
'handle_user', 'handle_user_2', 'equipment', 'handle_user', 'handle_user_2', 'equipment',
'equipment_2', 'material_in', 'material_out', 'equipment_2', 'material_in', 'material_out',
'supplier', 'ticket', 'mgroup__process'] 'supplier', 'ticket', 'mgroup__process', 'test_user']
prefetch_related_fields = ['handle_users', prefetch_related_fields = ['handle_users',
'material_outs', 'b_mlog', 'equipments'] 'material_outs', 'b_mlog', 'equipments']
filterset_class = MlogFilter filterset_class = MlogFilter