From 7d5b1223d5a51c2e08b6a2acc0f57ccaf185126e Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 2 Apr 2024 11:40:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20inm=20mioitem=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inm/migrations/0015_auto_20240402_1139.py | 28 +++++++++++++++++++ apps/inm/serializers.py | 4 +-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 apps/inm/migrations/0015_auto_20240402_1139.py diff --git a/apps/inm/migrations/0015_auto_20240402_1139.py b/apps/inm/migrations/0015_auto_20240402_1139.py new file mode 100644 index 00000000..4d7ad0ae --- /dev/null +++ b/apps/inm/migrations/0015_auto_20240402_1139.py @@ -0,0 +1,28 @@ +# Generated by Django 3.2.12 on 2024-04-02 03:39 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('inm', '0014_auto_20240322_1451'), + ] + + operations = [ + migrations.AddField( + model_name='mioitem', + name='count_n_ysq', + field=models.PositiveIntegerField(default=0, verbose_name='颜色青'), + ), + migrations.AddField( + model_name='mioitem', + name='count_n_zz', + field=models.PositiveIntegerField(default=0, verbose_name='杂质'), + ), + migrations.AddField( + model_name='mioitem', + name='test_note', + field=models.TextField(blank=True, default='', verbose_name='检验备注'), + ), + ] diff --git a/apps/inm/serializers.py b/apps/inm/serializers.py index cea7a3fd..b662ee7b 100644 --- a/apps/inm/serializers.py +++ b/apps/inm/serializers.py @@ -244,7 +244,7 @@ class MIOItemTestSerializer(CustomModelSerializer): class Meta: model = MIOItem fields = ['id', 'test_date', 'test_user', 'count_notok', 'count_n_zw', 'count_n_tw', - 'count_n_qp', 'count_n_wq', 'count_n_dl', 'count_n_pb', 'count_n_dxt', 'count_n_js', 'count_n_qx', 'count_n_qt'] + 'count_n_qp', 'count_n_wq', 'count_n_dl', 'count_n_pb', 'count_n_dxt', 'count_n_js', 'count_n_qx', 'count_n_zz', 'count_n_ysq', 'count_n_qt', 'test_note'] extra_kwargs = { 'test_date': {'required': True}, 'test_user': {'required': True} @@ -261,7 +261,7 @@ class MIOItemPurInTestSerializer(CustomModelSerializer): class Meta: model = MIOItem fields = ['id', 'test_date', 'test_user', - 'count_bag', 'weight_kgs', 'is_testok'] + 'count_bag', 'weight_kgs', 'is_testok', 'test_note'] extra_kwargs = { 'test_date': {'required': True}, 'test_user': {'required': True}