feat: ftestitem增加检测设备字段

This commit is contained in:
caoqianming 2025-02-17 09:34:48 +08:00
parent 61525d236e
commit e6b27950b2
3 changed files with 22 additions and 1 deletions

View File

@ -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='检测设备'),
),
]

View File

@ -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)

View File

@ -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(