From 5c9bb530c7c0798ba17f2cebb620f96bd0734f7e Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 16 Jul 2026 10:19:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=90=88=E6=A0=BCB=E7=B1=BB=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=89=8D=E7=AB=AF=E6=96=87=E6=A1=88=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?"=E8=AE=B0=E4=B8=BA=E5=90=88=E6=A0=BC"=E6=9B=B4=E5=87=86?=
 =?UTF-8?q?=E7=A1=AE=E8=A1=A8=E8=BE=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

clear_defect 在工序/日志上的实际语义是合格B类当合格品不记缺陷入库,原不拆批/合批清除缺陷描述机制且工序上名不副实,统一改为记为合格。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../0066_alter_process_clear_defect.py         | 18 ++++++++++++++++++
 apps/mtm/models.py                             |  2 +-
 .../migrations/0134_alter_mlog_clear_defect.py | 18 ++++++++++++++++++
 apps/wpm/models.py                             |  2 +-
 4 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 apps/mtm/migrations/0066_alter_process_clear_defect.py
 create mode 100644 apps/wpm/migrations/0134_alter_mlog_clear_defect.py

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')