From bc57f49e6adc7ae74c06edf762cee8c4c2a1ad08 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 25 Oct 2023 18:49:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0utask=20mgroup?=
 =?UTF-8?q?=E5=92=8Cmaterial=5Fin=20=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/pm/filters.py                            |  1 +
 apps/pm/migrations/0009_auto_20231025_1845.py | 25 +++++++++++++++++++
 apps/pm/models.py                             |  4 +++
 3 files changed, 30 insertions(+)
 create mode 100644 apps/pm/migrations/0009_auto_20231025_1845.py

diff --git a/apps/pm/filters.py b/apps/pm/filters.py
index 7f4f0d9d..dbf67235 100644
--- a/apps/pm/filters.py
+++ b/apps/pm/filters.py
@@ -16,6 +16,7 @@ class UtaskFilter(filters.FilterSet):
             "material": ["exact"],
             "material__type": ["exact"],
             "material__is_hidden": ["exact"],
+            "mgroup__belong_dept__name": ["exact"],
             "mtask_utask__mgroup": ["exact"],
             "mtask_utask__mgroup__belong_dept": ['exact'],
             "mtask_utask__mgroup__belong_dept__name": ['exact']
diff --git a/apps/pm/migrations/0009_auto_20231025_1845.py b/apps/pm/migrations/0009_auto_20231025_1845.py
new file mode 100644
index 00000000..1a086d56
--- /dev/null
+++ b/apps/pm/migrations/0009_auto_20231025_1845.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.2.12 on 2023-10-25 10:45
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mtm', '0018_material_need_route'),
+        ('pm', '0008_alter_mtask_utask'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='utask',
+            name='material_in',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='utask_material_in', to='mtm.material', verbose_name='领用物'),
+        ),
+        migrations.AddField(
+            model_name='utask',
+            name='mgroup',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='mtm.mgroup', verbose_name='工段'),
+        ),
+    ]
diff --git a/apps/pm/models.py b/apps/pm/models.py
index d73b5f50..914528f6 100644
--- a/apps/pm/models.py
+++ b/apps/pm/models.py
@@ -24,6 +24,10 @@ class Utask(CommonADModel):
     number = models.CharField('编号', max_length=50, unique=True)
     material = models.ForeignKey(
         Material, verbose_name='产品', on_delete=models.CASCADE)
+    mgroup = models.ForeignKey(
+        Mgroup, verbose_name='工段', on_delete=models.CASCADE, null=True, blank=True)
+    material_in = models.ForeignKey(
+        Material, verbose_name='领用物', on_delete=models.CASCADE, related_name='utask_material_in', null=True, blank=True)
     count = models.PositiveIntegerField('任务数', default=1)
     count_real = models.PositiveIntegerField('实际生产数', default=0)
     count_ok = models.PositiveIntegerField('合格数', default=0)