From 41c1653d132b0133a75caa74d4082fb07c99e782 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 5 Sep 2025 09:47:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20ftest=E9=BB=98=E8=AE=A4=E4=B8=BA?= =?UTF-8?q?=E5=90=88=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/qm/migrations/0053_alter_ftest_is_ok.py | 18 ++++++++++++++++++ apps/qm/models.py | 2 +- apps/wpm/serializers.py | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 apps/qm/migrations/0053_alter_ftest_is_ok.py diff --git a/apps/qm/migrations/0053_alter_ftest_is_ok.py b/apps/qm/migrations/0053_alter_ftest_is_ok.py new file mode 100644 index 00000000..92b5f83c --- /dev/null +++ b/apps/qm/migrations/0053_alter_ftest_is_ok.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.12 on 2025-09-05 01:45 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('qm', '0052_auto_20250718_1558'), + ] + + operations = [ + migrations.AlterField( + model_name='ftest', + name='is_ok', + field=models.BooleanField(default=True, verbose_name='是否合格'), + ), + ] diff --git a/apps/qm/models.py b/apps/qm/models.py index 5ec00882..b724a228 100644 --- a/apps/qm/models.py +++ b/apps/qm/models.py @@ -337,7 +337,7 @@ class Ftest(CommonBDModel): User, verbose_name='操作人', on_delete=models.CASCADE, related_name='ftest_test_user') check_user = models.ForeignKey( User, verbose_name='专检人', on_delete=models.CASCADE, related_name='ftest_check_user', null=True, blank=True) - is_ok = models.BooleanField('是否合格', default=False) + is_ok = models.BooleanField('是否合格', default=True) note = models.TextField('备注', default='', blank=True) ftest_work = models.ForeignKey( FtestWork, verbose_name='关联检验工作', on_delete=models.CASCADE, null=True, blank=True) diff --git a/apps/wpm/serializers.py b/apps/wpm/serializers.py index a8ec4c6f..f1c2f477 100644 --- a/apps/wpm/serializers.py +++ b/apps/wpm/serializers.py @@ -956,7 +956,7 @@ class MlogbwStartTestSerializer(serializers.Serializer): if mlogbw.ftest: existing_ftests[mlogbw.ftest_id] = mlogbw.ftest else: - ftest = Ftest(test_date=test_date, qct=qct, test_user=test_user, type="process", id=idWorker.get_id()) + ftest = Ftest(test_date=test_date, qct=qct, test_user=test_user, type="process", id=idWorker.get_id(), is_ok=True) new_ftests.append(ftest) mlogbws_to_update.append(mlogbw)