From 77c4c54eb1e473f784fd40583ed24152899aaec1 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 9 Jun 2025 13:31:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20inm=20=E5=92=8C=20wpm=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?wpr=20number=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/inm/filters.py | 1 + apps/wpm/filters.py | 6 ++++-- .../0117_alter_handoverbw_handoverb.py | 19 +++++++++++++++++++ apps/wpm/models.py | 2 +- 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 apps/wpm/migrations/0117_alter_handoverbw_handoverb.py diff --git a/apps/inm/filters.py b/apps/inm/filters.py index dbbc470a..b641be55 100644 --- a/apps/inm/filters.py +++ b/apps/inm/filters.py @@ -35,6 +35,7 @@ class MioFilter(filters.FilterSet): "order": ["exact"], "item_mio__test_date": ["isnull"], "item_mio__test_user": ["isnull"], + "item_mio__w_mioitem__number": ["exact"], "mgroup": ["exact"], "item_mio__batch": ["exact"] } diff --git a/apps/wpm/filters.py b/apps/wpm/filters.py index 858f4e06..e5a0e8b2 100644 --- a/apps/wpm/filters.py +++ b/apps/wpm/filters.py @@ -110,7 +110,8 @@ class MlogFilter(filters.FilterSet): "mgroup__name": ["exact", "in", "contains"], "submit_time": ["isnull"], "fmlog": ["exact"], - "b_mlog__batch": ["exact"] + "b_mlog__batch": ["exact"], + "b_mlog__w_mlogb__number": ["exact"], } def filter_cbatch(self, queryset, name, value): @@ -158,7 +159,8 @@ class HandoverFilter(filters.FilterSet): "recive_mgroup__name": ["exact"], "type": ["exact", "in"], "mtype": ["exact", "in"], - "b_handover__batch": ["exact"] + "b_handover__batch": ["exact"], + "b_handover__w_handoverb__number": ["exact"] } diff --git a/apps/wpm/migrations/0117_alter_handoverbw_handoverb.py b/apps/wpm/migrations/0117_alter_handoverbw_handoverb.py new file mode 100644 index 00000000..71e37275 --- /dev/null +++ b/apps/wpm/migrations/0117_alter_handoverbw_handoverb.py @@ -0,0 +1,19 @@ +# Generated by Django 3.2.12 on 2025-06-09 05:24 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('wpm', '0116_auto_20250523_0922'), + ] + + operations = [ + migrations.AlterField( + model_name='handoverbw', + name='handoverb', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='w_handoverb', to='wpm.handoverb', verbose_name='关联交接记录'), + ), + ] diff --git a/apps/wpm/models.py b/apps/wpm/models.py index 4c06fad8..8f0c2609 100644 --- a/apps/wpm/models.py +++ b/apps/wpm/models.py @@ -592,7 +592,7 @@ class Handoverb(BaseModel): class Handoverbw(BaseModel): """TN: 单个产品交接记录 """ - handoverb = models.ForeignKey(Handoverb, verbose_name='关联交接记录', on_delete=models.CASCADE) + handoverb = models.ForeignKey(Handoverb, verbose_name='关联交接记录', on_delete=models.CASCADE, related_name="w_handoverb") number = models.TextField('单个编号') wpr = models.ForeignKey("wpmw.wpr", verbose_name='关联产品', on_delete=models.CASCADE , related_name='wpr_handoverbw', null=True, blank=True)