record form field sort

hb_server/apps/mtm/views.py

@@ -186,7 +186,7 @@ class RecordFormFieldViewSet(OptimizationMixin, CreateUpdateModelAMixin, ModelVi
     queryset = RecordFormField.objects.all()
     filterset_fields = ['field_type', 'form']
     search_fields = ['field_name', 'field_key']
-    ordering = 'id'
+    ordering = 'sort'
     ordering_fields = ['sort', 'id']
 
     def get_serializer_class(self):

hb_server/apps/wpm/serializers.py

@@ -244,15 +244,20 @@ class OperationDetailSerializer(serializers.ModelSerializer):
 class OperationListSerializer(serializers.ModelSerializer):
     create_by_ = UserSimpleSerializer(source='create_by', read_only=True)
     step_ = StepSimpleSerializer(source='step', read_only=True)
-    wproduct_ = serializers.SerializerMethodField()
+    # wproduct_ = serializers.SerializerMethodField()
+    count_work = serializers.SerializerMethodField()
     equip_ = serializers.SerializerMethodField()
     record_ = serializers.SerializerMethodField()
     class Meta:
         model = Operation
         fields = '__all__'
 
-    def get_wproduct_(self, obj):
-        return WProduct.objects.filter(ow_wproduct__operation=obj).values('id', 'number')
+    # def get_wproduct_(self, obj):
+    #     return WProduct.objects.filter(ow_wproduct__operation=obj).values('id', 'number')
+
+    def get_count_work(self, obj):
+        count_work = 0
+        return count_work
     
     def get_equip_(self, obj):
         return EquipmentSimpleSerializer(instance=Equipment.objects.filter(oe_equip__operation=obj), many=True).data