diff --git a/hb_server/apps/wpm/serializers.py b/hb_server/apps/wpm/serializers.py index 5a755fe..877ed61 100644 --- a/hb_server/apps/wpm/serializers.py +++ b/hb_server/apps/wpm/serializers.py @@ -143,7 +143,7 @@ class OperationListSerializer(serializers.ModelSerializer): step_ = StepSimpleSerializer(source='step', read_only=True) wproduct_count = serializers.SerializerMethodField() equip_count = serializers.SerializerMethodField() - form_count = serializers.SerializerMethodField() + record_count = serializers.SerializerMethodField() class Meta: model = Operation fields = '__all__' @@ -154,7 +154,7 @@ class OperationListSerializer(serializers.ModelSerializer): def get_equip_count(self, obj): return obj.oe_operation.count() - def get_form_count(self, obj): + def get_record_count(self, obj): return obj.or_operation.count() class OperationCreateSerializer(serializers.Serializer): diff --git a/hb_server/apps/wpm/urls.py b/hb_server/apps/wpm/urls.py index b5d4018..96d2986 100644 --- a/hb_server/apps/wpm/urls.py +++ b/hb_server/apps/wpm/urls.py @@ -3,13 +3,15 @@ from rest_framework import urlpatterns from django.urls import path, include from rest_framework.routers import DefaultRouter -from apps.wpm.views import DoFormInit, DoFormSubmit, OperationViewSet, OperationWproductViewSet, WMaterialViewSet, WPlanViewSet, WProductViewSet +from apps.wpm.views import DoFormInit, DoFormSubmit, OperationEquipViewSet, OperationRecordViewSet, OperationViewSet, OperationWproductViewSet, WMaterialViewSet, WPlanViewSet, WProductViewSet router = DefaultRouter() router.register('wmaterial', WMaterialViewSet, basename='wmaterial') router.register('wproduct', WProductViewSet, basename='wproduct') router.register('operation', OperationViewSet, basename='operation') router.register('operation_wproduct', OperationWproductViewSet, basename='operation_wproduct') +router.register('operation_equip', OperationEquipViewSet, basename='operation_equip') +router.register('operation_record', OperationRecordViewSet, basename='operation_record') router.register('subplan', WPlanViewSet, basename='wplan') urlpatterns = [ path('do/init/', DoFormInit.as_view()),