zcdsj
/
hberp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加车间操作设备、自定义表接口

This commit is contained in:
caoqianming 2021-11-19 13:59:27 +08:00
parent dc2468bd71
commit 28b44f92a8
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hb_server/apps/wpm/serializers.py
View File

@ -143,7 +143,7 @@ class OperationListSerializer(serializers.ModelSerializer):
step_ = StepSimpleSerializer(source='step', read_only=True) step_ = StepSimpleSerializer(source='step', read_only=True)
wproduct_count = serializers.SerializerMethodField() wproduct_count = serializers.SerializerMethodField()
equip_count = serializers.SerializerMethodField() equip_count = serializers.SerializerMethodField()
form_count = serializers.SerializerMethodField() record_count = serializers.SerializerMethodField()
class Meta: class Meta:
model = Operation model = Operation
fields = '__all__' fields = '__all__'
@ -154,7 +154,7 @@ class OperationListSerializer(serializers.ModelSerializer):
def get_equip_count(self, obj): def get_equip_count(self, obj):
return obj.oe_operation.count() return obj.oe_operation.count()
def get_form_count(self, obj): def get_record_count(self, obj):
return obj.or_operation.count() return obj.or_operation.count()
class OperationCreateSerializer(serializers.Serializer): class OperationCreateSerializer(serializers.Serializer):

4
hb_server/apps/wpm/urls.py
View File

@ -3,13 +3,15 @@ from rest_framework import urlpatterns
from django.urls import path, include from django.urls import path, include
from rest_framework.routers import DefaultRouter 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 = DefaultRouter()
router.register('wmaterial', WMaterialViewSet, basename='wmaterial') router.register('wmaterial', WMaterialViewSet, basename='wmaterial')
router.register('wproduct', WProductViewSet, basename='wproduct') router.register('wproduct', WProductViewSet, basename='wproduct')
router.register('operation', OperationViewSet, basename='operation') router.register('operation', OperationViewSet, basename='operation')
router.register('operation_wproduct', OperationWproductViewSet, basename='operation_wproduct') 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') router.register('subplan', WPlanViewSet, basename='wplan')
urlpatterns = [ urlpatterns = [
path('do/init/', DoFormInit.as_view()), path('do/init/', DoFormInit.as_view()),