From e6b27950b258b18ef1700b9bcc67a3cbfc8b5dab Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 17 Feb 2025 09:34:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20ftestitem=E5=A2=9E=E5=8A=A0=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E8=AE=BE=E5=A4=87=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migrations/0043_ftestitem_test_equip.py   | 20 +++++++++++++++++++
 apps/qm/models.py                             |  1 +
 apps/qm/serializers.py                        |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 apps/qm/migrations/0043_ftestitem_test_equip.py

diff --git a/apps/qm/migrations/0043_ftestitem_test_equip.py b/apps/qm/migrations/0043_ftestitem_test_equip.py
new file mode 100644
index 00000000..fa8aaeee
--- /dev/null
+++ b/apps/qm/migrations/0043_ftestitem_test_equip.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.2.12 on 2025-02-17 01:33
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('em', '0021_auto_20241203_1531'),
+        ('qm', '0042_alter_ptest_testitem'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ftestitem',
+            name='test_equip',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='em.equipment', verbose_name='检测设备'),
+        ),
+    ]
diff --git a/apps/qm/models.py b/apps/qm/models.py
index 582625f2..7613dd05 100644
--- a/apps/qm/models.py
+++ b/apps/qm/models.py
@@ -314,6 +314,7 @@ class FtestItem(BaseModel):
         Ftest, verbose_name='关联检验', on_delete=models.CASCADE)
     testitem = models.ForeignKey(
         TestItem, verbose_name='质检项目', on_delete=models.CASCADE)
+    test_equip = models.ForeignKey(Equipment, verbose_name='检测设备', on_delete=models.SET_NULL, null=True, blank=True)
     test_user = models.ForeignKey(User, verbose_name='操作人', on_delete=models.CASCADE, null=True, blank=True)
     test_val = models.FloatField('测量值', null=True, blank=True)
     addto_wpr = models.BooleanField('加入WPR作为信息', default=False)
diff --git a/apps/qm/serializers.py b/apps/qm/serializers.py
index e29bf174..976d9e39 100644
--- a/apps/qm/serializers.py
+++ b/apps/qm/serializers.py
@@ -317,7 +317,7 @@ class FtestItemProcessSerializer(CustomModelSerializer):
         source='testitem.description', read_only=True)
     class Meta:
         model = FtestItem
-        fields = ["id", "testitem", "test_user", "test_val_json", "testitem_name", "testitem_description", "addto_wpr"]
+        fields = ["id", "testitem", "test_user", "test_val_json", "testitem_name", "testitem_description", "addto_wpr", "test_equip"]
 
 class FtestProcessSerializer(CustomModelSerializer):
     test_user_name = serializers.CharField(