From 92823553cbc325a9029cfeafea35a071752bd675 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Fri, 17 Sep 2021 09:06:50 +0800
Subject: [PATCH] wuliao

---
 hb_client/src/views/mtm/material.vue          |  1 +
 .../0014_alter_material_processes.py          | 18 ++++++++++++++
 .../migrations/0015_alter_material_name.py    | 18 ++++++++++++++
 .../mtm/migrations/0016_auto_20210917_0900.py | 24 +++++++++++++++++++
 hb_server/apps/mtm/models.py                  |  2 +-
 5 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 hb_server/apps/mtm/migrations/0014_alter_material_processes.py
 create mode 100644 hb_server/apps/mtm/migrations/0015_alter_material_name.py
 create mode 100644 hb_server/apps/mtm/migrations/0016_auto_20210917_0900.py

diff --git a/hb_client/src/views/mtm/material.vue b/hb_client/src/views/mtm/material.vue
index 921507d..f56d69b 100644
--- a/hb_client/src/views/mtm/material.vue
+++ b/hb_client/src/views/mtm/material.vue
@@ -170,6 +170,7 @@ import Pagination from "@/components/Pagination"; // secondary package based on
 const defaultmaterial = {
   name: "",
   number: "",
+  processes:[],
 };
 export default {
   components: { Pagination },
diff --git a/hb_server/apps/mtm/migrations/0014_alter_material_processes.py b/hb_server/apps/mtm/migrations/0014_alter_material_processes.py
new file mode 100644
index 0000000..3d10764
--- /dev/null
+++ b/hb_server/apps/mtm/migrations/0014_alter_material_processes.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.6 on 2021-09-16 08:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mtm', '0013_auto_20210914_1049'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='material',
+            name='processes',
+            field=models.JSONField(blank=True, default=list, null=True, verbose_name='工艺流程'),
+        ),
+    ]
diff --git a/hb_server/apps/mtm/migrations/0015_alter_material_name.py b/hb_server/apps/mtm/migrations/0015_alter_material_name.py
new file mode 100644
index 0000000..64cddd6
--- /dev/null
+++ b/hb_server/apps/mtm/migrations/0015_alter_material_name.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.6 on 2021-09-17 00:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mtm', '0014_alter_material_processes'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='material',
+            name='name',
+            field=models.CharField(blank=True, max_length=100, null=True, unique=True, verbose_name='物料名称'),
+        ),
+    ]
diff --git a/hb_server/apps/mtm/migrations/0016_auto_20210917_0900.py b/hb_server/apps/mtm/migrations/0016_auto_20210917_0900.py
new file mode 100644
index 0000000..a4555f9
--- /dev/null
+++ b/hb_server/apps/mtm/migrations/0016_auto_20210917_0900.py
@@ -0,0 +1,24 @@
+# Generated by Django 3.2.6 on 2021-09-17 01:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mtm', '0015_alter_material_name'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='material',
+            name='name',
+            field=models.CharField(default=1, max_length=100, unique=True, verbose_name='物料名称'),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='material',
+            name='processes',
+            field=models.JSONField(blank=True, default=list, verbose_name='工艺流程'),
+        ),
+    ]
diff --git a/hb_server/apps/mtm/models.py b/hb_server/apps/mtm/models.py
index 20eae86..e3f77ed 100644
--- a/hb_server/apps/mtm/models.py
+++ b/hb_server/apps/mtm/models.py
@@ -29,7 +29,7 @@ class Material(CommonAModel):
     specification = models.CharField('型号', max_length=100, null=True, blank=True)
     type = models.CharField('物料类型', choices= type_choices, max_length=20, default=1)
     sort_str = models.CharField('排序字符', max_length=100, null=True, blank=True)
-    processes = models.JSONField('工艺流程', default=list, null=True,blank=True)
+    processes = models.JSONField('工艺流程', default=list, blank=True)
     unit = models.CharField('基准计量单位', choices=unit_choices, default='块', max_length=10)
 
     class Meta: