From 0b58bf7b2a8351d61b4da2d4d8958b1a44c8cbc7 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 15 Oct 2021 09:09:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=8C=89=E5=A4=A7=E5=B7=A5=E5=BA=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/pm/models.py | 2 +-
 hb_server/apps/pm/views.py  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hb_server/apps/pm/models.py b/hb_server/apps/pm/models.py
index 0693ed8..5aab5f3 100644
--- a/hb_server/apps/pm/models.py
+++ b/hb_server/apps/pm/models.py
@@ -37,7 +37,7 @@ class SubProductionPlan(CommonAModel):
     end_date = models.DateField('计划完工日期')
     workshop = models.ForeignKey(Organization, verbose_name='生产车间', on_delete=models.CASCADE)
     process = models.ForeignKey(Process, verbose_name='关联大工序', on_delete=models.CASCADE)
-
+    steps = models.JSONField('工艺步骤', default=list)
     class Meta:
         verbose_name = '子生产计划'
         verbose_name_plural = verbose_name
diff --git a/hb_server/apps/pm/views.py b/hb_server/apps/pm/views.py
index b6442ed..ca26e45 100644
--- a/hb_server/apps/pm/views.py
+++ b/hb_server/apps/pm/views.py
@@ -84,8 +84,8 @@ class SubProductionPlanViewSet(CreateUpdateModelAMixin, ListModelMixin, UpdateMo
     queryset = SubProductionPlan.objects.select_related('process', 'workshop')
     search_fields = []
     filterset_fields = ['production_plan']
-    ordering_fields = ['id']
-    ordering = ['-id']
+    ordering_fields = ['process__number']
+    ordering = ['process__number']
 
     def get_serializer_class(self):
         if self.action == 'list':