From 5f9c8105021a2d836bf33e52f8bfadebb1ff4a8f Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 3 Nov 2023 18:15:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A3=92=E7=AE=A1=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inm/migrations/0009_auto_20231103_1814.py | 33 +++++++++++++++++++
 apps/inm/models.py                            |  6 ++++
 apps/inm/serializers.py                       |  8 +++--
 3 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 apps/inm/migrations/0009_auto_20231103_1814.py

diff --git a/apps/inm/migrations/0009_auto_20231103_1814.py b/apps/inm/migrations/0009_auto_20231103_1814.py
new file mode 100644
index 00000000..89e4a0c6
--- /dev/null
+++ b/apps/inm/migrations/0009_auto_20231103_1814.py
@@ -0,0 +1,33 @@
+# Generated by Django 3.2.12 on 2023-11-03 10:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inm', '0008_auto_20231103_1359'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='mioitem',
+            name='is_bgtest_ok',
+            field=models.BooleanField(default=True, verbose_name='配套件是否合格'),
+        ),
+        migrations.AddField(
+            model_name='mioitema',
+            name='b_zuidawaijing',
+            field=models.FloatField(blank=True, null=True, verbose_name='最大外径'),
+        ),
+        migrations.AddField(
+            model_name='mioitema',
+            name='g_zuidaneijing',
+            field=models.FloatField(blank=True, null=True, verbose_name='最大内径'),
+        ),
+        migrations.AddField(
+            model_name='mioitema',
+            name='zhuidu',
+            field=models.FloatField(blank=True, null=True, verbose_name='锥度'),
+        ),
+    ]
diff --git a/apps/inm/models.py b/apps/inm/models.py
index 58c3cbee..ff38eca4 100644
--- a/apps/inm/models.py
+++ b/apps/inm/models.py
@@ -119,6 +119,8 @@ class MIOItem(BaseModel):
     count_n_jsqx = models.PositiveIntegerField('结石气线', default=0)
     count_n_qt = models.PositiveIntegerField('其他', default=0)
 
+    is_bgtest_ok = models.BooleanField('配套件是否合格', default=True)
+
 
 class MIOItemA(BaseModel):
     """
@@ -130,3 +132,7 @@ class MIOItemA(BaseModel):
     rate = models.PositiveIntegerField('比例', default=1)
     mioitem = models.ForeignKey(
         MIOItem, verbose_name='关联出入库明细', on_delete=models.CASCADE, related_name='a_mioitem')
+
+    zhuidu = models.FloatField('锥度', null=True, blank=True)
+    b_zuidawaijing = models.FloatField('最大外径', null=True, blank=True)
+    g_zuidaneijing = models.FloatField('最大内径', null=True, blank=True)
diff --git a/apps/inm/serializers.py b/apps/inm/serializers.py
index d01dcf98..bf209833 100644
--- a/apps/inm/serializers.py
+++ b/apps/inm/serializers.py
@@ -81,7 +81,8 @@ class MIOListSerializer(CustomModelSerializer):
 class MIOItemACreateSerializer(CustomModelSerializer):
     class Meta:
         model = MIOItem
-        fields = ['material', 'batch']
+        fields = ['material', 'batch', 'zhuidu',
+                  'b_zuidawaijing', 'g_zuidaneijing']
 
 
 class MIOItemCreateSerializer(CustomModelSerializer):
@@ -90,7 +91,8 @@ class MIOItemCreateSerializer(CustomModelSerializer):
 
     class Meta:
         model = MIOItem
-        fields = ['mio', 'warehouse', 'material', 'batch', 'count', 'assemb']
+        fields = ['mio', 'warehouse', 'material',
+                  'batch', 'count', 'assemb', 'is_bgtest_ok']
 
     def create(self, validated_data):
         mio = validated_data['mio']
@@ -109,7 +111,7 @@ class MIOItemCreateSerializer(CustomModelSerializer):
                     if k in assemb_dict:
                         mia = assemb_dict[k]
                         MIOItemA.objects.create(
-                            mioitem=instance, material=mia['material'], batch=mia['batch'], rate=v)
+                            mioitem=instance, rate=v, **mia)
                     else:
                         raise ParseError('缺少组合件')
         return instance