diff --git a/apps/mtm/migrations/0066_alter_process_clear_defect.py b/apps/mtm/migrations/0066_alter_process_clear_defect.py new file mode 100644 index 00000000..579e5c28 --- /dev/null +++ b/apps/mtm/migrations/0066_alter_process_clear_defect.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.27 on 2026-07-16 02:17 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mtm', '0065_material_count_safe_upper_alter_material_count_safe'), + ] + + operations = [ + migrations.AlterField( + model_name='process', + name='clear_defect', + field=models.BooleanField(default=False, verbose_name='合格B类默认记合格'), + ), + ] diff --git a/apps/mtm/models.py b/apps/mtm/models.py index dc935c44..40155f8f 100644 --- a/apps/mtm/models.py +++ b/apps/mtm/models.py @@ -37,7 +37,7 @@ class Process(CommonBModel): parent = models.ForeignKey('self', verbose_name='父工序', on_delete=models.CASCADE, null=True, blank=True) number_to_batch = models.BooleanField('个号转批号', default=False) wpr_number_rule = models.TextField("单个编号规则", null=True, blank=True) - clear_defect = models.BooleanField('合批清除缺陷', default=False) + clear_defect = models.BooleanField('合格B类默认记合格', default=False) class Meta: verbose_name = '工序' ordering = ['sort', 'create_time'] diff --git a/apps/wpm/migrations/0134_alter_mlog_clear_defect.py b/apps/wpm/migrations/0134_alter_mlog_clear_defect.py new file mode 100644 index 00000000..7db170d4 --- /dev/null +++ b/apps/wpm/migrations/0134_alter_mlog_clear_defect.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.27 on 2026-07-16 02:17 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('wpm', '0133_batchst_zt_batch'), + ] + + operations = [ + migrations.AlterField( + model_name='mlog', + name='clear_defect', + field=models.BooleanField(default=False, verbose_name='合格B类记为合格'), + ), + ] diff --git a/apps/wpm/models.py b/apps/wpm/models.py index 92d732f3..062b2aee 100644 --- a/apps/wpm/models.py +++ b/apps/wpm/models.py @@ -242,7 +242,7 @@ class Mlog(CommonADModel): reminder_interval_list = models.JSONField('提醒间隔', default=list, blank=True) stored_mgroup = models.BooleanField('入库到工段', default=False) stored_notok = models.BooleanField('不合格品是否已入库', default=False) - clear_defect = models.BooleanField('合格B类缺陷不拆批', default=False) + clear_defect = models.BooleanField('合格B类记为合格', default=False) route = models.ForeignKey(Route, verbose_name='生产路线', on_delete=models.SET_NULL, null=True, blank=True) mtask = models.ForeignKey( Mtask, verbose_name='关联任务', on_delete=models.CASCADE, null=True, blank=True, related_name='mlog_mtask')