From 28b44f92a8222c492a46ee746838e94aca05dffe Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 19 Nov 2021 13:59:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=A6=E9=97=B4=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E8=AE=BE=E5=A4=87=E3=80=81=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/wpm/serializers.py | 4 ++-- hb_server/apps/wpm/urls.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) 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()),