From 52df9ddec52f3a9c95408455fd6ad5ad2265e87b Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 13 Oct 2021 08:58:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=88=86=E8=A7=A3=E8=A1=A8?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mtm/migrations/0021_auto_20211013_0856.py | 56 +++++++++++++++++++
 hb_server/apps/mtm/models.py                  |  8 +--
 hb_server/apps/mtm/views.py                   |  4 +-
 3 files changed, 62 insertions(+), 6 deletions(-)
 create mode 100644 hb_server/apps/mtm/migrations/0021_auto_20211013_0856.py

diff --git a/hb_server/apps/mtm/migrations/0021_auto_20211013_0856.py b/hb_server/apps/mtm/migrations/0021_auto_20211013_0856.py
new file mode 100644
index 0000000..21d8787
--- /dev/null
+++ b/hb_server/apps/mtm/migrations/0021_auto_20211013_0856.py
@@ -0,0 +1,56 @@
+# Generated by Django 3.2.6 on 2021-10-13 00:56
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('mtm', '0020_auto_20211012_1657'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='inputmaterial',
+            name='create_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='inputmaterial_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人'),
+        ),
+        migrations.AddField(
+            model_name='inputmaterial',
+            name='update_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='inputmaterial_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'),
+        ),
+        migrations.AddField(
+            model_name='outputmaterial',
+            name='create_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='outputmaterial_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人'),
+        ),
+        migrations.AddField(
+            model_name='outputmaterial',
+            name='update_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='outputmaterial_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'),
+        ),
+        migrations.AddField(
+            model_name='techdoc',
+            name='create_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='techdoc_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人'),
+        ),
+        migrations.AddField(
+            model_name='techdoc',
+            name='update_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='techdoc_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'),
+        ),
+        migrations.AddField(
+            model_name='usedstep',
+            name='create_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='usedstep_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人'),
+        ),
+        migrations.AddField(
+            model_name='usedstep',
+            name='update_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='usedstep_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'),
+        ),
+    ]
diff --git a/hb_server/apps/mtm/models.py b/hb_server/apps/mtm/models.py
index 4574713..0a0c582 100644
--- a/hb_server/apps/mtm/models.py
+++ b/hb_server/apps/mtm/models.py
@@ -141,7 +141,7 @@ class SubProduction(CommonAModel):
         verbose_name_plural = verbose_name
 
 
-class InputMaterial(BaseModel):
+class InputMaterial(CommonAModel):
     """
     输入物料
     """
@@ -156,7 +156,7 @@ class InputMaterial(BaseModel):
 
 
 
-class OutputMaterial(BaseModel):
+class OutputMaterial(CommonAModel):
     """
     输出物料
     """
@@ -169,7 +169,7 @@ class OutputMaterial(BaseModel):
         verbose_name = '输出物料'
         verbose_name_plural = verbose_name
     
-class UsedStep(BaseModel):
+class UsedStep(CommonAModel):
     """
     涉及的生产子工序
     """
@@ -182,7 +182,7 @@ class UsedStep(BaseModel):
         verbose_name_plural = verbose_name
 
 
-class TechDoc(BaseModel):
+class TechDoc(CommonAModel):
     """
     技术文件
     """
diff --git a/hb_server/apps/mtm/views.py b/hb_server/apps/mtm/views.py
index a8a85d9..c18d60f 100644
--- a/hb_server/apps/mtm/views.py
+++ b/hb_server/apps/mtm/views.py
@@ -80,7 +80,7 @@ class SubProductionViewSet(CreateUpdateModelAMixin, ModelViewSet):
     serializer_class = SubProductionSerializer
     ordering = ['sort']
 
-class InputMaterialViewSet(ModelViewSet):
+class InputMaterialViewSet(CreateUpdateModelAMixin, ModelViewSet):
     """
     输入物料-增删改查
     """
@@ -97,7 +97,7 @@ class InputMaterialViewSet(ModelViewSet):
             return InputMaterialUpdateSerializer
         return InputMaterialSerializer
 
-class OutputMaterialViewSet(ModelViewSet):
+class OutputMaterialViewSet(CreateUpdateModelAMixin, ModelViewSet):
     """
     输出物料-增删改查
     """