feat: mlog增加handle_user
This commit is contained in:
parent
604b4abe21
commit
c6f9b749c7
|
@ -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,
|
||||||
|
),
|
||||||
|
]
|
|
@ -2,6 +2,7 @@ from django.db import models
|
||||||
from apps.utils.models import CommonADModel, CommonBDModel
|
from apps.utils.models import CommonADModel, CommonBDModel
|
||||||
from apps.mtm.models import Mgroup, Team, Shift, Material
|
from apps.mtm.models import Mgroup, Team, Shift, Material
|
||||||
from apps.pm.models import Mtask
|
from apps.pm.models import Mtask
|
||||||
|
from apps.system.models import User
|
||||||
from django.utils.timezone import localtime
|
from django.utils.timezone import localtime
|
||||||
|
|
||||||
# Create your models here.
|
# Create your models here.
|
||||||
|
@ -87,3 +88,5 @@ class Mlog(CommonADModel):
|
||||||
count_real = models.PositiveIntegerField('实际生产数', default=0)
|
count_real = models.PositiveIntegerField('实际生产数', default=0)
|
||||||
count_ok = models.PositiveIntegerField('合格数', default=0)
|
count_ok = models.PositiveIntegerField('合格数', default=0)
|
||||||
count_notok = models.PositiveIntegerField('不合格数', default=0)
|
count_notok = models.PositiveIntegerField('不合格数', default=0)
|
||||||
|
handle_user = models.ForeignKey(
|
||||||
|
User, verbose_name='操作人', on_delete=models.CASCADE)
|
||||||
|
|
|
@ -107,7 +107,7 @@ class MlogViewSet(CustomModelViewSet):
|
||||||
queryset = Mlog.objects.all()
|
queryset = Mlog.objects.all()
|
||||||
serializer_class = MlogSerializer
|
serializer_class = MlogSerializer
|
||||||
select_related_fields = ['create_by', 'update_by', 'mtask']
|
select_related_fields = ['create_by', 'update_by', 'mtask']
|
||||||
filterset_fields = ['mtask']
|
filterset_fields = ['mtask', 'handle_user']
|
||||||
|
|
||||||
def perform_destroy(self, instance):
|
def perform_destroy(self, instance):
|
||||||
if instance.mtask.state == Mtask.MTASK_DONE:
|
if instance.mtask.state == Mtask.MTASK_DONE:
|
||||||
|
|
Loading…
Reference in New Issue