diff --git a/apps/wpm/migrations/0015_auto_20231030_1133.py b/apps/wpm/migrations/0015_auto_20231030_1133.py new file mode 100644 index 00000000..758615d6 --- /dev/null +++ b/apps/wpm/migrations/0015_auto_20231030_1133.py @@ -0,0 +1,71 @@ +# Generated by Django 3.2.12 on 2023-10-30 03:33 + +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', '0014_mlog_handle_date'), + ] + + operations = [ + migrations.AddField( + model_name='mlog', + name='count_n_dl', + field=models.PositiveIntegerField(default=0, verbose_name='断裂'), + ), + migrations.AddField( + model_name='mlog', + name='count_n_dxt', + field=models.PositiveIntegerField(default=0, verbose_name='大小头'), + ), + migrations.AddField( + model_name='mlog', + name='count_n_jsqx', + field=models.PositiveIntegerField(default=0, verbose_name='结石气线'), + ), + migrations.AddField( + model_name='mlog', + name='count_n_pb', + field=models.PositiveIntegerField(default=0, verbose_name='偏壁'), + ), + migrations.AddField( + model_name='mlog', + name='count_n_qp', + field=models.PositiveIntegerField(default=0, verbose_name='气泡'), + ), + migrations.AddField( + model_name='mlog', + name='count_n_qt', + field=models.PositiveIntegerField(default=0, verbose_name='其他'), + ), + migrations.AddField( + model_name='mlog', + name='count_n_tw', + field=models.PositiveIntegerField(default=0, verbose_name='条纹'), + ), + migrations.AddField( + model_name='mlog', + name='count_n_wq', + field=models.PositiveIntegerField(default=0, verbose_name='弯曲'), + ), + migrations.AddField( + model_name='mlog', + name='count_n_zw', + field=models.PositiveIntegerField(default=0, verbose_name='炸纹'), + ), + migrations.AddField( + model_name='mlog', + name='handle_leader', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='mlog_handle_leader', to=settings.AUTH_USER_MODEL, verbose_name='班长'), + ), + migrations.AlterField( + model_name='mlog', + name='handle_user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='mlog_handle_user', to=settings.AUTH_USER_MODEL, verbose_name='操作人'), + ), + ] diff --git a/apps/wpm/models.py b/apps/wpm/models.py index 0662d73b..7811f962 100644 --- a/apps/wpm/models.py +++ b/apps/wpm/models.py @@ -88,6 +88,19 @@ class Mlog(CommonADModel): count_real = models.PositiveIntegerField('实际生产数', default=0) count_ok = models.PositiveIntegerField('合格数', default=0) count_notok = models.PositiveIntegerField('不合格数', default=0) + + count_n_zw = models.PositiveIntegerField('炸纹', default=0) + count_n_tw = models.PositiveIntegerField('条纹', default=0) + count_n_qp = models.PositiveIntegerField('气泡', default=0) + count_n_wq = models.PositiveIntegerField('弯曲', default=0) + count_n_dl = models.PositiveIntegerField('断裂', default=0) + count_n_pb = models.PositiveIntegerField('偏壁', default=0) + count_n_dxt = models.PositiveIntegerField('大小头', default=0) + count_n_jsqx = models.PositiveIntegerField('结石气线', default=0) + count_n_qt = models.PositiveIntegerField('其他', default=0) + handle_date = models.DateField('操作日期') handle_user = models.ForeignKey( - User, verbose_name='操作人', on_delete=models.CASCADE) + User, verbose_name='操作人', on_delete=models.CASCADE, related_name='mlog_handle_user') + handle_leader = models.ForeignKey( + User, verbose_name='班长', on_delete=models.CASCADE, null=True, blank=True, related_name='mlog_handle_leader')