From b672581c11be8967bcf67b70906c288a9a633fdc Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 6 Jul 2023 10:32:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mtm/migrations/0005_auto_20230706_1032.py | 31 +++++++++++++++++++
 apps/mtm/models.py                            |  4 +++
 apps/qm/migrations/0005_auto_20230706_1028.py | 22 +++++++++++++
 apps/qm/models.py                             |  4 +++
 apps/qm/views.py                              |  1 +
 5 files changed, 62 insertions(+)
 create mode 100644 apps/mtm/migrations/0005_auto_20230706_1032.py
 create mode 100644 apps/qm/migrations/0005_auto_20230706_1028.py

diff --git a/apps/mtm/migrations/0005_auto_20230706_1032.py b/apps/mtm/migrations/0005_auto_20230706_1032.py
new file mode 100644
index 00000000..ec360d41
--- /dev/null
+++ b/apps/mtm/migrations/0005_auto_20230706_1032.py
@@ -0,0 +1,31 @@
+# Generated by Django 3.2.12 on 2023-07-06 02:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mtm', '0004_mgroup_test_materials'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='material',
+            options={'ordering': ['sort', '-create_time'], 'verbose_name': '物料表'},
+        ),
+        migrations.AlterModelOptions(
+            name='mgroup',
+            options={'ordering': ['sort', '-create_time'], 'verbose_name': '测点集'},
+        ),
+        migrations.AddField(
+            model_name='material',
+            name='sort',
+            field=models.PositiveSmallIntegerField(default=1, verbose_name='排序'),
+        ),
+        migrations.AddField(
+            model_name='mgroup',
+            name='sort',
+            field=models.PositiveSmallIntegerField(default=1, verbose_name='排序'),
+        ),
+    ]
diff --git a/apps/mtm/models.py b/apps/mtm/models.py
index 625f220d..b4d7541b 100644
--- a/apps/mtm/models.py
+++ b/apps/mtm/models.py
@@ -24,9 +24,11 @@ class Material(CommonAModel):
     code = models.CharField('标识', max_length=50, null=True, blank=True)
     type = models.PositiveSmallIntegerField('物料类型', choices= type_choices, default=1, help_text=str(type_choices))
     testitems = models.JSONField('检测项目', default=list, blank=True)
+    sort = models.PositiveSmallIntegerField('排序', default=1)
 
     class Meta:
         verbose_name = '物料表'
+        ordering = ['sort', '-create_time']
 
 
 class Shift(CommonAModel):
@@ -55,9 +57,11 @@ class Mgroup(CommonBModel):
     product = models.ForeignKey(Material, verbose_name='主要产品', on_delete=models.SET_NULL, null=True, blank=True)
     input_materials = models.JSONField('直接材料', default=list, blank=True, help_text='material的ID列表')
     test_materials = models.JSONField('检测材料', default=list, blank=True, help_text='material的ID列表')
+    sort = models.PositiveSmallIntegerField('排序', default=1)
 
     class Meta:
         verbose_name = '测点集'
+        ordering = ['sort', '-create_time']
 
 
 class Goal(CommonADModel):
diff --git a/apps/qm/migrations/0005_auto_20230706_1028.py b/apps/qm/migrations/0005_auto_20230706_1028.py
new file mode 100644
index 00000000..1bad9246
--- /dev/null
+++ b/apps/qm/migrations/0005_auto_20230706_1028.py
@@ -0,0 +1,22 @@
+# Generated by Django 3.2.12 on 2023-07-06 02:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('qm', '0004_alter_quastat_rate_pass'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='testitem',
+            options={'ordering': ['sort', '-create_time']},
+        ),
+        migrations.AddField(
+            model_name='testitem',
+            name='sort',
+            field=models.PositiveSmallIntegerField(default=1, verbose_name='排序'),
+        ),
+    ]
diff --git a/apps/qm/models.py b/apps/qm/models.py
index e0371e4f..3e259f24 100644
--- a/apps/qm/models.py
+++ b/apps/qm/models.py
@@ -9,6 +9,10 @@ class TestItem(CommonAModel):
     检验项目
     """
     name = models.CharField('名称', max_length=100)
+    sort = models.PositiveSmallIntegerField('排序', default=1)
+
+    class Meta:
+        ordering = ['sort', '-create_time']
 
 # Create your models here.
 class QuaStat(CommonBDModel):
diff --git a/apps/qm/views.py b/apps/qm/views.py
index a2c13277..c1440015 100644
--- a/apps/qm/views.py
+++ b/apps/qm/views.py
@@ -35,6 +35,7 @@ class QuaStatViewSet(ListModelMixin, BulkUpdateModelMixin, CustomGenericViewSet)
     update_serializer_class = QuaStatUpdateSerializer
     filterset_fields = ['type', 'year_s', 'month_s', 'day_s', 'material', 'testitem', 'belong_dept', 'sflog', 'sflog__mgroup']
     select_related_fields = ['belong_dept', 'material', 'testitem']
+    ordering = ['belong_dept__sort', 'material__sort', 'testitem__sort', 'year_s', 'month_s', 'day_s']
     
 
     def perform_update(self, serializer):