zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: formula 调整到testitem

This commit is contained in:
caoqianming 2024-12-20 15:46:32 +08:00
parent 7fa065ce88
commit 4ab711cc71
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/qm/migrations/0030_auto_20241220_1438.py → apps/qm/migrations/0030_auto_20241220_1544.py
View File

@ -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 from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration): class Migration(migrations.Migration):
@ -12,17 +11,17 @@ class Migration(migrations.Migration):
operations = [ operations = [
migrations.AddField( migrations.AddField(
model_name='qcttestitem', model_name='testitem',
name='affect', name='affects',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='qm.qcttestitem', verbose_name='影响项'), field=models.JSONField(blank=True, default=list, verbose_name='影响项列表'),
), ),
migrations.AddField( migrations.AddField(
model_name='qcttestitem', model_name='testitem',
name='formula', name='formula',
field=models.TextField(blank=True, null=True, verbose_name='计算公式'), field=models.TextField(blank=True, null=True, verbose_name='计算公式'),
), ),
migrations.AddField( migrations.AddField(
model_name='qcttestitem', model_name='testitem',
name='readonly', name='readonly',
field=models.BooleanField(default=False, verbose_name='只读'), field=models.BooleanField(default=False, verbose_name='只读'),
), ),

6
apps/qm/models.py
View File

@ -120,6 +120,9 @@ class TestItem(CommonAModel):
mcate_tags = models.JSONField('物料系列标签', default=list, blank=True) mcate_tags = models.JSONField('物料系列标签', default=list, blank=True)
sort = models.PositiveSmallIntegerField('排序', default=1) sort = models.PositiveSmallIntegerField('排序', default=1)
description = models.TextField('描述', default='') 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: class Meta:
ordering = ['sort', '-create_time'] ordering = ['sort', '-create_time']
@ -145,9 +148,6 @@ class Qct(CommonAModel):
class QctTestItem(BaseModel): class QctTestItem(BaseModel):
qct = models.ForeignKey(Qct, verbose_name="质检模板", on_delete=models.CASCADE) qct = models.ForeignKey(Qct, verbose_name="质检模板", on_delete=models.CASCADE)
testitem = models.ForeignKey(TestItem, verbose_name="检测项", on_delete=models.CASCADE, null=True, blank=True) 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) note = models.TextField('备注', null=True, blank=True)
sort = models.FloatField('排序', default=1) sort = models.FloatField('排序', default=1)