diff --git a/apps/wpm/migrations/0013_mlog_handle_user.py b/apps/wpm/migrations/0013_mlog_handle_user.py new file mode 100644 index 00000000..26a77641 --- /dev/null +++ b/apps/wpm/migrations/0013_mlog_handle_user.py @@ -0,0 +1,22 @@ +# Generated by Django 3.2.12 on 2023-10-10 08:42 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('wpm', '0012_mlog'), + ] + + operations = [ + migrations.AddField( + model_name='mlog', + name='handle_user', + field=models.ForeignKey(default='admin', on_delete=django.db.models.deletion.CASCADE, to='system.user', verbose_name='操作人'), + preserve_default=False, + ), + ] diff --git a/apps/wpm/models.py b/apps/wpm/models.py index 397eae92..0f1955e9 100644 --- a/apps/wpm/models.py +++ b/apps/wpm/models.py @@ -2,6 +2,7 @@ from django.db import models from apps.utils.models import CommonADModel, CommonBDModel from apps.mtm.models import Mgroup, Team, Shift, Material from apps.pm.models import Mtask +from apps.system.models import User from django.utils.timezone import localtime # Create your models here. @@ -87,3 +88,5 @@ class Mlog(CommonADModel): count_real = models.PositiveIntegerField('实际生产数', default=0) count_ok = models.PositiveIntegerField('合格数', default=0) count_notok = models.PositiveIntegerField('不合格数', default=0) + handle_user = models.ForeignKey( + User, verbose_name='操作人', on_delete=models.CASCADE) diff --git a/apps/wpm/views.py b/apps/wpm/views.py index ca66f173..10ca04c2 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -107,7 +107,7 @@ class MlogViewSet(CustomModelViewSet): queryset = Mlog.objects.all() serializer_class = MlogSerializer select_related_fields = ['create_by', 'update_by', 'mtask'] - filterset_fields = ['mtask'] + filterset_fields = ['mtask', 'handle_user'] def perform_destroy(self, instance): if instance.mtask.state == Mtask.MTASK_DONE: