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':