From 20b5cdde67db1184a81d519af557be807855068b Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 1 Dec 2021 10:19:52 +0800
Subject: [PATCH] =?UTF-8?q?recordform=E5=A2=9E=E5=8A=A0enabled,number?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mtm/migrations/0039_auto_20211201_1016.py | 23 +++++++++++++++++++
 hb_server/apps/mtm/models.py                  |  2 ++
 hb_server/apps/mtm/serializers.py             |  6 ++---
 hb_server/apps/mtm/views.py                   |  4 ++--
 4 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 hb_server/apps/mtm/migrations/0039_auto_20211201_1016.py

diff --git a/hb_server/apps/mtm/migrations/0039_auto_20211201_1016.py b/hb_server/apps/mtm/migrations/0039_auto_20211201_1016.py
new file mode 100644
index 0000000..e40da9a
--- /dev/null
+++ b/hb_server/apps/mtm/migrations/0039_auto_20211201_1016.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.2.9 on 2021-12-01 02:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mtm', '0038_process_type'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='recordform',
+            name='enabled',
+            field=models.BooleanField(default=False, verbose_name='是否启用'),
+        ),
+        migrations.AddField(
+            model_name='recordform',
+            name='number',
+            field=models.CharField(blank=True, max_length=32, null=True, verbose_name='编号'),
+        ),
+    ]
diff --git a/hb_server/apps/mtm/models.py b/hb_server/apps/mtm/models.py
index fe4649e..dccb4d0 100644
--- a/hb_server/apps/mtm/models.py
+++ b/hb_server/apps/mtm/models.py
@@ -115,6 +115,8 @@ class RecordForm(CommonAModel):
     type = models.IntegerField('表格类型', choices=type_choices, default=1)
     step = models.ForeignKey(Step, verbose_name='关联子工序', on_delete=models.CASCADE, null=True, blank=True)
     material = models.ForeignKey(Material, verbose_name='关联物料', on_delete=models.CASCADE, null=True, blank=True)
+    enabled = models.BooleanField('是否启用', default=False)
+    number = models.CharField('编号', null=True, blank=True, max_length=32)
 
     class Meta:
         verbose_name = '记录表格'
diff --git a/hb_server/apps/mtm/serializers.py b/hb_server/apps/mtm/serializers.py
index 8cc2cb5..153971f 100644
--- a/hb_server/apps/mtm/serializers.py
+++ b/hb_server/apps/mtm/serializers.py
@@ -160,7 +160,7 @@ class RecordFormSimpleSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = RecordForm
-        fields = ['id', 'name']
+        fields = ['id', 'name', 'number', 'enabled']
 class RecordFormSerializer(serializers.ModelSerializer):
     step_ = StepSimpleSerializer(source='step', read_only=True)
     material_ = MaterialSimpleSerializer(source='material', read_only=True)
@@ -180,12 +180,12 @@ class RecordFormSerializer(serializers.ModelSerializer):
 class RecordFormCreateSerializer(serializers.ModelSerializer):
     class Meta:
         model = RecordForm
-        fields = ['name', 'type', 'step', 'material']
+        fields = ['name', 'type', 'step', 'material', 'number', 'enabled']
 
 class RecordFormUpdateSerializer(serializers.ModelSerializer):
     class Meta:
         model = RecordForm
-        fields = ['name', 'type']
+        fields = ['name', 'type', 'number', 'enabled']
 
 class RecordFormFieldSerializer(serializers.ModelSerializer):
     class Meta:
diff --git a/hb_server/apps/mtm/views.py b/hb_server/apps/mtm/views.py
index 847e1dc..2ab241c 100644
--- a/hb_server/apps/mtm/views.py
+++ b/hb_server/apps/mtm/views.py
@@ -40,7 +40,7 @@ class ProcessViewSet(PageOrNot, CreateUpdateModelAMixin, ModelViewSet):
     queryset = Process.objects.select_related('instruction', 'workshop').all()
     serializer_class = ProcessSerializer
     search_fields = ['name', 'number']
-    filterset_fields = ['number', 'workshop']
+    filterset_fields = ['number', 'workshop', 'type']
     ordering_fields = ['number']
     ordering = ['number']
 
@@ -151,7 +151,7 @@ class RecordFormViewSet(OptimizationMixin, CreateUpdateModelAMixin, ModelViewSet
     """
     perms_map = {'*':'*'}
     queryset = RecordForm.objects.all()
-    filterset_fields = ['step', 'type', 'material']
+    filterset_fields = ['step', 'type', 'material', 'number', 'enabled']
     search_fields = ['name']
     ordering='id'