From 4ab711cc71d441c62bdb61efede9dd8bd45c3831 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 20 Dec 2024 15:46:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20formula=20=E8=B0=83=E6=95=B4=E5=88=B0te?=
 =?UTF-8?q?stitem?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ..._20241220_1438.py => 0030_auto_20241220_1544.py} | 13 ++++++-------
 apps/qm/models.py                                   |  6 +++---
 2 files changed, 9 insertions(+), 10 deletions(-)
 rename apps/qm/migrations/{0030_auto_20241220_1438.py => 0030_auto_20241220_1544.py} (58%)

diff --git a/apps/qm/migrations/0030_auto_20241220_1438.py b/apps/qm/migrations/0030_auto_20241220_1544.py
similarity index 58%
rename from apps/qm/migrations/0030_auto_20241220_1438.py
rename to apps/qm/migrations/0030_auto_20241220_1544.py
index 1f6817cf..5465467b 100644
--- a/apps/qm/migrations/0030_auto_20241220_1438.py
+++ b/apps/qm/migrations/0030_auto_20241220_1544.py
@@ -1,7 +1,6 @@
-# Generated by Django 3.2.12 on 2024-12-20 06:38
+# Generated by Django 3.2.12 on 2024-12-20 07:44
 
 from django.db import migrations, models
-import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -12,17 +11,17 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.AddField(
-            model_name='qcttestitem',
-            name='affect',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='qm.qcttestitem', verbose_name='影响项'),
+            model_name='testitem',
+            name='affects',
+            field=models.JSONField(blank=True, default=list, verbose_name='影响项列表'),
         ),
         migrations.AddField(
-            model_name='qcttestitem',
+            model_name='testitem',
             name='formula',
             field=models.TextField(blank=True, null=True, verbose_name='计算公式'),
         ),
         migrations.AddField(
-            model_name='qcttestitem',
+            model_name='testitem',
             name='readonly',
             field=models.BooleanField(default=False, verbose_name='只读'),
         ),
diff --git a/apps/qm/models.py b/apps/qm/models.py
index d2da5f64..b140d06e 100644
--- a/apps/qm/models.py
+++ b/apps/qm/models.py
@@ -120,6 +120,9 @@ class TestItem(CommonAModel):
     mcate_tags = models.JSONField('物料系列标签', default=list, blank=True)
     sort = models.PositiveSmallIntegerField('排序', default=1)
     description = models.TextField('描述', default='')
+    readonly = models.BooleanField('只读', default=False)
+    formula = models.TextField('计算公式', null=True, blank=True)
+    affects = models.JSONField('影响项列表', default=list, blank=True)
 
     class Meta:
         ordering = ['sort', '-create_time']
@@ -145,9 +148,6 @@ class Qct(CommonAModel):
 class QctTestItem(BaseModel):
     qct = models.ForeignKey(Qct, verbose_name="质检模板", on_delete=models.CASCADE)
     testitem = models.ForeignKey(TestItem, verbose_name="检测项", on_delete=models.CASCADE, null=True, blank=True)
-    readonly = models.BooleanField('只读', default=False)
-    formula = models.TextField('计算公式', null=True, blank=True)
-    affect = models.ForeignKey('self', verbose_name="影响项", on_delete=models.SET_NULL, null=True, blank=True)
     note = models.TextField('备注', null=True, blank=True)
     sort = models.FloatField('排序', default=1)