From 4eb8aeca964d64f7855280a97488ce8cf49d5835 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 23 Dec 2024 10:52:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20qct=E5=A2=9E=E5=8A=A0=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/qm/filters.py | 7 ++++- apps/qm/migrations/0031_auto_20241223_1050.py | 29 +++++++++++++++++++ apps/qm/models.py | 6 ++-- 3 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 apps/qm/migrations/0031_auto_20241223_1050.py diff --git a/apps/qm/filters.py b/apps/qm/filters.py index 4aba5326..71585306 100644 --- a/apps/qm/filters.py +++ b/apps/qm/filters.py @@ -20,7 +20,12 @@ class QctFilter(filters.FilterSet): class Meta: model = Qct - fields = ["testitems", "defects"] + fields = { + "testitems": ["exact"], + "defects": ["exact"], + "qctmat__material": ["exact"], + "qctmat__tracing": ["exact"], + } class TestItemFilter(filters.FilterSet): tags__contains = filters.CharFilter(field_name='tags', lookup_expr='contains') diff --git a/apps/qm/migrations/0031_auto_20241223_1050.py b/apps/qm/migrations/0031_auto_20241223_1050.py new file mode 100644 index 00000000..63e6fb81 --- /dev/null +++ b/apps/qm/migrations/0031_auto_20241223_1050.py @@ -0,0 +1,29 @@ +# Generated by Django 3.2.12 on 2024-12-23 02:50 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('qm', '0030_auto_20241220_1544'), + ] + + operations = [ + migrations.AlterField( + model_name='qctdefect', + name='qct', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='qctdefect', to='qm.qct', verbose_name='质检模板'), + ), + migrations.AlterField( + model_name='qctmat', + name='qct', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='qctmat', to='qm.qct', verbose_name='质检模板'), + ), + migrations.AlterField( + model_name='qcttestitem', + name='qct', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='qcttestitem', to='qm.qct', verbose_name='质检模板'), + ), + ] diff --git a/apps/qm/models.py b/apps/qm/models.py index b140d06e..41d05290 100644 --- a/apps/qm/models.py +++ b/apps/qm/models.py @@ -146,20 +146,20 @@ class Qct(CommonAModel): materials = models.ManyToManyField(Material, verbose_name="物料", blank=True, through='qm.qctmat') class QctTestItem(BaseModel): - qct = models.ForeignKey(Qct, verbose_name="质检模板", on_delete=models.CASCADE) + qct = models.ForeignKey(Qct, verbose_name="质检模板", on_delete=models.CASCADE, related_name="qcttestitem") testitem = models.ForeignKey(TestItem, verbose_name="检测项", on_delete=models.CASCADE, null=True, blank=True) note = models.TextField('备注', null=True, blank=True) sort = models.FloatField('排序', default=1) class QctDefect(BaseModel): - qct = models.ForeignKey(Qct, verbose_name="质检模板", on_delete=models.CASCADE) + qct = models.ForeignKey(Qct, verbose_name="质检模板", on_delete=models.CASCADE, related_name="qctdefect") defect = models.ForeignKey(Defect, verbose_name="缺陷项", on_delete=models.CASCADE) rule_expression = models.TextField('判定表达式', null=True, blank=True) note = models.TextField('备注', null=True, blank=True) sort = models.FloatField('排序', default=1) class QctMat(BaseModel): - qct = models.ForeignKey(Qct, verbose_name="质检模板", on_delete=models.CASCADE) + qct = models.ForeignKey(Qct, verbose_name="质检模板", on_delete=models.CASCADE, related_name="qctmat") material = models.ForeignKey(Material, verbose_name="物料", on_delete=models.CASCADE) tracing = models.CharField('追溯层级', default=QC_T, choices=QC_TRACE_CHOICES, max_length=20, help_text=str(QC_TRACE_CHOICES))