diff --git a/hb_server/apps/mns/__init__.py b/hb_server/apps/mns/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/hb_server/apps/mns/admin.py b/hb_server/apps/mns/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/hb_server/apps/mns/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/hb_server/apps/mns/apps.py b/hb_server/apps/mns/apps.py new file mode 100644 index 0000000..66dd6da --- /dev/null +++ b/hb_server/apps/mns/apps.py @@ -0,0 +1,7 @@ +from django.apps import AppConfig + + +class MnsConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'apps.mns' + verbose_name = '消息通知系统' diff --git a/hb_server/apps/mns/migrations/__init__.py b/hb_server/apps/mns/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/hb_server/apps/mns/models.py b/hb_server/apps/mns/models.py new file mode 100644 index 0000000..f214cad --- /dev/null +++ b/hb_server/apps/mns/models.py @@ -0,0 +1,6 @@ +from django.db import models +from utils.model import BaseModel +# Create your models here. + +class Notify(BaseModel) +pass \ No newline at end of file diff --git a/hb_server/apps/mns/tests.py b/hb_server/apps/mns/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/hb_server/apps/mns/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/hb_server/apps/mns/views.py b/hb_server/apps/mns/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/hb_server/apps/mns/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py index a5d9150..e9537d9 100644 --- a/hb_server/apps/wpm/views.py +++ b/hb_server/apps/wpm/views.py @@ -460,7 +460,16 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet): 流程卡 """ obj = self.get_object() - return Response(WProductCardSerializer(instance=obj).data) + card_data = WProductCardSerializer(instance=obj).data + ret = [] + if card_data['parents']: + pass + else: + ret.append(['序号', '工序', card_data['number']]) + step_list_full = card_data['step_list_full'] + for index, item in enumerate(step_list_full): + ret.append([str(index+1), item['step_name'], item['actions']]) + return Response(ret) class WproductTicketViewSet(ListModelMixin, GenericViewSet): """