From fb776d2272a63931b84d1a095dc6ce19b720a0be Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 17 Aug 2021 13:54:39 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E5=90=8C=E6=AD=A5wf=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/wf/migrations/0001_initial.py | 106 +++++++++++++++++++ hb_server/apps/wf/migrations/__init__.py | 0 hb_server/apps/wf/models.py | 11 +- hb_server/apps/wf/urls.py | 4 +- hb_server/server/settings.py | 3 +- hb_server/server/urls.py | 1 + 6 files changed, 118 insertions(+), 7 deletions(-) create mode 100644 hb_server/apps/wf/migrations/0001_initial.py create mode 100644 hb_server/apps/wf/migrations/__init__.py diff --git a/hb_server/apps/wf/migrations/0001_initial.py b/hb_server/apps/wf/migrations/0001_initial.py new file mode 100644 index 0000000..5d6d03e --- /dev/null +++ b/hb_server/apps/wf/migrations/0001_initial.py @@ -0,0 +1,106 @@ +# Generated by Django 3.2.6 on 2021-08-17 05:51 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='State', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('name', models.CharField(max_length=50, verbose_name='名称')), + ('is_hidden', models.BooleanField(default=False, help_text='设置为True时,获取工单步骤api中不显示此状态(当前处于此状态时除外)', verbose_name='是否隐藏')), + ('sort', models.IntegerField(default=0, help_text='用于工单步骤接口时，step上状态的顺序(因为存在网状情况，所以需要人为设定顺序),值越小越靠前', verbose_name='状态顺序')), + ('type', models.IntegerField(choices=[(0, '普通类型'), (1, '初始状态'), (2, '结束状态')], default=0, help_text='0.普通类型 1.初始状态(用于新建工单时,获取对应的字段必填及transition信息) 2.结束状态(此状态下的工单不得再处理，即没有对应的transition)', verbose_name='状态类型')), + ('enable_retreat', models.BooleanField(default=False, help_text='开启后允许工单创建人在此状态直接撤回工单到初始状态', verbose_name='允许撤回')), + ('participant_type', models.IntegerField(blank=True, default=1, help_text='0.无处理人,1.个人,2.多人,3.部门,4.角色,5.变量(支持工单创建人,创建人的leader),6.脚本,7.工单的字段内容(如表单中的"测试负责人"，需要为用户名或者逗号隔开的多个用户名),8.父工单的字段内容。 初始状态请选择类型5，参与人填creator', verbose_name='参与者类型')), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='Workflow', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('name', models.CharField(max_length=50, verbose_name='名称')), + ('description', models.CharField(max_length=200, verbose_name='描述')), + ('view_permission_check', models.BooleanField(default=True, help_text='开启后，只允许工单的关联人(创建人、曾经的处理人)有权限查看工单', verbose_name='查看权限校验')), + ('limit_expression', models.JSONField(blank=True, default=dict, help_text='限制周期({"period":24} 24小时), 限制次数({"count":1}在限制周期内只允许提交1次), 限制级别({"level":1} 针对(1单个用户 2全局)限制周期限制次数,默认特定用户);允许特定人员提交({"allow_persons":"zhangsan,lisi"}只允许张三提交工单,{"allow_depts":"1,2"}只允许部门id为1和2的用户提交工单，{"allow_roles":"1,2"}只允许角色id为1和2的用户提交工单)', max_length=1000, verbose_name='限制表达式')), + ('display_form_str', models.JSONField(blank=True, default=list, help_text='默认"[]"，用于用户只有对应工单查看权限时显示哪些字段,field_key的list的json,如["days","sn"],内置特殊字段participant_info.participant_name:当前处理人信息(部门名称、角色名称)，state.state_name:当前状态的状态名,workflow.workflow_name:工作流名称', max_length=10000, verbose_name='展现表单字段')), + ('title_template', models.CharField(blank=True, default='你有一个待办工单:{title}', help_text='工单字段的值可以作为参数写到模板中，格式如：你有一个待办工单:{title}', max_length=50, null=True, verbose_name='标题模板')), + ('content_template', models.CharField(blank=True, default='标题:{title}, 创建时间:{create_time}', help_text='工单字段的值可以作为参数写到模板中，格式如：标题:{title}, 创建时间:{create_time}', max_length=1000, null=True, verbose_name='内容模板')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='workflow_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='workflow_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='Transition', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('name', models.CharField(max_length=50, verbose_name='操作')), + ('timer', models.IntegerField(default=0, help_text='单位秒。处于源状态X秒后如果状态都没有过变化则自动流转到目标状态。设置时间有效', verbose_name='定时器(单位秒)')), + ('condition_expression', models.JSONField(default=list, help_text='流转条件表达式，根据表达式中的条件来确定流转的下个状态，格式为[{"expression":"{days} > 3 and {days}<10", "target_state":11}] 其中{}用于填充工单的字段key,运算时会换算成实际的值，当符合条件下个状态将变为target_state_id中的值,表达式只支持简单的运算或datetime/time运算.loonflow会以首次匹配成功的条件为准，所以多个条件不要有冲突', max_length=1000, verbose_name='条件表达式')), + ('attribute_type', models.IntegerField(choices=[(1, '同意'), (2, '拒绝'), (3, '其他')], default=1, help_text='属性类型，1.同意，2.拒绝，3.其他', verbose_name='属性类型')), + ('field_require_check', models.BooleanField(default=True, help_text='默认在用户点击操作的时候需要校验工单表单的必填项,如果设置为否则不检查。用于如"退回"属性的操作，不需要填写表单内容', verbose_name='是否校验必填项')), + ('destination_state', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='dstate_transition', to='wf.state', verbose_name='目的状态')), + ('source_state', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='sstate_transition', to='wf.state', verbose_name='源状态')), + ('workflow', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='wf.workflow', verbose_name='所属工作流')), + ], + options={ + 'abstract': False, + }, + ), + migrations.AddField( + model_name='state', + name='workflow', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='wf.workflow', verbose_name='所属工作流'), + ), + migrations.CreateModel( + name='CustomField', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('field_type', models.IntegerField(help_text='5.字符串，10.整形，15.浮点型，20.布尔，25.日期，30.日期时间，35.单选框，40.多选框，45.下拉列表，50.多选下拉列表，55.文本域，60.用户名, 70.多选的用户名, 80.附件(只保存路径，多个使用逗号隔开)', verbose_name='类型')), + ('field_key', models.CharField(help_text='字段类型请尽量特殊，避免与系统中关键字冲突', max_length=50, verbose_name='字段标识')), + ('field_name', models.CharField(max_length=50, verbose_name='字段名称')), + ('sort', models.IntegerField(default=0, help_text='工单基础字段在表单中排序为:流水号0,标题20,状态id40,状态名41,创建人80,创建时间100,更新时间120.前端展示工单信息的表单可以根据这个id顺序排列', verbose_name='排序')), + ('default_value', models.CharField(blank=True, help_text='前端展示时，可以将此内容作为表单中的该字段的默认值', max_length=100, null=True, verbose_name='默认值')), + ('description', models.CharField(blank=True, default='', help_text='字段的描述信息，可用于显示在字段的下方对该字段的详细描述', max_length=100, verbose_name='描述')), + ('placeholder', models.CharField(blank=True, default='', help_text='用户工单详情表单中作为字段的占位符显示', max_length=100, verbose_name='占位符')), + ('field_template', models.TextField(blank=True, default='', help_text='文本域类型字段前端显示时可以将此内容作为字段的placeholder', verbose_name='文本域模板')), + ('boolean_field_display', models.JSONField(blank=True, default=dict, help_text='当为布尔类型时候，可以支持自定义显示形式。{"1":"是","0":"否"}或{"1":"需要","0":"不需要"}，注意数字也需要引号', verbose_name='布尔类型显示名')), + ('field_choice', models.JSONField(blank=True, default=dict, help_text='radio,checkbox,select,multiselect类型可供选择的选项，格式为json如:{"1":"中国", "2":"美国"},注意数字也需要引号', verbose_name='radio、checkbox、select的选项')), + ('label', models.JSONField(blank=True, default=dict, help_text='自定义标签，json格式，调用方可根据标签自行处理特殊场景逻辑，loonflow只保存文本内容', verbose_name='标签')), + ('workflow', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='wf.workflow', verbose_name='所属工作流')), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/hb_server/apps/wf/migrations/__init__.py b/hb_server/apps/wf/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/hb_server/apps/wf/models.py b/hb_server/apps/wf/models.py index eff4766..df02127 100644 --- a/hb_server/apps/wf/models.py +++ b/hb_server/apps/wf/models.py @@ -14,7 +14,10 @@ class Workflow(CommonAModel): name = models.CharField('名称', max_length=50) description = models.CharField('描述', max_length=200) view_permission_check = models.BooleanField('查看权限校验', default=True, help_text='开启后，只允许工单的关联人(创建人、曾经的处理人)有权限查看工单') + limit_expression = models.JSONField('限制表达式', max_length=1000, default=dict, blank=True, help_text='限制周期({"period":24} 24小时), 限制次数({"count":1}在限制周期内只允许提交1次), 限制级别({"level":1} 针对(1单个用户 2全局)限制周期限制次数,默认特定用户);允许特定人员提交({"allow_persons":"zhangsan,lisi"}只允许张三提交工单,{"allow_depts":"1,2"}只允许部门id为1和2的用户提交工单，{"allow_roles":"1,2"}只允许角色id为1和2的用户提交工单)') + display_form_str = models.JSONField('展现表单字段', max_length=10000, default=list, blank=True, help_text='默认"[]"，用于用户只有对应工单查看权限时显示哪些字段,field_key的list的json,如["days","sn"],内置特殊字段participant_info.participant_name:当前处理人信息(部门名称、角色名称)，state.state_name:当前状态的状态名,workflow.workflow_name:工作流名称') title_template = models.CharField('标题模板', max_length=50, default='你有一个待办工单:{title}', null=True, blank=True, help_text='工单字段的值可以作为参数写到模板中，格式如：你有一个待办工单:{title}') + content_template = models.CharField('内容模板', max_length=1000, default='标题:{title}, 创建时间:{create_time}', null=True, blank=True, help_text='工单字段的值可以作为参数写到模板中，格式如：标题:{title}, 创建时间:{create_time}') class State(BaseModel): """ @@ -49,7 +52,7 @@ class Transition(BaseModel): timer = models.IntegerField('定时器(单位秒)', default=0, help_text='单位秒。处于源状态X秒后如果状态都没有过变化则自动流转到目标状态。设置时间有效') source_state = models.ForeignKey(State, on_delete=models.CASCADE, verbose_name='源状态', related_name='sstate_transition') destination_state = models.ForeignKey(State, on_delete=models.CASCADE, verbose_name='目的状态', related_name='dstate_transition') - condition_expression = models.JSONField('条件表达式', max_length=1000, default='[]', help_text='流转条件表达式，根据表达式中的条件来确定流转的下个状态，格式为[{"expression":"{days} > 3 and {days}<10", "target_state":11}] 其中{}用于填充工单的字段key,运算时会换算成实际的值，当符合条件下个状态将变为target_state_id中的值,表达式只支持简单的运算或datetime/time运算.loonflow会以首次匹配成功的条件为准，所以多个条件不要有冲突' ) + condition_expression = models.JSONField('条件表达式', max_length=1000, default=list, help_text='流转条件表达式，根据表达式中的条件来确定流转的下个状态，格式为[{"expression":"{days} > 3 and {days}<10", "target_state":11}] 其中{}用于填充工单的字段key,运算时会换算成实际的值，当符合条件下个状态将变为target_state_id中的值,表达式只支持简单的运算或datetime/time运算.loonflow会以首次匹配成功的条件为准，所以多个条件不要有冲突' ) attribute_type = models.IntegerField('属性类型', default=1, choices=attribute_type_choices, help_text='属性类型，1.同意，2.拒绝，3.其他') field_require_check = models.BooleanField('是否校验必填项', default=True, help_text='默认在用户点击操作的时候需要校验工单表单的必填项,如果设置为否则不检查。用于如"退回"属性的操作，不需要填写表单内容') @@ -81,8 +84,8 @@ class CustomField(BaseModel): description = models.CharField('描述', max_length=100, blank=True, default='', help_text='字段的描述信息，可用于显示在字段的下方对该字段的详细描述') placeholder = models.CharField('占位符', max_length=100, blank=True, default='', help_text='用户工单详情表单中作为字段的占位符显示') field_template = models.TextField('文本域模板', default='', blank=True, help_text='文本域类型字段前端显示时可以将此内容作为字段的placeholder') - boolean_field_display = models.JSONField('布尔类型显示名', default='{}', blank=True, + boolean_field_display = models.JSONField('布尔类型显示名', default=dict, blank=True, help_text='当为布尔类型时候，可以支持自定义显示形式。{"1":"是","0":"否"}或{"1":"需要","0":"不需要"}，注意数字也需要引号') - field_choice = models.JSONField('radio、checkbox、select的选项', default='{}', blank=True, + field_choice = models.JSONField('radio、checkbox、select的选项', default=dict, blank=True, help_text='radio,checkbox,select,multiselect类型可供选择的选项，格式为json如:{"1":"中国", "2":"美国"},注意数字也需要引号') - label = models.JSONField('标签', blank=True, default='{}', help_text='自定义标签，json格式，调用方可根据标签自行处理特殊场景逻辑，loonflow只保存文本内容') \ No newline at end of file + label = models.JSONField('标签', blank=True, default=dict, help_text='自定义标签，json格式，调用方可根据标签自行处理特殊场景逻辑，loonflow只保存文本内容') diff --git a/hb_server/apps/wf/urls.py b/hb_server/apps/wf/urls.py index a81ad24..a4ead02 100644 --- a/hb_server/apps/wf/urls.py +++ b/hb_server/apps/wf/urls.py @@ -1,11 +1,11 @@ from django.db.models import base from rest_framework import urlpatterns -from apps.pum.views import VendorViewSet +from apps.wf.views import WorkflowViewSet from django.urls import path, include from rest_framework.routers import DefaultRouter router = DefaultRouter() -router.register('vendor', VendorViewSet, basename='vendor') +router.register('workflow', WorkflowViewSet, basename='vendor') urlpatterns = [ path('', include(router.urls)), ] diff --git a/hb_server/server/settings.py b/hb_server/server/settings.py index a48a0e9..765c6bc 100644 --- a/hb_server/server/settings.py +++ b/hb_server/server/settings.py @@ -49,7 +49,8 @@ INSTALLED_APPS = [ 'apps.monitor', 'apps.pum', 'apps.em', - 'apps.hrm' + 'apps.hrm', + 'apps.wf' ] MIDDLEWARE = [ diff --git a/hb_server/server/urls.py b/hb_server/server/urls.py index 1ee8d0c..d19a401 100644 --- a/hb_server/server/urls.py +++ b/hb_server/server/urls.py @@ -60,6 +60,7 @@ urlpatterns = [ path('api/pum/', include('apps.pum.urls')), path('api/em/', include('apps.em.urls')), path('api/hrm/', include('apps.hrm.urls')), + path('api/wf/', include('apps.wf.urls')), # 工具 path('api/utils/signature/', GenSignature.as_view()), From 331c3ce602b4415f6407cd1ab3e3780b2d77c057 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 17 Aug 2021 16:29:31 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E8=A7=86=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/wf/models.py | 11 +++++++++++ hb_server/apps/wf/serializers.py | 7 ++++++- hb_server/apps/wf/urls.py | 5 +++-- hb_server/apps/wf/views.py | 28 ++++++++++++++++++++++++---- 4 files changed, 44 insertions(+), 7 deletions(-) diff --git a/hb_server/apps/wf/models.py b/hb_server/apps/wf/models.py index df02127..4ee2699 100644 --- a/hb_server/apps/wf/models.py +++ b/hb_server/apps/wf/models.py @@ -28,6 +28,17 @@ class State(BaseModel): (1, '初始状态'), (2, '结束状态') ) + type2_choices = ( + (0, '无处理人'), + (1, '个人'), + (2, '多人'), + (3, '部门'), + (4, '角色'), + (5, '变量'), + (6, '脚本'), + (7, '工单的字段'), + (8, '父工单的字段') + ) name = models.CharField('名称', max_length=50) workflow = models.ForeignKey(Workflow, on_delete=models.CASCADE, verbose_name='所属工作流') is_hidden = models.BooleanField('是否隐藏', default=False, help_text='设置为True时,获取工单步骤api中不显示此状态(当前处于此状态时除外)') diff --git a/hb_server/apps/wf/serializers.py b/hb_server/apps/wf/serializers.py index 4fb91c4..f0ff192 100644 --- a/hb_server/apps/wf/serializers.py +++ b/hb_server/apps/wf/serializers.py @@ -1,9 +1,14 @@ from rest_framework.serializers import ModelSerializer -from .models import Workflow +from .models import State, Workflow class WorkflowSerializer(ModelSerializer): class Meta: model = Workflow fields = '__all__' + +class StateSerializer(ModelSerializer): + class Meta: + model = State + fields = '__all__' diff --git a/hb_server/apps/wf/urls.py b/hb_server/apps/wf/urls.py index a4ead02..d61f55d 100644 --- a/hb_server/apps/wf/urls.py +++ b/hb_server/apps/wf/urls.py @@ -1,11 +1,12 @@ from django.db.models import base from rest_framework import urlpatterns -from apps.wf.views import WorkflowViewSet +from apps.wf.views import StateViewSet, WorkflowViewSet from django.urls import path, include from rest_framework.routers import DefaultRouter router = DefaultRouter() -router.register('workflow', WorkflowViewSet, basename='vendor') +router.register('workflow', WorkflowViewSet, basename='workflow') +router.register('state', StateViewSet, basename='workflowstate') urlpatterns = [ path('', include(router.urls)), ] diff --git a/hb_server/apps/wf/views.py b/hb_server/apps/wf/views.py index bbba501..bccd216 100644 --- a/hb_server/apps/wf/views.py +++ b/hb_server/apps/wf/views.py @@ -1,7 +1,10 @@ -from apps.wf.serializers import WorkflowSerializer +from rest_framework.response import Response +from rest_framework import serializers +from rest_framework.mixins import CreateModelMixin, RetrieveModelMixin, UpdateModelMixin +from apps.wf.serializers import StateSerializer, WorkflowSerializer from django.shortcuts import render -from rest_framework.viewsets import ModelViewSet - +from rest_framework.viewsets import GenericViewSet, ModelViewSet +from rest_framework.decorators import action from apps.wf.models import Workflow, State, Transition from apps.system.mixins import CreateUpdateModelAMixin, OptimizationMixin @@ -15,4 +18,21 @@ class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): search_fields = ['name', 'description'] filterset_fields = [] ordering_fields = ['create_time'] - ordering = ['-create_time'] \ No newline at end of file + ordering = ['-create_time'] + + @action(methods=['get'], detail=True, perms_map={'get':'workflow_update'}, pagination_class=None, serializer_class=StateSerializer) + def states(self, request, pk=None): + """ + 工作流下的状态节点 + """ + wf = self.get_object() + serializer = self.serializer_class(instance=State.objects.filter(workflow=wf), many=True) + return Response(serializer.data) + +class StateViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, GenericViewSet): + perms_map = {'*':'*'} + queryset = State.objects.all() + serializer_class = StateSerializer + search_fields = ['name'] + filterset_fields = ['workflow'] + ordering = ['sort'] \ No newline at end of file From 11f0e69752b89c80b3cf1ae53fa96ed44f6c689c Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 18 Aug 2021 08:58:37 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=92=8C=E6=B5=81?= =?UTF-8?q?=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/wf/models.py | 2 +- hb_server/apps/wf/serializers.py | 12 +++++++++- hb_server/apps/wf/urls.py | 8 ++++--- hb_server/apps/wf/views.py | 38 ++++++++++++++++++++++++++++++-- 4 files changed, 53 insertions(+), 7 deletions(-) diff --git a/hb_server/apps/wf/models.py b/hb_server/apps/wf/models.py index 4ee2699..caadf32 100644 --- a/hb_server/apps/wf/models.py +++ b/hb_server/apps/wf/models.py @@ -87,7 +87,7 @@ class CustomField(BaseModel): ('file', '附件') ) workflow = models.ForeignKey(Workflow, on_delete=models.CASCADE, verbose_name='所属工作流') - field_type = models.IntegerField('类型', help_text='5.字符串，10.整形，15.浮点型，20.布尔，25.日期，30.日期时间，35.单选框，40.多选框，45.下拉列表，50.多选下拉列表，55.文本域，60.用户名, 70.多选的用户名, 80.附件(只保存路径，多个使用逗号隔开)') + field_type = models.IntegerField('类型', choices=field_type_choices, help_text='5.字符串，10.整形，15.浮点型，20.布尔，25.日期，30.日期时间，35.单选框，40.多选框，45.下拉列表，50.多选下拉列表，55.文本域，60.用户名, 70.多选的用户名, 80.附件(只保存路径，多个使用逗号隔开)') field_key = models.CharField('字段标识', max_length=50, help_text='字段类型请尽量特殊，避免与系统中关键字冲突') field_name = models.CharField('字段名称', max_length=50) sort = models.IntegerField('排序', default=0, help_text='工单基础字段在表单中排序为:流水号0,标题20,状态id40,状态名41,创建人80,创建时间100,更新时间120.前端展示工单信息的表单可以根据这个id顺序排列') diff --git a/hb_server/apps/wf/serializers.py b/hb_server/apps/wf/serializers.py index f0ff192..3df6e29 100644 --- a/hb_server/apps/wf/serializers.py +++ b/hb_server/apps/wf/serializers.py @@ -1,6 +1,6 @@ from rest_framework.serializers import ModelSerializer -from .models import State, Workflow +from .models import State, Workflow, Transition, CustomField class WorkflowSerializer(ModelSerializer): @@ -12,3 +12,13 @@ class StateSerializer(ModelSerializer): class Meta: model = State fields = '__all__' + +class TransitionSerializer(ModelSerializer): + class Meta: + model = Transition + fields = '__all__' + +class CustomFieldSerializer(ModelSerializer): + class Meta: + model = CustomField + fields = '__all__' diff --git a/hb_server/apps/wf/urls.py b/hb_server/apps/wf/urls.py index d61f55d..abcd0a7 100644 --- a/hb_server/apps/wf/urls.py +++ b/hb_server/apps/wf/urls.py @@ -1,12 +1,14 @@ from django.db.models import base from rest_framework import urlpatterns -from apps.wf.views import StateViewSet, WorkflowViewSet +from apps.wf.views import CustomFieldViewSet, StateViewSet, TransitionViewSet, WorkflowViewSet from django.urls import path, include from rest_framework.routers import DefaultRouter router = DefaultRouter() -router.register('workflow', WorkflowViewSet, basename='workflow') -router.register('state', StateViewSet, basename='workflowstate') +router.register('workflow', WorkflowViewSet, basename='wf') +router.register('state', StateViewSet, basename='wf_state') +router.register('transition', TransitionViewSet, basename='wf_transitions') +router.register('customfield', CustomFieldViewSet, basename='wf_customfield') urlpatterns = [ path('', include(router.urls)), ] diff --git a/hb_server/apps/wf/views.py b/hb_server/apps/wf/views.py index bccd216..d9263e1 100644 --- a/hb_server/apps/wf/views.py +++ b/hb_server/apps/wf/views.py @@ -1,11 +1,11 @@ from rest_framework.response import Response from rest_framework import serializers from rest_framework.mixins import CreateModelMixin, RetrieveModelMixin, UpdateModelMixin -from apps.wf.serializers import StateSerializer, WorkflowSerializer +from apps.wf.serializers import CustomFieldSerializer, StateSerializer, TransitionSerializer, WorkflowSerializer from django.shortcuts import render from rest_framework.viewsets import GenericViewSet, ModelViewSet from rest_framework.decorators import action -from apps.wf.models import Workflow, State, Transition +from apps.wf.models import CustomField, Workflow, State, Transition from apps.system.mixins import CreateUpdateModelAMixin, OptimizationMixin @@ -28,6 +28,24 @@ class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): wf = self.get_object() serializer = self.serializer_class(instance=State.objects.filter(workflow=wf), many=True) return Response(serializer.data) + + @action(methods=['get'], detail=True, perms_map={'get':'workflow_update'}, pagination_class=None, serializer_class=TransitionSerializer) + def transitions(self, request, pk=None): + """ + 工作流下的流转规则 + """ + wf = self.get_object() + serializer = self.serializer_class(instance=Transition.objects.filter(workflow=wf), many=True) + return Response(serializer.data) + + @action(methods=['get'], detail=True, perms_map={'get':'workflow_update'}, pagination_class=None, serializer_class=CustomFieldSerializer) + def customfields(self, request, pk=None): + """ + 工作流下的自定义字段 + """ + wf = self.get_object() + serializer = self.serializer_class(instance=CustomField.objects.filter(workflow=wf), many=True) + return Response(serializer.data) class StateViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, GenericViewSet): perms_map = {'*':'*'} @@ -35,4 +53,20 @@ class StateViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, Gener serializer_class = StateSerializer search_fields = ['name'] filterset_fields = ['workflow'] + ordering = ['sort'] + +class TransitionViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, GenericViewSet): + perms_map = {'*':'*'} + queryset = Transition.objects.all() + serializer_class = TransitionSerializer + search_fields = ['name'] + filterset_fields = ['workflow', 'state'] + ordering = ['id'] + +class CustomFieldViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, GenericViewSet): + perms_map = {'*':'*'} + queryset = CustomField.objects.all() + serializer_class = CustomFieldSerializer + search_fields = ['field_name'] + filterset_fields = ['workflow', 'field_type'] ordering = ['sort'] \ No newline at end of file From 172f7bae6c901ca869b4042b827babc7eb5f9abc Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 18 Aug 2021 14:25:39 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/wf/models.py | 1 - hb_server/apps/wf/views.py | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hb_server/apps/wf/models.py b/hb_server/apps/wf/models.py index caadf32..4482162 100644 --- a/hb_server/apps/wf/models.py +++ b/hb_server/apps/wf/models.py @@ -45,7 +45,6 @@ class State(BaseModel): sort = models.IntegerField('状态顺序', default=0, help_text='用于工单步骤接口时，step上状态的顺序(因为存在网状情况，所以需要人为设定顺序),值越小越靠前') type = models.IntegerField('状态类型', default=0, choices=type_choices, help_text='0.普通类型 1.初始状态(用于新建工单时,获取对应的字段必填及transition信息) 2.结束状态(此状态下的工单不得再处理，即没有对应的transition)') enable_retreat = models.BooleanField('允许撤回', default=False, help_text='开启后允许工单创建人在此状态直接撤回工单到初始状态') - participant_type = models.IntegerField('参与者类型', default=1, blank=True, help_text='0.无处理人,1.个人,2.多人,3.部门,4.角色,5.变量(支持工单创建人,创建人的leader),6.脚本,7.工单的字段内容(如表单中的"测试负责人"，需要为用户名或者逗号隔开的多个用户名),8.父工单的字段内容。 初始状态请选择类型5，参与人填creator') diff --git a/hb_server/apps/wf/views.py b/hb_server/apps/wf/views.py index d9263e1..8a3210b 100644 --- a/hb_server/apps/wf/views.py +++ b/hb_server/apps/wf/views.py @@ -1,6 +1,6 @@ from rest_framework.response import Response from rest_framework import serializers -from rest_framework.mixins import CreateModelMixin, RetrieveModelMixin, UpdateModelMixin +from rest_framework.mixins import CreateModelMixin, DestroyModelMixin, RetrieveModelMixin, UpdateModelMixin from apps.wf.serializers import CustomFieldSerializer, StateSerializer, TransitionSerializer, WorkflowSerializer from django.shortcuts import render from rest_framework.viewsets import GenericViewSet, ModelViewSet @@ -47,7 +47,7 @@ class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): serializer = self.serializer_class(instance=CustomField.objects.filter(workflow=wf), many=True) return Response(serializer.data) -class StateViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, GenericViewSet): +class StateViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet): perms_map = {'*':'*'} queryset = State.objects.all() serializer_class = StateSerializer @@ -55,7 +55,7 @@ class StateViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, Gener filterset_fields = ['workflow'] ordering = ['sort'] -class TransitionViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, GenericViewSet): +class TransitionViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet): perms_map = {'*':'*'} queryset = Transition.objects.all() serializer_class = TransitionSerializer @@ -63,7 +63,7 @@ class TransitionViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, filterset_fields = ['workflow', 'state'] ordering = ['id'] -class CustomFieldViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, GenericViewSet): +class CustomFieldViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet): perms_map = {'*':'*'} queryset = CustomField.objects.all() serializer_class = CustomFieldSerializer From 1bcdc3f6a8b8b476e0bb2f1fb1fb445d95639502 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 19 Aug 2021 09:55:33 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/wf/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hb_server/apps/wf/models.py b/hb_server/apps/wf/models.py index 4482162..3e839f1 100644 --- a/hb_server/apps/wf/models.py +++ b/hb_server/apps/wf/models.py @@ -73,13 +73,13 @@ class CustomField(BaseModel): ('string', '字符串'), ('int', '整型'), ('float', '浮点'), - ('bol', '布尔'), + ('boolean', '布尔'), ('date', '日期'), ('datetime', '日期时间'), ('radio', '单选'), ('checkbox', '多选'), ('select', '单选下拉'), - ('mutiselect', '多选下拉'), + ('selects', '多选下拉'), ('textarea', '文本域'), ('selectuser', '单选用户'), ('selectusers', '多选用户'), From f4158cf681fc189f222ebdef228ab52fdb3ec908 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 19 Aug 2021 09:55:33 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0002_alter_customfield_field_type.py | 18 ++++++++++++++++++ hb_server/apps/wf/models.py | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 hb_server/apps/wf/migrations/0002_alter_customfield_field_type.py diff --git a/hb_server/apps/wf/migrations/0002_alter_customfield_field_type.py b/hb_server/apps/wf/migrations/0002_alter_customfield_field_type.py new file mode 100644 index 0000000..1dc2e5f --- /dev/null +++ b/hb_server/apps/wf/migrations/0002_alter_customfield_field_type.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.6 on 2021-08-19 01:55 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('wf', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='customfield', + name='field_type', + field=models.IntegerField(choices=[('string', '字符串'), ('int', '整型'), ('float', '浮点'), ('boolean', '布尔'), ('date', '日期'), ('datetime', '日期时间'), ('radio', '单选'), ('checkbox', '多选'), ('select', '单选下拉'), ('selects', '多选下拉'), ('textarea', '文本域'), ('selectuser', '单选用户'), ('selectusers', '多选用户'), ('file', '附件')], help_text='5.字符串，10.整形，15.浮点型，20.布尔，25.日期，30.日期时间，35.单选框，40.多选框，45.下拉列表，50.多选下拉列表，55.文本域，60.用户名, 70.多选的用户名, 80.附件(只保存路径，多个使用逗号隔开)', verbose_name='类型'), + ), + ] diff --git a/hb_server/apps/wf/models.py b/hb_server/apps/wf/models.py index 4482162..3e839f1 100644 --- a/hb_server/apps/wf/models.py +++ b/hb_server/apps/wf/models.py @@ -73,13 +73,13 @@ class CustomField(BaseModel): ('string', '字符串'), ('int', '整型'), ('float', '浮点'), - ('bol', '布尔'), + ('boolean', '布尔'), ('date', '日期'), ('datetime', '日期时间'), ('radio', '单选'), ('checkbox', '多选'), ('select', '单选下拉'), - ('mutiselect', '多选下拉'), + ('selects', '多选下拉'), ('textarea', '文本域'), ('selectuser', '单选用户'), ('selectusers', '多选用户'), From 639cd4190a483e64c673caf98fdd77d840c32392 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 19 Aug 2021 11:06:30 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0003_alter_customfield_field_type.py | 18 ++++++++++++++++++ hb_server/apps/wf/models.py | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 hb_server/apps/wf/migrations/0003_alter_customfield_field_type.py diff --git a/hb_server/apps/wf/migrations/0003_alter_customfield_field_type.py b/hb_server/apps/wf/migrations/0003_alter_customfield_field_type.py new file mode 100644 index 0000000..28ab2a9 --- /dev/null +++ b/hb_server/apps/wf/migrations/0003_alter_customfield_field_type.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.6 on 2021-08-19 03:05 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('wf', '0002_alter_customfield_field_type'), + ] + + operations = [ + migrations.AlterField( + model_name='customfield', + name='field_type', + field=models.CharField(choices=[('string', '字符串'), ('int', '整型'), ('float', '浮点'), ('boolean', '布尔'), ('date', '日期'), ('datetime', '日期时间'), ('radio', '单选'), ('checkbox', '多选'), ('select', '单选下拉'), ('selects', '多选下拉'), ('textarea', '文本域'), ('selectuser', '单选用户'), ('selectusers', '多选用户'), ('file', '附件')], help_text='5.字符串，10.整形，15.浮点型，20.布尔，25.日期，30.日期时间，35.单选框，40.多选框，45.下拉列表，50.多选下拉列表，55.文本域，60.用户名, 70.多选的用户名, 80.附件(只保存路径，多个使用逗号隔开)', max_length=50, verbose_name='类型'), + ), + ] diff --git a/hb_server/apps/wf/models.py b/hb_server/apps/wf/models.py index 3e839f1..2dd66ee 100644 --- a/hb_server/apps/wf/models.py +++ b/hb_server/apps/wf/models.py @@ -86,7 +86,7 @@ class CustomField(BaseModel): ('file', '附件') ) workflow = models.ForeignKey(Workflow, on_delete=models.CASCADE, verbose_name='所属工作流') - field_type = models.IntegerField('类型', choices=field_type_choices, help_text='5.字符串，10.整形，15.浮点型，20.布尔，25.日期，30.日期时间，35.单选框，40.多选框，45.下拉列表，50.多选下拉列表，55.文本域，60.用户名, 70.多选的用户名, 80.附件(只保存路径，多个使用逗号隔开)') + field_type = models.CharField('类型', max_length=50, choices=field_type_choices, help_text='5.字符串，10.整形，15.浮点型，20.布尔，25.日期，30.日期时间，35.单选框，40.多选框，45.下拉列表，50.多选下拉列表，55.文本域，60.用户名, 70.多选的用户名, 80.附件(只保存路径，多个使用逗号隔开)') field_key = models.CharField('字段标识', max_length=50, help_text='字段类型请尽量特殊，避免与系统中关键字冲突') field_name = models.CharField('字段名称', max_length=50) sort = models.IntegerField('排序', default=0, help_text='工单基础字段在表单中排序为:流水号0,标题20,状态id40,状态名41,创建人80,创建时间100,更新时间120.前端展示工单信息的表单可以根据这个id顺序排列') From 21463c1ba2305d6ca6b24e79a1119ccecb9776da Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 19 Aug 2021 16:11:18 +0800 Subject: [PATCH 08/16] trans filter bug --- hb_server/apps/wf/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hb_server/apps/wf/views.py b/hb_server/apps/wf/views.py index 8a3210b..029ea09 100644 --- a/hb_server/apps/wf/views.py +++ b/hb_server/apps/wf/views.py @@ -60,7 +60,7 @@ class TransitionViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, queryset = Transition.objects.all() serializer_class = TransitionSerializer search_fields = ['name'] - filterset_fields = ['workflow', 'state'] + filterset_fields = ['workflow'] ordering = ['id'] class CustomFieldViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet): From c97045112a3926b6f0f586a72b97116728a4d56c Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 20 Aug 2021 10:29:11 +0800 Subject: [PATCH 09/16] =?UTF-8?q?state=20simple=20=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/wf/models.py | 19 +++++++++++++++++++ hb_server/apps/wf/serializers.py | 15 ++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/hb_server/apps/wf/models.py b/hb_server/apps/wf/models.py index 2dd66ee..16ec2eb 100644 --- a/hb_server/apps/wf/models.py +++ b/hb_server/apps/wf/models.py @@ -99,3 +99,22 @@ class CustomField(BaseModel): field_choice = models.JSONField('radio、checkbox、select的选项', default=dict, blank=True, help_text='radio,checkbox,select,multiselect类型可供选择的选项，格式为json如:{"1":"中国", "2":"美国"},注意数字也需要引号') label = models.JSONField('标签', blank=True, default=dict, help_text='自定义标签，json格式，调用方可根据标签自行处理特殊场景逻辑，loonflow只保存文本内容') + +class Ticket(CommonBModel): + """ + 工单 + """ + title = models.CharField('标题', max_length=500, blank=True, default='', help_text="工单标题") + workflow = models.ForeignKey(Workflow, on_delete=models.CASCADE, verbose_name='关联工作流') + sn = models.CharField('流水号', max_length=25, help_text="工单的流水号") + state = models.ForeignKey(State, on_delete=models.CASCADE, verbose_name='当前状态', related_name='ticket_state') + parent = models.ForeignKey('self', null=True, blank=True, on_delete=models.CASCADE, verbose_name='父工单') + parent_state = models.ForeignKey(State, null=True, blank=True, on_delete=models.CASCADE, verbose_name='父工单状态', related_name='ticket_parent_state') + formdata = models.JSONField('工单表单', default=dict, help_text='工单所有字段内容') + in_add_node = models.BooleanField('加签状态中', default=False, help_text='是否处于加签状态下') + add_node_man = models.CharField('加签人', max_length=50, default='', blank=True, help_text='加签操作的人，工单当前处理人处理完成后会回到该处理人，当处于加签状态下才有效') + +class TicketFlow(BaseModel): + """ + 工单流转日志 + """ diff --git a/hb_server/apps/wf/serializers.py b/hb_server/apps/wf/serializers.py index 3df6e29..77b5b2c 100644 --- a/hb_server/apps/wf/serializers.py +++ b/hb_server/apps/wf/serializers.py @@ -1,4 +1,4 @@ -from rest_framework.serializers import ModelSerializer +from rest_framework.serializers import ModelSerializer, SerializerMethodField, CharField from .models import State, Workflow, Transition, CustomField @@ -13,10 +13,23 @@ class StateSerializer(ModelSerializer): model = State fields = '__all__' +class StateSimpleSerializer(ModelSerializer): + class Meta: + model = State + fields = ['id', 'name'] + class TransitionSerializer(ModelSerializer): + source_state_ = StateSimpleSerializer(source='source_state', read_only=True) + destination_state_ = StateSimpleSerializer(source='destination_state', read_only=True) class Meta: model = Transition fields = '__all__' + @staticmethod + def setup_eager_loading(queryset): + """ Perform necessary eager loading of data. """ + queryset = queryset.select_related('source_state','destination_state') + return queryset + class CustomFieldSerializer(ModelSerializer): class Meta: From 4bdf6382d546e3ab79c8fc0aa57cacf6a4bb9101 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 25 Aug 2021 10:42:49 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E5=88=B6=E9=80=A0=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/mtm/__init__.py | 0 hb_server/apps/mtm/admin.py | 3 + hb_server/apps/mtm/apps.py | 7 + hb_server/apps/mtm/migrations/0001_initial.py | 161 ++++++++++++++++++ hb_server/apps/mtm/migrations/__init__.py | 0 hb_server/apps/mtm/models.py | 131 ++++++++++++++ hb_server/apps/mtm/serializers.py | 19 +++ hb_server/apps/mtm/tests.py | 3 + hb_server/apps/mtm/urls.py | 14 ++ hb_server/apps/mtm/views.py | 54 ++++++ .../wf/migrations/0004_auto_20210823_1546.py | 111 ++++++++++++ .../wf/migrations/0005_auto_20210823_1548.py | 21 +++ hb_server/apps/wf/models.py | 24 ++- hb_server/apps/wf/serializers.py | 26 ++- hb_server/apps/wf/services.py | 54 ++++++ hb_server/apps/wf/urls.py | 3 +- hb_server/apps/wf/views.py | 44 ++++- hb_server/server/settings.py | 3 +- hb_server/server/urls.py | 2 +- 19 files changed, 660 insertions(+), 20 deletions(-) create mode 100644 hb_server/apps/mtm/__init__.py create mode 100644 hb_server/apps/mtm/admin.py create mode 100644 hb_server/apps/mtm/apps.py create mode 100644 hb_server/apps/mtm/migrations/0001_initial.py create mode 100644 hb_server/apps/mtm/migrations/__init__.py create mode 100644 hb_server/apps/mtm/models.py create mode 100644 hb_server/apps/mtm/serializers.py create mode 100644 hb_server/apps/mtm/tests.py create mode 100644 hb_server/apps/mtm/urls.py create mode 100644 hb_server/apps/mtm/views.py create mode 100644 hb_server/apps/wf/migrations/0004_auto_20210823_1546.py create mode 100644 hb_server/apps/wf/migrations/0005_auto_20210823_1548.py create mode 100644 hb_server/apps/wf/services.py diff --git a/hb_server/apps/mtm/__init__.py b/hb_server/apps/mtm/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/hb_server/apps/mtm/admin.py b/hb_server/apps/mtm/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/hb_server/apps/mtm/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/hb_server/apps/mtm/apps.py b/hb_server/apps/mtm/apps.py new file mode 100644 index 0000000..b610981 --- /dev/null +++ b/hb_server/apps/mtm/apps.py @@ -0,0 +1,7 @@ +from django.apps import AppConfig + +class MtmConfig(AppConfig): + name = 'apps.mtm' + verbose_name = '制造技术管理' + + diff --git a/hb_server/apps/mtm/migrations/0001_initial.py b/hb_server/apps/mtm/migrations/0001_initial.py new file mode 100644 index 0000000..d44f801 --- /dev/null +++ b/hb_server/apps/mtm/migrations/0001_initial.py @@ -0,0 +1,161 @@ +# Generated by Django 3.2.6 on 2021-08-24 06:52 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('system', '0003_auto_20210812_0909'), + ] + + operations = [ + migrations.CreateModel( + name='Material', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('name', models.CharField(max_length=100, unique=True, verbose_name='物料名称')), + ('number', models.CharField(max_length=100, unique=True, verbose_name='编号')), + ('type', models.CharField(choices=[(1, '成品'), (2, '半成品'), (3, '原材料')], default=1, max_length=20, verbose_name='物料类型')), + ('sort_str', models.CharField(blank=True, max_length=100, null=True, verbose_name='排序字符')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='material_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ], + options={ + 'verbose_name': '物料表', + 'verbose_name_plural': '物料表', + }, + ), + migrations.CreateModel( + name='Process', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('name', models.CharField(max_length=100, unique=True, verbose_name='工序名称')), + ('number', models.CharField(max_length=100, unique=True, verbose_name='编号')), + ('instruction_content', models.TextField(blank=True, null=True, verbose_name='指导书内容')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='process_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('instruction', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='system.file', verbose_name='指导书')), + ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='process_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')), + ], + options={ + 'verbose_name': '工序', + 'verbose_name_plural': '工序', + }, + ), + migrations.CreateModel( + name='Step', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('name', models.CharField(max_length=100, verbose_name='工序步骤名称')), + ('number', models.CharField(blank=True, max_length=100, null=True, verbose_name='步骤编号')), + ('instruction_content', models.TextField(blank=True, null=True, verbose_name='相应操作指导')), + ('sort', models.IntegerField(default=1, verbose_name='排序号')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='step_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('process', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mtm.process', verbose_name='所属工序')), + ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='step_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')), + ], + options={ + 'verbose_name': '工序步骤', + 'verbose_name_plural': '工序步骤', + }, + ), + migrations.CreateModel( + name='StepOperationItem', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('field_type', models.CharField(choices=[('string', '字符串'), ('int', '整型'), ('float', '浮点'), ('boolean', '布尔'), ('date', '日期'), ('datetime', '日期时间'), ('radio', '单选'), ('checkbox', '多选'), ('select', '单选下拉'), ('selects', '多选下拉'), ('textarea', '文本域')], max_length=50, verbose_name='类型')), + ('field_key', models.CharField(help_text='字段类型请尽量特殊，避免与系统中关键字冲突', max_length=50, verbose_name='字段标识')), + ('field_name', models.CharField(max_length=50, verbose_name='字段名称')), + ('boolean_field_display', models.JSONField(blank=True, default=dict, help_text='当为布尔类型时候，可以支持自定义显示形式。{"1":"是","0":"否"}或{"1":"需要","0":"不需要"}，注意数字也需要引号', verbose_name='布尔类型显示名')), + ('field_choice', models.JSONField(blank=True, default=dict, help_text='radio,checkbox,select,multiselect类型可供选择的选项，格式为json如:{"1":"中国", "2":"美国"},注意数字也需要引号', verbose_name='radio、checkbox、select的选项')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='stepoperationitem_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('step', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mtm.step', verbose_name='关联步骤')), + ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='stepoperationitem_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')), + ], + options={ + 'verbose_name': '操作记录条目', + 'verbose_name_plural': '操作记录条目', + }, + ), + migrations.CreateModel( + name='ProductProcess', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('sort', models.IntegerField(default=1, verbose_name='排序号')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='productprocess_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('process', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mtm.process', verbose_name='工序')), + ('product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mtm.material', verbose_name='产品')), + ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='productprocess_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')), + ], + options={ + 'verbose_name': '产品生产工序', + 'verbose_name_plural': '产品生产工序', + }, + ), + migrations.CreateModel( + name='OutputMaterial', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('number', models.FloatField(default=0, verbose_name='产出量')), + ('unit', models.CharField(max_length=20, verbose_name='单位')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='outputmaterial_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('material', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mtm.material', verbose_name='输出物料')), + ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='outputmaterial_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')), + ], + options={ + 'verbose_name': '输出物料', + 'verbose_name_plural': '输出物料', + }, + ), + migrations.AddField( + model_name='material', + name='process', + field=models.ManyToManyField(related_name='product_process', through='mtm.ProductProcess', to='mtm.Process'), + ), + migrations.AddField( + model_name='material', + name='update_by', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='material_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'), + ), + migrations.CreateModel( + name='InputMaterial', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('number', models.FloatField(default=0, verbose_name='消耗量')), + ('unit', models.CharField(max_length=20, verbose_name='单位')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='inputmaterial_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('material', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mtm.material', verbose_name='输入物料')), + ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='inputmaterial_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')), + ], + options={ + 'verbose_name': '输入物料', + 'verbose_name_plural': '输入物料', + }, + ), + ] diff --git a/hb_server/apps/mtm/migrations/__init__.py b/hb_server/apps/mtm/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/hb_server/apps/mtm/models.py b/hb_server/apps/mtm/models.py new file mode 100644 index 0000000..620a947 --- /dev/null +++ b/hb_server/apps/mtm/models.py @@ -0,0 +1,131 @@ +from django.db import models +from django.db.models.base import Model +import django.utils.timezone as timezone +from django.db.models.query import QuerySet +from apps.system.models import CommonAModel, CommonBModel, Organization, User, Dict, File +from utils.model import SoftModel, BaseModel +from simple_history.models import HistoricalRecords + +class Material(CommonAModel): + """ + 物料 + """ + type_choices=( + (1, '成品'), + (2, '半成品'), + (3, '原材料') + ) + name = models.CharField('物料名称', max_length=100, unique=True) + number = models.CharField('编号', max_length=100, unique=True) + type = models.CharField('物料类型', choices= type_choices, max_length=20, default=1) + sort_str = models.CharField('排序字符', max_length=100, null=True, blank=True) + process = models.ManyToManyField('mtm.process', through='mtm.ProductProcess', related_name='product_process') + + class Meta: + verbose_name = '物料表' + verbose_name_plural = verbose_name + + def __str__(self): + return self.name + +class Process(CommonAModel): + """ + 工序 + """ + name = models.CharField('工序名称', max_length=100, unique=True) + number = models.CharField('编号', max_length=100, unique=True) + instruction = models.ForeignKey(File, verbose_name='指导书', on_delete=models.SET_NULL, null=True, blank=True) + instruction_content = models.TextField('指导书内容', null=True, blank=True) + + class Meta: + verbose_name = '工序' + verbose_name_plural = verbose_name + + def __str__(self): + return self.name + +class Step(CommonAModel): + """ + 工序步骤 + """ + process = models.ForeignKey(Process, on_delete=models.CASCADE, verbose_name='所属工序') + name = models.CharField('工序步骤名称', max_length=100) + number = models.CharField('步骤编号', max_length=100, null=True, blank=True) + instruction_content = models.TextField('相应操作指导', null=True, blank=True) + sort = models.IntegerField('排序号', default=1) + + class Meta: + verbose_name = '工序步骤' + verbose_name_plural = verbose_name + + def __str__(self): + return self.name + +class StepOperationItem(CommonAModel): + """ + 操作记录条目 + """ + field_type_choices = ( + ('string', '字符串'), + ('int', '整型'), + ('float', '浮点'), + ('boolean', '布尔'), + ('date', '日期'), + ('datetime', '日期时间'), + ('radio', '单选'), + ('checkbox', '多选'), + ('select', '单选下拉'), + ('selects', '多选下拉'), + ('textarea', '文本域'), + ) + step = models.ForeignKey(Step, on_delete=models.CASCADE, verbose_name='关联步骤') + field_type = models.CharField('类型', max_length=50, choices=field_type_choices) + field_key = models.CharField('字段标识', max_length=50, help_text='字段类型请尽量特殊，避免与系统中关键字冲突') + field_name = models.CharField('字段名称', max_length=50) + boolean_field_display = models.JSONField('布尔类型显示名', default=dict, blank=True, + help_text='当为布尔类型时候，可以支持自定义显示形式。{"1":"是","0":"否"}或{"1":"需要","0":"不需要"}，注意数字也需要引号') + field_choice = models.JSONField('radio、checkbox、select的选项', default=dict, blank=True, + help_text='radio,checkbox,select,multiselect类型可供选择的选项，格式为json如:{"1":"中国", "2":"美国"},注意数字也需要引号') + class Meta: + verbose_name = '操作记录条目' + verbose_name_plural = verbose_name + + def __str__(self): + return self.field_key + '-' + self.field_name + +class ProductProcess(CommonAModel): + """ + 产品生产工艺 + """ + product = models.ForeignKey(Material, verbose_name='产品', on_delete=models.CASCADE) + process = models.ForeignKey(Process, verbose_name='工序', on_delete=models.CASCADE) + sort = models.IntegerField('排序号', default=1) + + class Meta: + verbose_name = '产品生产工序' + verbose_name_plural = verbose_name + +class InputMaterial(CommonAModel): + """ + 输入物料 + """ + material = models.ForeignKey(Material, verbose_name='输入物料', on_delete=models.CASCADE) + number = models.FloatField('消耗量', default=0) + unit = models.CharField('单位', max_length=20) + + class Meta: + verbose_name = '输入物料' + verbose_name_plural = verbose_name + + +class OutputMaterial(CommonAModel): + """ + 输出物料 + """ + material = models.ForeignKey(Material, verbose_name='输出物料', on_delete=models.CASCADE) + number = models.FloatField('产出量', default=0) + unit = models.CharField('单位', max_length=20) + + class Meta: + verbose_name = '输出物料' + verbose_name_plural = verbose_name \ No newline at end of file diff --git a/hb_server/apps/mtm/serializers.py b/hb_server/apps/mtm/serializers.py new file mode 100644 index 0000000..a2aa192 --- /dev/null +++ b/hb_server/apps/mtm/serializers.py @@ -0,0 +1,19 @@ +from rest_framework.serializers import ModelSerializer + +from .models import Material, Process, Step + + +class MaterialSerializer(ModelSerializer): + class Meta: + model = Material + fields = '__all__' + +class ProcessSerializer(ModelSerializer): + class Meta: + model = Process + fields = '__all__' + +class StepSerializer(ModelSerializer): + class Meta: + model = Step + fields = '__all__' \ No newline at end of file diff --git a/hb_server/apps/mtm/tests.py b/hb_server/apps/mtm/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/hb_server/apps/mtm/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/hb_server/apps/mtm/urls.py b/hb_server/apps/mtm/urls.py new file mode 100644 index 0000000..5772a69 --- /dev/null +++ b/hb_server/apps/mtm/urls.py @@ -0,0 +1,14 @@ +from django.db.models import base +from rest_framework import urlpatterns +from apps.mtm.views import MaterialViewSet, ProcessViewSet, StepViewSet +from django.urls import path, include +from rest_framework.routers import DefaultRouter + +router = DefaultRouter() +router.register('material', MaterialViewSet, basename='material') +router.register('process', ProcessViewSet, basename='process') +router.register('step', StepViewSet, basename='step') +urlpatterns = [ + path('', include(router.urls)), +] + diff --git a/hb_server/apps/mtm/views.py b/hb_server/apps/mtm/views.py new file mode 100644 index 0000000..08b132b --- /dev/null +++ b/hb_server/apps/mtm/views.py @@ -0,0 +1,54 @@ +from django.shortcuts import render +from rest_framework.viewsets import ModelViewSet, GenericViewSet +from rest_framework.mixins import CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin + +from apps.mtm.models import Material, Process, Step +from apps.mtm.serializers import MaterialSerializer, ProcessSerializer, StepSerializer +from apps.system.mixins import CreateUpdateModelAMixin, OptimizationMixin +from rest_framework.decorators import action +from rest_framework.response import Response + + +# Create your views here. +class MaterialViewSet(CreateUpdateModelAMixin, ModelViewSet): + """ + 物料表-增删改查 + """ + perms_map = {'get': '*', 'post': 'material_create', + 'put': 'material_update', 'delete': 'material_delete'} + queryset = Material.objects.all() + serializer_class = MaterialSerializer + search_fields = ['name', 'number'] + filterset_fields = ['type'] + ordering_fields = ['number', 'sort_str'] + ordering = ['number'] + +class ProcessViewSet(CreateUpdateModelAMixin, ModelViewSet): + """ + 工序表-增删改查 + """ + perms_map = {'get': '*', 'post': 'process_create', + 'put': 'process_update', 'delete': 'process_delete'} + queryset = Process.objects.all() + serializer_class = ProcessSerializer + search_fields = ['name', 'number'] + filterset_fields = ['number'] + ordering_fields = ['number'] + ordering = ['number'] + + @action(methods=['get'], detail=True, perms_map={'get':'process_update'}, pagination_class=None, serializer_class=StepSerializer) + def steps(self, request, pk=None): + """ + 工序下的子工序 + """ + process = self.get_object() + serializer = self.serializer_class(instance=Step.objects.filter(process=process, is_deleted=True), many=True) + return Response(serializer.data) + +class StepViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet): + perms_map = {'*':'process_update'} + queryset = Step.objects.all() + serializer_class = StepSerializer + search_fields = ['name', 'number'] + filterset_fields = ['process'] + ordering = ['sort'] \ No newline at end of file diff --git a/hb_server/apps/wf/migrations/0004_auto_20210823_1546.py b/hb_server/apps/wf/migrations/0004_auto_20210823_1546.py new file mode 100644 index 0000000..540d3ad --- /dev/null +++ b/hb_server/apps/wf/migrations/0004_auto_20210823_1546.py @@ -0,0 +1,111 @@ +# Generated by Django 3.2.6 on 2021-08-23 07:46 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('wf', '0003_alter_customfield_field_type'), + ] + + operations = [ + migrations.CreateModel( + name='Ticket', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('title', models.CharField(blank=True, default='', help_text='工单标题', max_length=500, verbose_name='标题')), + ('sn', models.CharField(help_text='工单的流水号', max_length=25, verbose_name='流水号')), + ('ticket_data', models.JSONField(default=dict, help_text='工单所有字段内容', verbose_name='工单数据')), + ('in_add_node', models.BooleanField(default=False, help_text='是否处于加签状态下', verbose_name='加签状态中')), + ('add_node_man', models.CharField(blank=True, default='', help_text='加签操作的人，工单当前处理人处理完成后会回到该处理人，当处于加签状态下才有效', max_length=50, verbose_name='加签人')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ticket_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='wf.ticket', verbose_name='父工单')), + ], + options={ + 'abstract': False, + }, + ), + migrations.AddField( + model_name='customfield', + name='create_by', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='customfield_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人'), + ), + migrations.AddField( + model_name='customfield', + name='update_by', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='customfield_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'), + ), + migrations.AddField( + model_name='state', + name='create_by', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='state_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人'), + ), + migrations.AddField( + model_name='state', + name='update_by', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='state_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'), + ), + migrations.AddField( + model_name='transition', + name='create_by', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='transition_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人'), + ), + migrations.AddField( + model_name='transition', + name='update_by', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='transition_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'), + ), + migrations.AlterField( + model_name='state', + name='participant_type', + field=models.IntegerField(blank=True, choices=[(0, '无处理人'), (1, '个人'), (2, '多人'), (3, '部门'), (4, '角色'), (5, '变量'), (6, '脚本'), (7, '工单的字段'), (8, '父工单的字段')], default=1, help_text='0.无处理人,1.个人,2.多人,3.部门,4.角色,5.变量(支持工单创建人,创建人的leader),6.脚本,7.工单的字段内容(如表单中的"测试负责人"，需要为用户名或者逗号隔开的多个用户名),8.父工单的字段内容。 初始状态请选择类型5，参与人填creator', verbose_name='参与者类型'), + ), + migrations.CreateModel( + name='TicketFlow', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('suggestion', models.CharField(blank=True, default='', max_length=10000, verbose_name='处理意见')), + ('participant', models.CharField(blank=True, default='', max_length=50, verbose_name='处理人')), + ('ticket_data', models.JSONField(blank=True, default=dict, help_text='可以用于记录当前表单数据，json格式', verbose_name='工单数据')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ticketflow_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('state', models.ForeignKey(blank=True, default=0, on_delete=django.db.models.deletion.CASCADE, to='wf.state', verbose_name='当前状态')), + ('ticket', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='wf.ticket', verbose_name='关联工单')), + ('transition', models.ForeignKey(help_text='与worklow.Transition关联， 为0时表示认为干预的操作', on_delete=django.db.models.deletion.CASCADE, to='wf.transition', verbose_name='流转id')), + ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ticketflow_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')), + ], + options={ + 'abstract': False, + }, + ), + migrations.AddField( + model_name='ticket', + name='parent_state', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='ticket_parent_state', to='wf.state', verbose_name='父工单状态'), + ), + migrations.AddField( + model_name='ticket', + name='state', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ticket_state', to='wf.state', verbose_name='当前状态'), + ), + migrations.AddField( + model_name='ticket', + name='update_by', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ticket_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人'), + ), + migrations.AddField( + model_name='ticket', + name='workflow', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='wf.workflow', verbose_name='关联工作流'), + ), + ] diff --git a/hb_server/apps/wf/migrations/0005_auto_20210823_1548.py b/hb_server/apps/wf/migrations/0005_auto_20210823_1548.py new file mode 100644 index 0000000..c18e919 --- /dev/null +++ b/hb_server/apps/wf/migrations/0005_auto_20210823_1548.py @@ -0,0 +1,21 @@ +# Generated by Django 3.2.6 on 2021-08-23 07:48 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('wf', '0004_auto_20210823_1546'), + ] + + operations = [ + migrations.RemoveField( + model_name='ticketflow', + name='create_by', + ), + migrations.RemoveField( + model_name='ticketflow', + name='update_by', + ), + ] diff --git a/hb_server/apps/wf/models.py b/hb_server/apps/wf/models.py index 16ec2eb..0ecbd67 100644 --- a/hb_server/apps/wf/models.py +++ b/hb_server/apps/wf/models.py @@ -19,14 +19,16 @@ class Workflow(CommonAModel): title_template = models.CharField('标题模板', max_length=50, default='你有一个待办工单:{title}', null=True, blank=True, help_text='工单字段的值可以作为参数写到模板中，格式如：你有一个待办工单:{title}') content_template = models.CharField('内容模板', max_length=1000, default='标题:{title}, 创建时间:{create_time}', null=True, blank=True, help_text='工单字段的值可以作为参数写到模板中，格式如：标题:{title}, 创建时间:{create_time}') -class State(BaseModel): +class State(CommonAModel): """ 状态记录 """ + STATE_TYPE_START = 1 + STATE_TYPE_END = 2 type_choices = ( (0, '普通类型'), - (1, '初始状态'), - (2, '结束状态') + (1, STATE_TYPE_START), + (2, STATE_TYPE_END) ) type2_choices = ( (0, '无处理人'), @@ -45,10 +47,10 @@ class State(BaseModel): sort = models.IntegerField('状态顺序', default=0, help_text='用于工单步骤接口时，step上状态的顺序(因为存在网状情况，所以需要人为设定顺序),值越小越靠前') type = models.IntegerField('状态类型', default=0, choices=type_choices, help_text='0.普通类型 1.初始状态(用于新建工单时,获取对应的字段必填及transition信息) 2.结束状态(此状态下的工单不得再处理，即没有对应的transition)') enable_retreat = models.BooleanField('允许撤回', default=False, help_text='开启后允许工单创建人在此状态直接撤回工单到初始状态') - participant_type = models.IntegerField('参与者类型', default=1, blank=True, help_text='0.无处理人,1.个人,2.多人,3.部门,4.角色,5.变量(支持工单创建人,创建人的leader),6.脚本,7.工单的字段内容(如表单中的"测试负责人"，需要为用户名或者逗号隔开的多个用户名),8.父工单的字段内容。 初始状态请选择类型5，参与人填creator') + participant_type = models.IntegerField('参与者类型', choices=type2_choices, default=1, blank=True, help_text='0.无处理人,1.个人,2.多人,3.部门,4.角色,5.变量(支持工单创建人,创建人的leader),6.脚本,7.工单的字段内容(如表单中的"测试负责人"，需要为用户名或者逗号隔开的多个用户名),8.父工单的字段内容。 初始状态请选择类型5，参与人填creator') -class Transition(BaseModel): +class Transition(CommonAModel): """ 工作流流转，定时器，条件(允许跳过)， 条件流转与定时器不可同时存在 """ @@ -67,7 +69,7 @@ class Transition(BaseModel): field_require_check = models.BooleanField('是否校验必填项', default=True, help_text='默认在用户点击操作的时候需要校验工单表单的必填项,如果设置为否则不检查。用于如"退回"属性的操作，不需要填写表单内容') -class CustomField(BaseModel): +class CustomField(CommonAModel): """自定义字段, 设定某个工作流有哪些自定义字段""" field_type_choices = ( ('string', '字符串'), @@ -100,7 +102,7 @@ class CustomField(BaseModel): help_text='radio,checkbox,select,multiselect类型可供选择的选项，格式为json如:{"1":"中国", "2":"美国"},注意数字也需要引号') label = models.JSONField('标签', blank=True, default=dict, help_text='自定义标签，json格式，调用方可根据标签自行处理特殊场景逻辑，loonflow只保存文本内容') -class Ticket(CommonBModel): +class Ticket(CommonAModel): """ 工单 """ @@ -110,7 +112,7 @@ class Ticket(CommonBModel): state = models.ForeignKey(State, on_delete=models.CASCADE, verbose_name='当前状态', related_name='ticket_state') parent = models.ForeignKey('self', null=True, blank=True, on_delete=models.CASCADE, verbose_name='父工单') parent_state = models.ForeignKey(State, null=True, blank=True, on_delete=models.CASCADE, verbose_name='父工单状态', related_name='ticket_parent_state') - formdata = models.JSONField('工单表单', default=dict, help_text='工单所有字段内容') + ticket_data = models.JSONField('工单数据', default=dict, help_text='工单所有字段内容') in_add_node = models.BooleanField('加签状态中', default=False, help_text='是否处于加签状态下') add_node_man = models.CharField('加签人', max_length=50, default='', blank=True, help_text='加签操作的人，工单当前处理人处理完成后会回到该处理人，当处于加签状态下才有效') @@ -118,3 +120,9 @@ class TicketFlow(BaseModel): """ 工单流转日志 """ + ticket = models.ForeignKey(Ticket, on_delete=models.CASCADE, verbose_name='关联工单') + transition = models.ForeignKey(Transition, verbose_name='流转id', help_text='与worklow.Transition关联， 为0时表示认为干预的操作', on_delete=models.CASCADE) + suggestion = models.CharField('处理意见', max_length=10000, default='', blank=True) + participant = models.CharField('处理人', max_length=50, default='', blank=True) + state = models.ForeignKey(State, verbose_name='当前状态', default=0, blank=True, on_delete=models.CASCADE) + ticket_data = models.JSONField('工单数据', default=dict, blank=True, help_text='可以用于记录当前表单数据，json格式') \ No newline at end of file diff --git a/hb_server/apps/wf/serializers.py b/hb_server/apps/wf/serializers.py index 77b5b2c..dc4a2f6 100644 --- a/hb_server/apps/wf/serializers.py +++ b/hb_server/apps/wf/serializers.py @@ -1,6 +1,6 @@ from rest_framework.serializers import ModelSerializer, SerializerMethodField, CharField -from .models import State, Workflow, Transition, CustomField +from .models import State, Ticket, Workflow, Transition, CustomField class WorkflowSerializer(ModelSerializer): @@ -13,6 +13,11 @@ class StateSerializer(ModelSerializer): model = State fields = '__all__' +class WorkflowSimpleSerializer(ModelSerializer): + class Meta: + model = Workflow + fields = ['id', 'name'] + class StateSimpleSerializer(ModelSerializer): class Meta: model = State @@ -35,3 +40,22 @@ class CustomFieldSerializer(ModelSerializer): class Meta: model = CustomField fields = '__all__' + + +class TicketCreateSerializer(ModelSerializer): + class Meta: + model=Ticket + fields=['title','workflow','ticket_data'] + +class TicketSerializer(ModelSerializer): + workflow_ = WorkflowSimpleSerializer(source='workflow', read_only=True) + state_ = StateSimpleSerializer(source='state', read_only=True) + + class Meta: + model = Ticket + fields = '__all__' + + @staticmethod + def setup_eager_loading(queryset): + queryset = queryset.select_related('workflow','state') + return queryset diff --git a/hb_server/apps/wf/services.py b/hb_server/apps/wf/services.py new file mode 100644 index 0000000..6031bbd --- /dev/null +++ b/hb_server/apps/wf/services.py @@ -0,0 +1,54 @@ +from apps.wf.models import State, Ticket, Transition, Workflow +from rest_framework.exceptions import APIException +class WfService(object): + @staticmethod + def get_wf_states(wf:Workflow): + """ + 获取工作流状态列表 + """ + return State.objects.filter(workflow=wf, is_deleted=False).order_by('sort') + + @staticmethod + def get_wf_transitions(wf:Workflow): + """ + 获取工作流流转列表 + """ + return Transition.objects.filter(workflow=wf, is_deleted=False) + + @staticmethod + def get_wf_start_state(wf:Workflow): + """ + 获取工作流初始状态 + """ + try: + wf_state_obj = State.objects.get(workflow=wf, type=State.STATE_TYPE_START, is_deleted=False) + return wf_state_obj + except: + raise Exception('工作流初始状态配置错误') + + @classmethod + def get_ticket_transitions(cls, ticket:Ticket): + """ + 获取工单当前状态下可用的流转条件 + """ + return cls.get_state_transitions(ticket.state) + + @classmethod + def get_state_transitions(cls, state:State): + """ + 获取状态可执行的操作 + """ + return Transition.objects.filter(is_deleted=False, source_state=state).all() + + @classmethod + def get_ticket_next_state(cls, ticket:Ticket)->object: + transitions = Transition.objects.filter(source_state=ticket.state, is_deleted=False) + count = transitions.count() + if count == 0: + raise Exception('未配置流转条件') + elif count == 1: + return transitions.first() + else: + for i in transitions: + pass + diff --git a/hb_server/apps/wf/urls.py b/hb_server/apps/wf/urls.py index abcd0a7..7d169f9 100644 --- a/hb_server/apps/wf/urls.py +++ b/hb_server/apps/wf/urls.py @@ -1,6 +1,6 @@ from django.db.models import base from rest_framework import urlpatterns -from apps.wf.views import CustomFieldViewSet, StateViewSet, TransitionViewSet, WorkflowViewSet +from apps.wf.views import CustomFieldViewSet, StateViewSet, TicketViewSet, TransitionViewSet, WorkflowViewSet from django.urls import path, include from rest_framework.routers import DefaultRouter @@ -9,6 +9,7 @@ router.register('workflow', WorkflowViewSet, basename='wf') router.register('state', StateViewSet, basename='wf_state') router.register('transition', TransitionViewSet, basename='wf_transitions') router.register('customfield', CustomFieldViewSet, basename='wf_customfield') +router.register('ticket', TicketViewSet, basename='wf_ticket') urlpatterns = [ path('', include(router.urls)), ] diff --git a/hb_server/apps/wf/views.py b/hb_server/apps/wf/views.py index 029ea09..4c68021 100644 --- a/hb_server/apps/wf/views.py +++ b/hb_server/apps/wf/views.py @@ -1,13 +1,13 @@ from rest_framework.response import Response from rest_framework import serializers -from rest_framework.mixins import CreateModelMixin, DestroyModelMixin, RetrieveModelMixin, UpdateModelMixin -from apps.wf.serializers import CustomFieldSerializer, StateSerializer, TransitionSerializer, WorkflowSerializer +from rest_framework.mixins import CreateModelMixin, DestroyModelMixin, ListModelMixin, RetrieveModelMixin, UpdateModelMixin +from apps.wf.serializers import CustomFieldSerializer, StateSerializer, TicketCreateSerializer, TicketSerializer, TransitionSerializer, WorkflowSerializer from django.shortcuts import render from rest_framework.viewsets import GenericViewSet, ModelViewSet from rest_framework.decorators import action -from apps.wf.models import CustomField, Workflow, State, Transition -from apps.system.mixins import CreateUpdateModelAMixin, OptimizationMixin - +from apps.wf.models import CustomField, Ticket, Workflow, State, Transition +from apps.system.mixins import CreateUpdateCustomMixin, CreateUpdateModelAMixin, OptimizationMixin +from apps.wf.services import WfService # Create your views here. class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): @@ -26,7 +26,7 @@ class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): 工作流下的状态节点 """ wf = self.get_object() - serializer = self.serializer_class(instance=State.objects.filter(workflow=wf), many=True) + serializer = self.serializer_class(instance=WfService.get_wf_states(wf), many=True) return Response(serializer.data) @action(methods=['get'], detail=True, perms_map={'get':'workflow_update'}, pagination_class=None, serializer_class=TransitionSerializer) @@ -35,7 +35,7 @@ class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): 工作流下的流转规则 """ wf = self.get_object() - serializer = self.serializer_class(instance=Transition.objects.filter(workflow=wf), many=True) + serializer = self.serializer_class(instance=WfService.get_wf_transitions(wf), many=True) return Response(serializer.data) @action(methods=['get'], detail=True, perms_map={'get':'workflow_update'}, pagination_class=None, serializer_class=CustomFieldSerializer) @@ -46,6 +46,18 @@ class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): wf = self.get_object() serializer = self.serializer_class(instance=CustomField.objects.filter(workflow=wf), many=True) return Response(serializer.data) + + @action(methods=['get'], detail=True, perms_map={'get':'workflow_init'}) + def init(self, request, pk=None): + """ + 新建工单初始化 + """ + ret={} + wf = self.get_object() + start_state = WfService.get_wf_start_state(wf) + transitions = WfService.get_state_transitions(start_state) + ret['workflow'] = pk + return Response(ret) class StateViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet): perms_map = {'*':'*'} @@ -69,4 +81,20 @@ class CustomFieldViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, serializer_class = CustomFieldSerializer search_fields = ['field_name'] filterset_fields = ['workflow', 'field_type'] - ordering = ['sort'] \ No newline at end of file + ordering = ['sort'] + +class TicketViewSet(OptimizationMixin, CreateUpdateCustomMixin, CreateModelMixin, ListModelMixin, RetrieveModelMixin, GenericViewSet): + perms_map = {'*':'*'} + queryset = Ticket.objects.all() + serializer_class = TicketSerializer + search_fields = ['title'] + filterset_fields = ['workflow', 'state'] + ordering = ['-create_time'] + + def get_serializer_class(self): + if self.action == 'create': + return TicketCreateSerializer + return super().get_serializer_class() + + def create(self, request, *args, **kwargs): + return super().create(request, *args, **kwargs) \ No newline at end of file diff --git a/hb_server/server/settings.py b/hb_server/server/settings.py index 765c6bc..79f7089 100644 --- a/hb_server/server/settings.py +++ b/hb_server/server/settings.py @@ -50,7 +50,8 @@ INSTALLED_APPS = [ 'apps.pum', 'apps.em', 'apps.hrm', - 'apps.wf' + 'apps.wf', + 'apps.mtm' ] MIDDLEWARE = [ diff --git a/hb_server/server/urls.py b/hb_server/server/urls.py index d19a401..e9bf6e7 100644 --- a/hb_server/server/urls.py +++ b/hb_server/server/urls.py @@ -61,7 +61,7 @@ urlpatterns = [ path('api/em/', include('apps.em.urls')), path('api/hrm/', include('apps.hrm.urls')), path('api/wf/', include('apps.wf.urls')), - + path('api/mtm/', include('apps.mtm.urls')), # 工具 path('api/utils/signature/', GenSignature.as_view()), From 50e7182f6d2e349c9250f269d2391013ecd2ab4d Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 26 Aug 2021 10:01:16 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=8C=87=E5=AF=BC=E4=B9=A6=E5=B5=8C=E5=A5=97=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/mtm/serializers.py | 3 + hb_server/apps/mtm/views.py | 2 +- hb_server/apps/system/serializers.py | 4 + .../wf/migrations/0006_auto_20210825_1542.py | 23 +++++ hb_server/apps/wf/models.py | 35 +++++--- hb_server/apps/wf/serializers.py | 24 +++--- hb_server/apps/wf/services.py | 86 +++++++++++++++---- hb_server/apps/wf/views.py | 45 ++++++++-- 8 files changed, 175 insertions(+), 47 deletions(-) create mode 100644 hb_server/apps/wf/migrations/0006_auto_20210825_1542.py diff --git a/hb_server/apps/mtm/serializers.py b/hb_server/apps/mtm/serializers.py index a2aa192..928c0a3 100644 --- a/hb_server/apps/mtm/serializers.py +++ b/hb_server/apps/mtm/serializers.py @@ -1,6 +1,7 @@ from rest_framework.serializers import ModelSerializer from .models import Material, Process, Step +from apps.system.serializers import FileSimpleSerializer class MaterialSerializer(ModelSerializer): @@ -9,9 +10,11 @@ class MaterialSerializer(ModelSerializer): fields = '__all__' class ProcessSerializer(ModelSerializer): + instruction_ = FileSimpleSerializer(source='instruction', read_only=True) class Meta: model = Process fields = '__all__' + class StepSerializer(ModelSerializer): class Meta: diff --git a/hb_server/apps/mtm/views.py b/hb_server/apps/mtm/views.py index 08b132b..95557cd 100644 --- a/hb_server/apps/mtm/views.py +++ b/hb_server/apps/mtm/views.py @@ -29,7 +29,7 @@ class ProcessViewSet(CreateUpdateModelAMixin, ModelViewSet): """ perms_map = {'get': '*', 'post': 'process_create', 'put': 'process_update', 'delete': 'process_delete'} - queryset = Process.objects.all() + queryset = Process.objects.select_related('instruction').all() serializer_class = ProcessSerializer search_fields = ['name', 'number'] filterset_fields = ['number'] diff --git a/hb_server/apps/system/serializers.py b/hb_server/apps/system/serializers.py index 576be89..49461bd 100644 --- a/hb_server/apps/system/serializers.py +++ b/hb_server/apps/system/serializers.py @@ -49,6 +49,10 @@ class PTaskSerializer(serializers.ModelSerializer): return 'crontab' return 'interval' +class FileSimpleSerializer(serializers.ModelSerializer): + class Meta: + fields = ['id', 'name', 'file', 'path'] + class FileSerializer(serializers.ModelSerializer): class Meta: model = File diff --git a/hb_server/apps/wf/migrations/0006_auto_20210825_1542.py b/hb_server/apps/wf/migrations/0006_auto_20210825_1542.py new file mode 100644 index 0000000..ab0aaba --- /dev/null +++ b/hb_server/apps/wf/migrations/0006_auto_20210825_1542.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.6 on 2021-08-25 07:42 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('wf', '0005_auto_20210823_1548'), + ] + + operations = [ + migrations.AddField( + model_name='state', + name='state_fields', + field=models.JSONField(default=dict, help_text='json格式字典存储,包括读写属性1：只读，2：必填，3：可选. 示例：{"created_at":1,"title":2, "sn":1}, 内置特殊字段participant_info.participant_name:当前处理人信息(部门名称、角色名称)，state.state_name:当前状态的状态名,workflow.workflow_name:工作流名称', verbose_name='表单字段'), + ), + migrations.AlterField( + model_name='state', + name='type', + field=models.IntegerField(choices=[(0, '普通类型'), (1, 1), (2, 2)], default=0, help_text='0.普通类型 1.初始状态(用于新建工单时,获取对应的字段必填及transition信息) 2.结束状态(此状态下的工单不得再处理，即没有对应的transition)', verbose_name='状态类型'), + ), + ] diff --git a/hb_server/apps/wf/models.py b/hb_server/apps/wf/models.py index 0ecbd67..84ac4e2 100644 --- a/hb_server/apps/wf/models.py +++ b/hb_server/apps/wf/models.py @@ -26,20 +26,28 @@ class State(CommonAModel): STATE_TYPE_START = 1 STATE_TYPE_END = 2 type_choices = ( - (0, '普通类型'), - (1, STATE_TYPE_START), - (2, STATE_TYPE_END) + (0, '普通'), + (STATE_TYPE_START, '开始'), + (STATE_TYPE_END, '结束') ) + PARTICIPANT_TYPE_PERSONAL = 1 + PARTICIPANT_TYPE_MULTI = 2 + PARTICIPANT_TYPE_DEPT = 3 + PARTICIPANT_TYPE_ROLE = 4 + PARTICIPANT_TYPE_VARIABLE = 5 + PARTICIPANT_TYPE_ROBOT = 6 + PARTICIPANT_TYPE_FIELD = 7 + PARTICIPANT_TYPE_PARENT_FIELD = 8 type2_choices = ( (0, '无处理人'), - (1, '个人'), - (2, '多人'), - (3, '部门'), - (4, '角色'), - (5, '变量'), - (6, '脚本'), - (7, '工单的字段'), - (8, '父工单的字段') + (PARTICIPANT_TYPE_PERSONAL, '个人'), + (PARTICIPANT_TYPE_MULTI, '多人'), + (PARTICIPANT_TYPE_DEPT, '部门'), + (PARTICIPANT_TYPE_ROLE, '角色'), + (PARTICIPANT_TYPE_VARIABLE, '变量'), + (PARTICIPANT_TYPE_ROBOT, '脚本'), + (PARTICIPANT_TYPE_FIELD, '工单的字段'), + (PARTICIPANT_TYPE_PARENT_FIELD, '父工单的字段') ) name = models.CharField('名称', max_length=50) workflow = models.ForeignKey(Workflow, on_delete=models.CASCADE, verbose_name='所属工作流') @@ -48,7 +56,7 @@ class State(CommonAModel): type = models.IntegerField('状态类型', default=0, choices=type_choices, help_text='0.普通类型 1.初始状态(用于新建工单时,获取对应的字段必填及transition信息) 2.结束状态(此状态下的工单不得再处理，即没有对应的transition)') enable_retreat = models.BooleanField('允许撤回', default=False, help_text='开启后允许工单创建人在此状态直接撤回工单到初始状态') participant_type = models.IntegerField('参与者类型', choices=type2_choices, default=1, blank=True, help_text='0.无处理人,1.个人,2.多人,3.部门,4.角色,5.变量(支持工单创建人,创建人的leader),6.脚本,7.工单的字段内容(如表单中的"测试负责人"，需要为用户名或者逗号隔开的多个用户名),8.父工单的字段内容。 初始状态请选择类型5，参与人填creator') - + state_fields = models.JSONField('表单字段', default=dict, help_text='json格式字典存储,包括读写属性1：只读，2：必填，3：可选. 示例：{"created_at":1,"title":2, "sn":1}, 内置特殊字段participant_info.participant_name:当前处理人信息(部门名称、角色名称)，state.state_name:当前状态的状态名,workflow.workflow_name:工作流名称') # json格式存储,包括读写属性1：只读，2：必填，3：可选，4：不显示, 字典的字典 class Transition(CommonAModel): """ @@ -116,6 +124,9 @@ class Ticket(CommonAModel): in_add_node = models.BooleanField('加签状态中', default=False, help_text='是否处于加签状态下') add_node_man = models.CharField('加签人', max_length=50, default='', blank=True, help_text='加签操作的人，工单当前处理人处理完成后会回到该处理人，当处于加签状态下才有效') + participant_type = models.IntegerField('当前处理人类型', default=0, help_text='0.无处理人,1.个人,2.多人,3.部门,4.角色', choices=State.type2_choices) + participant = models.CharField('当前处理人', max_length=1000, default='', blank=True, help_text='可以为空(无处理人的情况，如结束状态)、username\多个username(以,隔开)\部门id\角色id\脚本文件名等') + class TicketFlow(BaseModel): """ 工单流转日志 diff --git a/hb_server/apps/wf/serializers.py b/hb_server/apps/wf/serializers.py index dc4a2f6..dc7ed0a 100644 --- a/hb_server/apps/wf/serializers.py +++ b/hb_server/apps/wf/serializers.py @@ -1,29 +1,30 @@ -from rest_framework.serializers import ModelSerializer, SerializerMethodField, CharField +import rest_framework +from rest_framework import serializers from .models import State, Ticket, Workflow, Transition, CustomField -class WorkflowSerializer(ModelSerializer): +class WorkflowSerializer(serializers.ModelSerializer): class Meta: model = Workflow fields = '__all__' -class StateSerializer(ModelSerializer): +class StateSerializer(serializers.ModelSerializer): class Meta: model = State fields = '__all__' -class WorkflowSimpleSerializer(ModelSerializer): +class WorkflowSimpleSerializer(serializers.ModelSerializer): class Meta: model = Workflow fields = ['id', 'name'] -class StateSimpleSerializer(ModelSerializer): +class StateSimpleSerializer(serializers.ModelSerializer): class Meta: model = State fields = ['id', 'name'] -class TransitionSerializer(ModelSerializer): +class TransitionSerializer(serializers.ModelSerializer): source_state_ = StateSimpleSerializer(source='source_state', read_only=True) destination_state_ = StateSimpleSerializer(source='destination_state', read_only=True) class Meta: @@ -36,18 +37,19 @@ class TransitionSerializer(ModelSerializer): return queryset -class CustomFieldSerializer(ModelSerializer): +class CustomFieldSerializer(serializers.ModelSerializer): class Meta: model = CustomField fields = '__all__' -class TicketCreateSerializer(ModelSerializer): +class TicketCreateSerializer(serializers.ModelSerializer): + transition = serializers.IntegerField(label='流转ID') class Meta: model=Ticket - fields=['title','workflow','ticket_data'] - -class TicketSerializer(ModelSerializer): + fields=['title','workflow','ticket_data', 'transition'] + +class TicketSerializer(serializers.ModelSerializer): workflow_ = WorkflowSimpleSerializer(source='workflow', read_only=True) state_ = StateSimpleSerializer(source='state', read_only=True) diff --git a/hb_server/apps/wf/services.py b/hb_server/apps/wf/services.py index 6031bbd..7cd41ee 100644 --- a/hb_server/apps/wf/services.py +++ b/hb_server/apps/wf/services.py @@ -1,31 +1,38 @@ -from apps.wf.models import State, Ticket, Transition, Workflow +from apps.wf.models import CustomField, State, Ticket, Transition, Workflow from rest_framework.exceptions import APIException class WfService(object): @staticmethod - def get_wf_states(wf:Workflow): + def get_worlflow_states(workflow:Workflow): """ 获取工作流状态列表 """ - return State.objects.filter(workflow=wf, is_deleted=False).order_by('sort') + return State.objects.filter(workflow=workflow, is_deleted=False).order_by('sort') @staticmethod - def get_wf_transitions(wf:Workflow): + def get_workflow_transitions(workflow:Workflow): """ 获取工作流流转列表 """ - return Transition.objects.filter(workflow=wf, is_deleted=False) + return Transition.objects.filter(workflow=workflow, is_deleted=False) @staticmethod - def get_wf_start_state(wf:Workflow): + def get_workflow_start_state(workflow:Workflow): """ 获取工作流初始状态 """ try: - wf_state_obj = State.objects.get(workflow=wf, type=State.STATE_TYPE_START, is_deleted=False) + wf_state_obj = State.objects.get(workflow=workflow, type=State.STATE_TYPE_START, is_deleted=False) return wf_state_obj except: - raise Exception('工作流初始状态配置错误') + raise Exception('工作流状态配置错误') + @staticmethod + def get_workflow_custom_fields(workflow:Workflow): + """ + 获取工单字段 + """ + return CustomField.objects.filter(is_deleted=False, workflow=workflow).order_by('sort') + @classmethod def get_ticket_transitions(cls, ticket:Ticket): """ @@ -41,14 +48,57 @@ class WfService(object): return Transition.objects.filter(is_deleted=False, source_state=state).all() @classmethod - def get_ticket_next_state(cls, ticket:Ticket)->object: - transitions = Transition.objects.filter(source_state=ticket.state, is_deleted=False) - count = transitions.count() - if count == 0: - raise Exception('未配置流转条件') - elif count == 1: - return transitions.first() - else: - for i in transitions: - pass + def get_ticket_steps(cls, ticket:Ticket): + steps = cls.get_worlflow_states(ticket.workflow) + for i in steps: + if ticket.state.is_hidden and ticket.state != i: + steps.remove(i) + return steps + + @classmethod + def get_ticket_transitions(cls, ticket:Ticket): + """ + 获取工单可执行的操作 + """ + return cls.get_state_transitions(ticket.state) + + @classmethod + def get_transition_by_args(cls, kwargs:dict): + """ + 查询并获取流转 + """ + kwargs['is_deleted'] = False + return Transition.objects.filter(**kwargs).all() + + @classmethod + def get_next_state_id_by_transition_and_ticket_info(cls, ticket:Ticket, transition: Transition, workflow:Workflow = None)->object: + """ + 获取下个节点状态 + """ + if ticket: # 如果是新建工单 + source_state = ticket.state + else: + source_state = cls.get_workflow_start_state(workflow) + if transition.source_state != source_state: + raise APIException('流转错误') + destination_state = transition.destination_state + if transition.condition_expression: + pass + return destination_state + + @classmethod + def get_ticket_state_participant_info(cls, state:State, ticket:Ticket, ticket_data:dict): + """ + 获取工单目标状态实际的处理人 + """ + if state.type == State.STATE_TYPE_START: + """ + 回到初始状态 + """ + elif state.type == State.STATE_TYPE_END: + """ + 到达结束状态 + """ + + diff --git a/hb_server/apps/wf/views.py b/hb_server/apps/wf/views.py index 4c68021..2a7d877 100644 --- a/hb_server/apps/wf/views.py +++ b/hb_server/apps/wf/views.py @@ -4,10 +4,11 @@ from rest_framework.mixins import CreateModelMixin, DestroyModelMixin, ListModel from apps.wf.serializers import CustomFieldSerializer, StateSerializer, TicketCreateSerializer, TicketSerializer, TransitionSerializer, WorkflowSerializer from django.shortcuts import render from rest_framework.viewsets import GenericViewSet, ModelViewSet -from rest_framework.decorators import action +from rest_framework.decorators import action, api_view from apps.wf.models import CustomField, Ticket, Workflow, State, Transition from apps.system.mixins import CreateUpdateCustomMixin, CreateUpdateModelAMixin, OptimizationMixin from apps.wf.services import WfService +from rest_framework.exceptions import APIException # Create your views here. class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): @@ -26,7 +27,7 @@ class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): 工作流下的状态节点 """ wf = self.get_object() - serializer = self.serializer_class(instance=WfService.get_wf_states(wf), many=True) + serializer = self.serializer_class(instance=WfService.get_worlflow_states(wf), many=True) return Response(serializer.data) @action(methods=['get'], detail=True, perms_map={'get':'workflow_update'}, pagination_class=None, serializer_class=TransitionSerializer) @@ -35,7 +36,7 @@ class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): 工作流下的流转规则 """ wf = self.get_object() - serializer = self.serializer_class(instance=WfService.get_wf_transitions(wf), many=True) + serializer = self.serializer_class(instance=WfService.get_workflow_transitions(wf), many=True) return Response(serializer.data) @action(methods=['get'], detail=True, perms_map={'get':'workflow_update'}, pagination_class=None, serializer_class=CustomFieldSerializer) @@ -54,9 +55,12 @@ class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): """ ret={} wf = self.get_object() - start_state = WfService.get_wf_start_state(wf) + start_state = WfService.get_workflow_start_state(wf) transitions = WfService.get_state_transitions(start_state) ret['workflow'] = pk + ret['transitions'] = TransitionSerializer(instance=transitions, many=True).data + field_list = CustomFieldSerializer(instance=WfService.get_workflow_custom_fields(wf), many=True).data + ret['field_list'] = field_list return Response(ret) class StateViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet): @@ -97,4 +101,35 @@ class TicketViewSet(OptimizationMixin, CreateUpdateCustomMixin, CreateModelMixin return super().get_serializer_class() def create(self, request, *args, **kwargs): - return super().create(request, *args, **kwargs) \ No newline at end of file + """ + 新建工单 + """ + serializer = self.get_serializer(data=request.data) + serializer.is_valid(raise_exception=True) + start_state = WfService.get_workflow_start_state(serializer.data['workflow']) + transition = Transition.objects.get(pk=serializer.data['transition']) + ticket_data = serializer.data['ticket_data'] + if transition.field_require_check: + for key, value in start_state.state_fields.items(): #校验必填项 + if value == 2: + if key not in ticket_data or not ticket_data[key]: + raise APIException('字段{}必填'.format(key)) + next_state = WfService.get_next_state_id_by_transition_and_ticket_info(ticket=None, transition=transition, workflow=serializer.data['workflow']) + + @action(methods=['get'], detail=True, perms_map={'get':'*'}) + def flowsteps(self, request, pk=None): + """ + 工单流转step, 用于显示当前状态的step图(线性结构) + """ + ticket = self.get_object() + steps = WfService.get_ticket_steps(ticket) + return Response(StateSerializer(instance=steps, many=True).data) + + @action(methods=['get'], detail=True, perms_map={'get':'*'}) + def transitions(self, request, pk=None): + """ + 获取工单可执行的操作 + """ + ticket = self.get_object() + transitions = WfService.get_ticket_transitions(ticket) + return Response(TransitionSerializer(instance=transitions, many=True).data) \ No newline at end of file From cd37d534594dbe41de9f3086febe3e482c789065 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 26 Aug 2021 10:01:16 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=8C=87=E5=AF=BC=E4=B9=A6=E5=B5=8C=E5=A5=97=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/mtm/serializers.py | 3 + hb_server/apps/mtm/views.py | 2 +- hb_server/apps/system/serializers.py | 5 ++ .../wf/migrations/0006_auto_20210825_1542.py | 23 +++++ hb_server/apps/wf/models.py | 35 +++++--- hb_server/apps/wf/serializers.py | 24 +++--- hb_server/apps/wf/services.py | 86 +++++++++++++++---- hb_server/apps/wf/views.py | 45 ++++++++-- 8 files changed, 176 insertions(+), 47 deletions(-) create mode 100644 hb_server/apps/wf/migrations/0006_auto_20210825_1542.py diff --git a/hb_server/apps/mtm/serializers.py b/hb_server/apps/mtm/serializers.py index a2aa192..928c0a3 100644 --- a/hb_server/apps/mtm/serializers.py +++ b/hb_server/apps/mtm/serializers.py @@ -1,6 +1,7 @@ from rest_framework.serializers import ModelSerializer from .models import Material, Process, Step +from apps.system.serializers import FileSimpleSerializer class MaterialSerializer(ModelSerializer): @@ -9,9 +10,11 @@ class MaterialSerializer(ModelSerializer): fields = '__all__' class ProcessSerializer(ModelSerializer): + instruction_ = FileSimpleSerializer(source='instruction', read_only=True) class Meta: model = Process fields = '__all__' + class StepSerializer(ModelSerializer): class Meta: diff --git a/hb_server/apps/mtm/views.py b/hb_server/apps/mtm/views.py index 08b132b..95557cd 100644 --- a/hb_server/apps/mtm/views.py +++ b/hb_server/apps/mtm/views.py @@ -29,7 +29,7 @@ class ProcessViewSet(CreateUpdateModelAMixin, ModelViewSet): """ perms_map = {'get': '*', 'post': 'process_create', 'put': 'process_update', 'delete': 'process_delete'} - queryset = Process.objects.all() + queryset = Process.objects.select_related('instruction').all() serializer_class = ProcessSerializer search_fields = ['name', 'number'] filterset_fields = ['number'] diff --git a/hb_server/apps/system/serializers.py b/hb_server/apps/system/serializers.py index 576be89..a474a42 100644 --- a/hb_server/apps/system/serializers.py +++ b/hb_server/apps/system/serializers.py @@ -49,6 +49,11 @@ class PTaskSerializer(serializers.ModelSerializer): return 'crontab' return 'interval' +class FileSimpleSerializer(serializers.ModelSerializer): + class Meta: + model =File + fields = ['id', 'name', 'file', 'path'] + class FileSerializer(serializers.ModelSerializer): class Meta: model = File diff --git a/hb_server/apps/wf/migrations/0006_auto_20210825_1542.py b/hb_server/apps/wf/migrations/0006_auto_20210825_1542.py new file mode 100644 index 0000000..ab0aaba --- /dev/null +++ b/hb_server/apps/wf/migrations/0006_auto_20210825_1542.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.6 on 2021-08-25 07:42 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('wf', '0005_auto_20210823_1548'), + ] + + operations = [ + migrations.AddField( + model_name='state', + name='state_fields', + field=models.JSONField(default=dict, help_text='json格式字典存储,包括读写属性1：只读，2：必填，3：可选. 示例：{"created_at":1,"title":2, "sn":1}, 内置特殊字段participant_info.participant_name:当前处理人信息(部门名称、角色名称)，state.state_name:当前状态的状态名,workflow.workflow_name:工作流名称', verbose_name='表单字段'), + ), + migrations.AlterField( + model_name='state', + name='type', + field=models.IntegerField(choices=[(0, '普通类型'), (1, 1), (2, 2)], default=0, help_text='0.普通类型 1.初始状态(用于新建工单时,获取对应的字段必填及transition信息) 2.结束状态(此状态下的工单不得再处理，即没有对应的transition)', verbose_name='状态类型'), + ), + ] diff --git a/hb_server/apps/wf/models.py b/hb_server/apps/wf/models.py index 0ecbd67..84ac4e2 100644 --- a/hb_server/apps/wf/models.py +++ b/hb_server/apps/wf/models.py @@ -26,20 +26,28 @@ class State(CommonAModel): STATE_TYPE_START = 1 STATE_TYPE_END = 2 type_choices = ( - (0, '普通类型'), - (1, STATE_TYPE_START), - (2, STATE_TYPE_END) + (0, '普通'), + (STATE_TYPE_START, '开始'), + (STATE_TYPE_END, '结束') ) + PARTICIPANT_TYPE_PERSONAL = 1 + PARTICIPANT_TYPE_MULTI = 2 + PARTICIPANT_TYPE_DEPT = 3 + PARTICIPANT_TYPE_ROLE = 4 + PARTICIPANT_TYPE_VARIABLE = 5 + PARTICIPANT_TYPE_ROBOT = 6 + PARTICIPANT_TYPE_FIELD = 7 + PARTICIPANT_TYPE_PARENT_FIELD = 8 type2_choices = ( (0, '无处理人'), - (1, '个人'), - (2, '多人'), - (3, '部门'), - (4, '角色'), - (5, '变量'), - (6, '脚本'), - (7, '工单的字段'), - (8, '父工单的字段') + (PARTICIPANT_TYPE_PERSONAL, '个人'), + (PARTICIPANT_TYPE_MULTI, '多人'), + (PARTICIPANT_TYPE_DEPT, '部门'), + (PARTICIPANT_TYPE_ROLE, '角色'), + (PARTICIPANT_TYPE_VARIABLE, '变量'), + (PARTICIPANT_TYPE_ROBOT, '脚本'), + (PARTICIPANT_TYPE_FIELD, '工单的字段'), + (PARTICIPANT_TYPE_PARENT_FIELD, '父工单的字段') ) name = models.CharField('名称', max_length=50) workflow = models.ForeignKey(Workflow, on_delete=models.CASCADE, verbose_name='所属工作流') @@ -48,7 +56,7 @@ class State(CommonAModel): type = models.IntegerField('状态类型', default=0, choices=type_choices, help_text='0.普通类型 1.初始状态(用于新建工单时,获取对应的字段必填及transition信息) 2.结束状态(此状态下的工单不得再处理，即没有对应的transition)') enable_retreat = models.BooleanField('允许撤回', default=False, help_text='开启后允许工单创建人在此状态直接撤回工单到初始状态') participant_type = models.IntegerField('参与者类型', choices=type2_choices, default=1, blank=True, help_text='0.无处理人,1.个人,2.多人,3.部门,4.角色,5.变量(支持工单创建人,创建人的leader),6.脚本,7.工单的字段内容(如表单中的"测试负责人"，需要为用户名或者逗号隔开的多个用户名),8.父工单的字段内容。 初始状态请选择类型5，参与人填creator') - + state_fields = models.JSONField('表单字段', default=dict, help_text='json格式字典存储,包括读写属性1：只读，2：必填，3：可选. 示例：{"created_at":1,"title":2, "sn":1}, 内置特殊字段participant_info.participant_name:当前处理人信息(部门名称、角色名称)，state.state_name:当前状态的状态名,workflow.workflow_name:工作流名称') # json格式存储,包括读写属性1：只读，2：必填，3：可选，4：不显示, 字典的字典 class Transition(CommonAModel): """ @@ -116,6 +124,9 @@ class Ticket(CommonAModel): in_add_node = models.BooleanField('加签状态中', default=False, help_text='是否处于加签状态下') add_node_man = models.CharField('加签人', max_length=50, default='', blank=True, help_text='加签操作的人，工单当前处理人处理完成后会回到该处理人，当处于加签状态下才有效') + participant_type = models.IntegerField('当前处理人类型', default=0, help_text='0.无处理人,1.个人,2.多人,3.部门,4.角色', choices=State.type2_choices) + participant = models.CharField('当前处理人', max_length=1000, default='', blank=True, help_text='可以为空(无处理人的情况，如结束状态)、username\多个username(以,隔开)\部门id\角色id\脚本文件名等') + class TicketFlow(BaseModel): """ 工单流转日志 diff --git a/hb_server/apps/wf/serializers.py b/hb_server/apps/wf/serializers.py index dc4a2f6..dc7ed0a 100644 --- a/hb_server/apps/wf/serializers.py +++ b/hb_server/apps/wf/serializers.py @@ -1,29 +1,30 @@ -from rest_framework.serializers import ModelSerializer, SerializerMethodField, CharField +import rest_framework +from rest_framework import serializers from .models import State, Ticket, Workflow, Transition, CustomField -class WorkflowSerializer(ModelSerializer): +class WorkflowSerializer(serializers.ModelSerializer): class Meta: model = Workflow fields = '__all__' -class StateSerializer(ModelSerializer): +class StateSerializer(serializers.ModelSerializer): class Meta: model = State fields = '__all__' -class WorkflowSimpleSerializer(ModelSerializer): +class WorkflowSimpleSerializer(serializers.ModelSerializer): class Meta: model = Workflow fields = ['id', 'name'] -class StateSimpleSerializer(ModelSerializer): +class StateSimpleSerializer(serializers.ModelSerializer): class Meta: model = State fields = ['id', 'name'] -class TransitionSerializer(ModelSerializer): +class TransitionSerializer(serializers.ModelSerializer): source_state_ = StateSimpleSerializer(source='source_state', read_only=True) destination_state_ = StateSimpleSerializer(source='destination_state', read_only=True) class Meta: @@ -36,18 +37,19 @@ class TransitionSerializer(ModelSerializer): return queryset -class CustomFieldSerializer(ModelSerializer): +class CustomFieldSerializer(serializers.ModelSerializer): class Meta: model = CustomField fields = '__all__' -class TicketCreateSerializer(ModelSerializer): +class TicketCreateSerializer(serializers.ModelSerializer): + transition = serializers.IntegerField(label='流转ID') class Meta: model=Ticket - fields=['title','workflow','ticket_data'] - -class TicketSerializer(ModelSerializer): + fields=['title','workflow','ticket_data', 'transition'] + +class TicketSerializer(serializers.ModelSerializer): workflow_ = WorkflowSimpleSerializer(source='workflow', read_only=True) state_ = StateSimpleSerializer(source='state', read_only=True) diff --git a/hb_server/apps/wf/services.py b/hb_server/apps/wf/services.py index 6031bbd..7cd41ee 100644 --- a/hb_server/apps/wf/services.py +++ b/hb_server/apps/wf/services.py @@ -1,31 +1,38 @@ -from apps.wf.models import State, Ticket, Transition, Workflow +from apps.wf.models import CustomField, State, Ticket, Transition, Workflow from rest_framework.exceptions import APIException class WfService(object): @staticmethod - def get_wf_states(wf:Workflow): + def get_worlflow_states(workflow:Workflow): """ 获取工作流状态列表 """ - return State.objects.filter(workflow=wf, is_deleted=False).order_by('sort') + return State.objects.filter(workflow=workflow, is_deleted=False).order_by('sort') @staticmethod - def get_wf_transitions(wf:Workflow): + def get_workflow_transitions(workflow:Workflow): """ 获取工作流流转列表 """ - return Transition.objects.filter(workflow=wf, is_deleted=False) + return Transition.objects.filter(workflow=workflow, is_deleted=False) @staticmethod - def get_wf_start_state(wf:Workflow): + def get_workflow_start_state(workflow:Workflow): """ 获取工作流初始状态 """ try: - wf_state_obj = State.objects.get(workflow=wf, type=State.STATE_TYPE_START, is_deleted=False) + wf_state_obj = State.objects.get(workflow=workflow, type=State.STATE_TYPE_START, is_deleted=False) return wf_state_obj except: - raise Exception('工作流初始状态配置错误') + raise Exception('工作流状态配置错误') + @staticmethod + def get_workflow_custom_fields(workflow:Workflow): + """ + 获取工单字段 + """ + return CustomField.objects.filter(is_deleted=False, workflow=workflow).order_by('sort') + @classmethod def get_ticket_transitions(cls, ticket:Ticket): """ @@ -41,14 +48,57 @@ class WfService(object): return Transition.objects.filter(is_deleted=False, source_state=state).all() @classmethod - def get_ticket_next_state(cls, ticket:Ticket)->object: - transitions = Transition.objects.filter(source_state=ticket.state, is_deleted=False) - count = transitions.count() - if count == 0: - raise Exception('未配置流转条件') - elif count == 1: - return transitions.first() - else: - for i in transitions: - pass + def get_ticket_steps(cls, ticket:Ticket): + steps = cls.get_worlflow_states(ticket.workflow) + for i in steps: + if ticket.state.is_hidden and ticket.state != i: + steps.remove(i) + return steps + + @classmethod + def get_ticket_transitions(cls, ticket:Ticket): + """ + 获取工单可执行的操作 + """ + return cls.get_state_transitions(ticket.state) + + @classmethod + def get_transition_by_args(cls, kwargs:dict): + """ + 查询并获取流转 + """ + kwargs['is_deleted'] = False + return Transition.objects.filter(**kwargs).all() + + @classmethod + def get_next_state_id_by_transition_and_ticket_info(cls, ticket:Ticket, transition: Transition, workflow:Workflow = None)->object: + """ + 获取下个节点状态 + """ + if ticket: # 如果是新建工单 + source_state = ticket.state + else: + source_state = cls.get_workflow_start_state(workflow) + if transition.source_state != source_state: + raise APIException('流转错误') + destination_state = transition.destination_state + if transition.condition_expression: + pass + return destination_state + + @classmethod + def get_ticket_state_participant_info(cls, state:State, ticket:Ticket, ticket_data:dict): + """ + 获取工单目标状态实际的处理人 + """ + if state.type == State.STATE_TYPE_START: + """ + 回到初始状态 + """ + elif state.type == State.STATE_TYPE_END: + """ + 到达结束状态 + """ + + diff --git a/hb_server/apps/wf/views.py b/hb_server/apps/wf/views.py index 4c68021..2a7d877 100644 --- a/hb_server/apps/wf/views.py +++ b/hb_server/apps/wf/views.py @@ -4,10 +4,11 @@ from rest_framework.mixins import CreateModelMixin, DestroyModelMixin, ListModel from apps.wf.serializers import CustomFieldSerializer, StateSerializer, TicketCreateSerializer, TicketSerializer, TransitionSerializer, WorkflowSerializer from django.shortcuts import render from rest_framework.viewsets import GenericViewSet, ModelViewSet -from rest_framework.decorators import action +from rest_framework.decorators import action, api_view from apps.wf.models import CustomField, Ticket, Workflow, State, Transition from apps.system.mixins import CreateUpdateCustomMixin, CreateUpdateModelAMixin, OptimizationMixin from apps.wf.services import WfService +from rest_framework.exceptions import APIException # Create your views here. class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): @@ -26,7 +27,7 @@ class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): 工作流下的状态节点 """ wf = self.get_object() - serializer = self.serializer_class(instance=WfService.get_wf_states(wf), many=True) + serializer = self.serializer_class(instance=WfService.get_worlflow_states(wf), many=True) return Response(serializer.data) @action(methods=['get'], detail=True, perms_map={'get':'workflow_update'}, pagination_class=None, serializer_class=TransitionSerializer) @@ -35,7 +36,7 @@ class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): 工作流下的流转规则 """ wf = self.get_object() - serializer = self.serializer_class(instance=WfService.get_wf_transitions(wf), many=True) + serializer = self.serializer_class(instance=WfService.get_workflow_transitions(wf), many=True) return Response(serializer.data) @action(methods=['get'], detail=True, perms_map={'get':'workflow_update'}, pagination_class=None, serializer_class=CustomFieldSerializer) @@ -54,9 +55,12 @@ class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): """ ret={} wf = self.get_object() - start_state = WfService.get_wf_start_state(wf) + start_state = WfService.get_workflow_start_state(wf) transitions = WfService.get_state_transitions(start_state) ret['workflow'] = pk + ret['transitions'] = TransitionSerializer(instance=transitions, many=True).data + field_list = CustomFieldSerializer(instance=WfService.get_workflow_custom_fields(wf), many=True).data + ret['field_list'] = field_list return Response(ret) class StateViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet): @@ -97,4 +101,35 @@ class TicketViewSet(OptimizationMixin, CreateUpdateCustomMixin, CreateModelMixin return super().get_serializer_class() def create(self, request, *args, **kwargs): - return super().create(request, *args, **kwargs) \ No newline at end of file + """ + 新建工单 + """ + serializer = self.get_serializer(data=request.data) + serializer.is_valid(raise_exception=True) + start_state = WfService.get_workflow_start_state(serializer.data['workflow']) + transition = Transition.objects.get(pk=serializer.data['transition']) + ticket_data = serializer.data['ticket_data'] + if transition.field_require_check: + for key, value in start_state.state_fields.items(): #校验必填项 + if value == 2: + if key not in ticket_data or not ticket_data[key]: + raise APIException('字段{}必填'.format(key)) + next_state = WfService.get_next_state_id_by_transition_and_ticket_info(ticket=None, transition=transition, workflow=serializer.data['workflow']) + + @action(methods=['get'], detail=True, perms_map={'get':'*'}) + def flowsteps(self, request, pk=None): + """ + 工单流转step, 用于显示当前状态的step图(线性结构) + """ + ticket = self.get_object() + steps = WfService.get_ticket_steps(ticket) + return Response(StateSerializer(instance=steps, many=True).data) + + @action(methods=['get'], detail=True, perms_map={'get':'*'}) + def transitions(self, request, pk=None): + """ + 获取工单可执行的操作 + """ + ticket = self.get_object() + transitions = WfService.get_ticket_transitions(ticket) + return Response(TransitionSerializer(instance=transitions, many=True).data) \ No newline at end of file From faf524604b94637eb92c33659506d9a3a2a0a57e Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 26 Aug 2021 13:15:28 +0800 Subject: [PATCH 13/16] mtm step list --- hb_server/apps/mtm/views.py | 2 +- hb_server/apps/wf/models.py | 17 +++++++++++++++-- hb_server/apps/wf/services.py | 28 ++++++++++++++++++++++++++-- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/hb_server/apps/mtm/views.py b/hb_server/apps/mtm/views.py index 95557cd..60b8a88 100644 --- a/hb_server/apps/mtm/views.py +++ b/hb_server/apps/mtm/views.py @@ -42,7 +42,7 @@ class ProcessViewSet(CreateUpdateModelAMixin, ModelViewSet): 工序下的子工序 """ process = self.get_object() - serializer = self.serializer_class(instance=Step.objects.filter(process=process, is_deleted=True), many=True) + serializer = self.serializer_class(instance=Step.objects.filter(process=process, is_deleted=False), many=True) return Response(serializer.data) class StepViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet): diff --git a/hb_server/apps/wf/models.py b/hb_server/apps/wf/models.py index 84ac4e2..1f043ff 100644 --- a/hb_server/apps/wf/models.py +++ b/hb_server/apps/wf/models.py @@ -55,7 +55,8 @@ class State(CommonAModel): sort = models.IntegerField('状态顺序', default=0, help_text='用于工单步骤接口时，step上状态的顺序(因为存在网状情况，所以需要人为设定顺序),值越小越靠前') type = models.IntegerField('状态类型', default=0, choices=type_choices, help_text='0.普通类型 1.初始状态(用于新建工单时,获取对应的字段必填及transition信息) 2.结束状态(此状态下的工单不得再处理，即没有对应的transition)') enable_retreat = models.BooleanField('允许撤回', default=False, help_text='开启后允许工单创建人在此状态直接撤回工单到初始状态') - participant_type = models.IntegerField('参与者类型', choices=type2_choices, default=1, blank=True, help_text='0.无处理人,1.个人,2.多人,3.部门,4.角色,5.变量(支持工单创建人,创建人的leader),6.脚本,7.工单的字段内容(如表单中的"测试负责人"，需要为用户名或者逗号隔开的多个用户名),8.父工单的字段内容。 初始状态请选择类型5，参与人填creator') + participant_type = models.IntegerField('参与者类型', choices=type2_choices, default=1, blank=True, help_text='0.无处理人,1.个人,2.多人,3.部门,4.角色,5.变量(支持工单创建人,创建人的leader),6.脚本,7.工单的字段内容(如表单中的"测试负责人"，需要为用户名或者逗号隔开的多个用户名),8.父工单的字段内容。 初始状态请选择类型5，参与人填create_by') + participant = models.CharField('参与者', default='', blank=True, max_length=1000, help_text='可以为空(无处理人的情况，如结束状态)、username\多个username(以,隔开)\部门id\角色id\变量(create_by,create_by_tl)\脚本记录的id等，包含子工作流的需要设置处理人为loonrobot') state_fields = models.JSONField('表单字段', default=dict, help_text='json格式字典存储,包括读写属性1：只读，2：必填，3：可选. 示例：{"created_at":1,"title":2, "sn":1}, 内置特殊字段participant_info.participant_name:当前处理人信息(部门名称、角色名称)，state.state_name:当前状态的状态名,workflow.workflow_name:工作流名称') # json格式存储,包括读写属性1：只读，2：必填，3：可选，4：不显示, 字典的字典 class Transition(CommonAModel): @@ -114,6 +115,16 @@ class Ticket(CommonAModel): """ 工单 """ + STATE_DISTRIBUTE_TYPE_ACTIVE = 1 + STATE_DISTRIBUTE_TYPE_DIRECT = 2 + STATE_DISTRIBUTE_TYPE_RANDOM = 3 + STATE_DISTRIBUTE_TYPE_ALL = 4 + act_state_choices =( + (STATE_DISTRIBUTE_TYPE_ACTIVE, '主动接单'), + (STATE_DISTRIBUTE_TYPE_DIRECT, '直接处理'), + (STATE_DISTRIBUTE_TYPE_RANDOM, '随机分配'), + (STATE_DISTRIBUTE_TYPE_ALL, '全部处理') + ) title = models.CharField('标题', max_length=500, blank=True, default='', help_text="工单标题") workflow = models.ForeignKey(Workflow, on_delete=models.CASCADE, verbose_name='关联工作流') sn = models.CharField('流水号', max_length=25, help_text="工单的流水号") @@ -125,7 +136,9 @@ class Ticket(CommonAModel): add_node_man = models.CharField('加签人', max_length=50, default='', blank=True, help_text='加签操作的人，工单当前处理人处理完成后会回到该处理人，当处于加签状态下才有效') participant_type = models.IntegerField('当前处理人类型', default=0, help_text='0.无处理人,1.个人,2.多人,3.部门,4.角色', choices=State.type2_choices) - participant = models.CharField('当前处理人', max_length=1000, default='', blank=True, help_text='可以为空(无处理人的情况，如结束状态)、username\多个username(以,隔开)\部门id\角色id\脚本文件名等') + participant = models.JSONField('当前处理人', null=True, blank=True, help_text='可以为空(无处理人的情况，如结束状态)、userid、userid列表') + act_state = models.IntegerField('进行状态', default=1, help_text='当前工单的进行状态', choices=act_state_choices) + multi_all_person = models.JSONField('全部处理的结果', default=dict, blank=True, help_text='需要当前状态处理人全部处理时实际的处理结果，json格式') class TicketFlow(BaseModel): """ diff --git a/hb_server/apps/wf/services.py b/hb_server/apps/wf/services.py index 7cd41ee..c7f0159 100644 --- a/hb_server/apps/wf/services.py +++ b/hb_server/apps/wf/services.py @@ -1,3 +1,4 @@ +from apps.system.models import User from apps.wf.models import CustomField, State, Ticket, Transition, Workflow from rest_framework.exceptions import APIException class WfService(object): @@ -87,18 +88,41 @@ class WfService(object): return destination_state @classmethod - def get_ticket_state_participant_info(cls, state:State, ticket:Ticket, ticket_data:dict): + def get_ticket_state_participant_info(cls, state:State, ticket:Ticket, ticket_data:dict={}): """ - 获取工单目标状态实际的处理人 + 获取工单目标状态实际的处理人, 处理人类型 """ if state.type == State.STATE_TYPE_START: """ 回到初始状态 """ + return dict(destination_participant_type=State.PARTICIPANT_TYPE_PERSONAL, + destination_participant=ticket.create_by, + multi_all_person="{}") elif state.type == State.STATE_TYPE_END: """ 到达结束状态 """ + return dict(destination_participant_type=State.PARTICIPANT_TYPE_PERSONAL, + destination_participant='', + multi_all_person="{}") + destination_participant_type, destination_participant = State.participant_type, State.participant + if destination_participant_type == State.PARTICIPANT_TYPE_FIELD: + destination_participant = ticket_data.get(destination_participant, '') if destination_participant in ticket_data else Ticket.ticket_data.get(destination_participant, '') + + if destination_participant_type == State.PARTICIPANT_TYPE_DEPT:#单部门 + destination_participant = User.objects.filter(dept=destination_participant).values_list('id') + + if destination_participant_type == State.PARTICIPANT_TYPE_ROLE:#单角色 + destination_participant = User.objects.filter(roles=destination_participant).values_list('id') + if type(destination_participant) == list: + destination_participant_type = State.PARTICIPANT_TYPE_MULTI + destination_participant = list(set(destination_participant)) + else: + destination_participant_type = State.PARTICIPANT_TYPE_PERSONAL + + return dict(destination_participant_type) + From 70b1305bb747afb493e74c845099860508a468dd Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 26 Aug 2021 14:01:59 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=B7=A5=E8=89=BA=E6=B5=81=E7=A8=8B=E5=A2=9E=E5=8A=A0=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/mtm/models.py | 1 + hb_server/apps/mtm/serializers.py | 27 ++++++++++++++++++++--- hb_server/apps/mtm/urls.py | 3 ++- hb_server/apps/mtm/views.py | 36 +++++++++++++++++++++++++++---- 4 files changed, 59 insertions(+), 8 deletions(-) diff --git a/hb_server/apps/mtm/models.py b/hb_server/apps/mtm/models.py index 620a947..df7a7ec 100644 --- a/hb_server/apps/mtm/models.py +++ b/hb_server/apps/mtm/models.py @@ -86,6 +86,7 @@ class StepOperationItem(CommonAModel): help_text='当为布尔类型时候，可以支持自定义显示形式。{"1":"是","0":"否"}或{"1":"需要","0":"不需要"}，注意数字也需要引号') field_choice = models.JSONField('radio、checkbox、select的选项', default=dict, blank=True, help_text='radio,checkbox,select,multiselect类型可供选择的选项，格式为json如:{"1":"中国", "2":"美国"},注意数字也需要引号') + sort = models.IntegerField('排序号', default=1) class Meta: verbose_name = '操作记录条目' verbose_name_plural = verbose_name diff --git a/hb_server/apps/mtm/serializers.py b/hb_server/apps/mtm/serializers.py index 928c0a3..60fe1c8 100644 --- a/hb_server/apps/mtm/serializers.py +++ b/hb_server/apps/mtm/serializers.py @@ -1,6 +1,6 @@ from rest_framework.serializers import ModelSerializer -from .models import Material, Process, Step +from .models import Material, Process, ProductProcess, Step from apps.system.serializers import FileSimpleSerializer @@ -9,14 +9,35 @@ class MaterialSerializer(ModelSerializer): model = Material fields = '__all__' +class MaterialSimpleSerializer(ModelSerializer): + class Meta: + model = Material + fields = ['id', 'name', 'number'] + class ProcessSerializer(ModelSerializer): instruction_ = FileSimpleSerializer(source='instruction', read_only=True) class Meta: model = Process fields = '__all__' - + +class ProcessSimpleSerializer(ModelSerializer): + class Meta: + model = Process + fields = ['id', 'name', 'number'] class StepSerializer(ModelSerializer): class Meta: model = Step - fields = '__all__' \ No newline at end of file + fields = '__all__' + +class ProductProcessListSerializer(ModelSerializer): + process_ = ProcessSimpleSerializer(source='process', read_only=True) + product_ = MaterialSimpleSerializer(source='product', read_only=True) + class Meta: + model = ProductProcess + fields = '__all__' + +class ProductProcessUpdateSerializer(ModelSerializer): + class Meta: + model = ProductProcess + fields = ['sort'] \ No newline at end of file diff --git a/hb_server/apps/mtm/urls.py b/hb_server/apps/mtm/urls.py index 5772a69..9d4d325 100644 --- a/hb_server/apps/mtm/urls.py +++ b/hb_server/apps/mtm/urls.py @@ -1,12 +1,13 @@ from django.db.models import base from rest_framework import urlpatterns -from apps.mtm.views import MaterialViewSet, ProcessViewSet, StepViewSet +from apps.mtm.views import MaterialViewSet, ProcessViewSet, ProductProcessViewSet, StepViewSet from django.urls import path, include from rest_framework.routers import DefaultRouter router = DefaultRouter() router.register('material', MaterialViewSet, basename='material') router.register('process', ProcessViewSet, basename='process') +router.register('productprocess', ProductProcessViewSet, basename='productprocess') router.register('step', StepViewSet, basename='step') urlpatterns = [ path('', include(router.urls)), diff --git a/hb_server/apps/mtm/views.py b/hb_server/apps/mtm/views.py index 60b8a88..4b98443 100644 --- a/hb_server/apps/mtm/views.py +++ b/hb_server/apps/mtm/views.py @@ -1,9 +1,9 @@ from django.shortcuts import render from rest_framework.viewsets import ModelViewSet, GenericViewSet -from rest_framework.mixins import CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin +from rest_framework.mixins import CreateModelMixin, ListModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin -from apps.mtm.models import Material, Process, Step -from apps.mtm.serializers import MaterialSerializer, ProcessSerializer, StepSerializer +from apps.mtm.models import Material, Process, ProductProcess, Step +from apps.mtm.serializers import MaterialSerializer, ProductProcessListSerializer, ProductProcessUpdateSerializer, ProcessSerializer, StepSerializer from apps.system.mixins import CreateUpdateModelAMixin, OptimizationMixin from rest_framework.decorators import action from rest_framework.response import Response @@ -23,6 +23,16 @@ class MaterialViewSet(CreateUpdateModelAMixin, ModelViewSet): ordering_fields = ['number', 'sort_str'] ordering = ['number'] + @action(methods=['get'], detail=True, perms_map={'get':'*'}, pagination_class=None, serializer_class=StepSerializer) + def steps(self, request, pk=None): + """ + 工序下的子工序 + """ + process = self.get_object() + serializer = self.serializer_class(instance=Step.objects.filter(process=process, is_deleted=False), many=True) + return Response(serializer.data) + + class ProcessViewSet(CreateUpdateModelAMixin, ModelViewSet): """ 工序表-增删改查 @@ -46,9 +56,27 @@ class ProcessViewSet(CreateUpdateModelAMixin, ModelViewSet): return Response(serializer.data) class StepViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet): + """ + """ perms_map = {'*':'process_update'} queryset = Step.objects.all() serializer_class = StepSerializer search_fields = ['name', 'number'] filterset_fields = ['process'] - ordering = ['sort'] \ No newline at end of file + ordering = ['sort'] + + +class ProductProcessViewSet(CreateModelMixin, UpdateModelMixin, ListModelMixin, DestroyModelMixin, GenericViewSet): + """ + 产品生产工艺流程增删改查 + """ + perms_map={'*':'*'} + queryset = ProductProcess.objects.select_related('process', 'product').all() + filterset_fields = ['process', 'product'] + serializer_class = ProductProcessListSerializer + ordering = ['sort'] + + def get_serializer_class(self): + if self.action == 'update': + return ProductProcessUpdateSerializer + return super().get_serializer_class() \ No newline at end of file From dbf4560423527316992c9d5bded785b77480da60 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 26 Aug 2021 17:08:45 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E5=B7=A5=E5=8D=95=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/wf/models.py | 39 ++++++++++++++++++++--------- hb_server/apps/wf/services.py | 46 +++++++++++++++++++++++++++-------- hb_server/apps/wf/views.py | 12 ++++++++- 3 files changed, 75 insertions(+), 22 deletions(-) diff --git a/hb_server/apps/wf/models.py b/hb_server/apps/wf/models.py index 1f043ff..bf60399 100644 --- a/hb_server/apps/wf/models.py +++ b/hb_server/apps/wf/models.py @@ -12,6 +12,7 @@ class Workflow(CommonAModel): 工作流 """ name = models.CharField('名称', max_length=50) + sn_prefix = models.CharField('流水号前缀', max_length=50) description = models.CharField('描述', max_length=200) view_permission_check = models.BooleanField('查看权限校验', default=True, help_text='开启后，只允许工单的关联人(创建人、曾经的处理人)有权限查看工单') limit_expression = models.JSONField('限制表达式', max_length=1000, default=dict, blank=True, help_text='限制周期({"period":24} 24小时), 限制次数({"count":1}在限制周期内只允许提交1次), 限制级别({"level":1} 针对(1单个用户 2全局)限制周期限制次数,默认特定用户);允许特定人员提交({"allow_persons":"zhangsan,lisi"}只允许张三提交工单,{"allow_depts":"1,2"}只允许部门id为1和2的用户提交工单，{"allow_roles":"1,2"}只允许角色id为1和2的用户提交工单)') @@ -49,6 +50,16 @@ class State(CommonAModel): (PARTICIPANT_TYPE_FIELD, '工单的字段'), (PARTICIPANT_TYPE_PARENT_FIELD, '父工单的字段') ) + STATE_DISTRIBUTE_TYPE_ACTIVE = 1 # 主动接单 + STATE_DISTRIBUTE_TYPE_DIRECT = 2 # 直接处理(当前为多人的情况，都可以处理，而不需要先接单) + STATE_DISTRIBUTE_TYPE_RANDOM = 3 # 随机分配 + STATE_DISTRIBUTE_TYPE_ALL = 4 # 全部处理 + state_distribute_choices=( + (STATE_DISTRIBUTE_TYPE_ACTIVE, '主动接单'), + (STATE_DISTRIBUTE_TYPE_DIRECT, '直接处理'), + (STATE_DISTRIBUTE_TYPE_RANDOM, '随机分配'), + (STATE_DISTRIBUTE_TYPE_ALL, '全部处理'), + ) name = models.CharField('名称', max_length=50) workflow = models.ForeignKey(Workflow, on_delete=models.CASCADE, verbose_name='所属工作流') is_hidden = models.BooleanField('是否隐藏', default=False, help_text='设置为True时,获取工单步骤api中不显示此状态(当前处于此状态时除外)') @@ -56,8 +67,9 @@ class State(CommonAModel): type = models.IntegerField('状态类型', default=0, choices=type_choices, help_text='0.普通类型 1.初始状态(用于新建工单时,获取对应的字段必填及transition信息) 2.结束状态(此状态下的工单不得再处理，即没有对应的transition)') enable_retreat = models.BooleanField('允许撤回', default=False, help_text='开启后允许工单创建人在此状态直接撤回工单到初始状态') participant_type = models.IntegerField('参与者类型', choices=type2_choices, default=1, blank=True, help_text='0.无处理人,1.个人,2.多人,3.部门,4.角色,5.变量(支持工单创建人,创建人的leader),6.脚本,7.工单的字段内容(如表单中的"测试负责人"，需要为用户名或者逗号隔开的多个用户名),8.父工单的字段内容。 初始状态请选择类型5，参与人填create_by') - participant = models.CharField('参与者', default='', blank=True, max_length=1000, help_text='可以为空(无处理人的情况，如结束状态)、username\多个username(以,隔开)\部门id\角色id\变量(create_by,create_by_tl)\脚本记录的id等，包含子工作流的需要设置处理人为loonrobot') + participant = models.JSONField('参与者', default=list, blank=True, help_text='可以为空(无处理人的情况，如结束状态)、userid、userid列表\部门id\角色id\变量(create_by,create_by_tl)\脚本记录的id等，包含子工作流的需要设置处理人为loonrobot') state_fields = models.JSONField('表单字段', default=dict, help_text='json格式字典存储,包括读写属性1：只读，2：必填，3：可选. 示例：{"created_at":1,"title":2, "sn":1}, 内置特殊字段participant_info.participant_name:当前处理人信息(部门名称、角色名称)，state.state_name:当前状态的状态名,workflow.workflow_name:工作流名称') # json格式存储,包括读写属性1：只读，2：必填，3：可选，4：不显示, 字典的字典 + distribute_type = models.IntegerField('分配方式', default=1, help_text='1.主动接单(如果当前处理人实际为多人的时候，需要先接单才能处理) 2.直接处理(即使当前处理人实际为多人，也可以直接处理) 3.随机分配(如果实际为多人，则系统会随机分配给其中一个人) 4.全部处理(要求所有参与人都要处理一遍,才能进入下一步)') class Transition(CommonAModel): """ @@ -115,15 +127,20 @@ class Ticket(CommonAModel): """ 工单 """ - STATE_DISTRIBUTE_TYPE_ACTIVE = 1 - STATE_DISTRIBUTE_TYPE_DIRECT = 2 - STATE_DISTRIBUTE_TYPE_RANDOM = 3 - STATE_DISTRIBUTE_TYPE_ALL = 4 + TICKET_ACT_STATE_DRAFT = 0 # 草稿中 + TICKET_ACT_STATE_ONGOING = 1 # 进行中 + TICKET_ACT_STATE_BACK = 2 # 被退回 + TICKET_ACT_STATE_RETREAT = 3 # 被撤回 + TICKET_ACT_STATE_FINISH = 4 # 已完成 + TICKET_ACT_STATE_CLOSED = 5 # 已关闭 + act_state_choices =( - (STATE_DISTRIBUTE_TYPE_ACTIVE, '主动接单'), - (STATE_DISTRIBUTE_TYPE_DIRECT, '直接处理'), - (STATE_DISTRIBUTE_TYPE_RANDOM, '随机分配'), - (STATE_DISTRIBUTE_TYPE_ALL, '全部处理') + (TICKET_ACT_STATE_DRAFT, '草稿中'), + (TICKET_ACT_STATE_ONGOING, '进行中'), + (TICKET_ACT_STATE_BACK, '被退回'), + (TICKET_ACT_STATE_RETREAT, '被撤回'), + (TICKET_ACT_STATE_FINISH, '已完成'), + (TICKET_ACT_STATE_CLOSED, '已关闭') ) title = models.CharField('标题', max_length=500, blank=True, default='', help_text="工单标题") workflow = models.ForeignKey(Workflow, on_delete=models.CASCADE, verbose_name='关联工作流') @@ -135,8 +152,8 @@ class Ticket(CommonAModel): in_add_node = models.BooleanField('加签状态中', default=False, help_text='是否处于加签状态下') add_node_man = models.CharField('加签人', max_length=50, default='', blank=True, help_text='加签操作的人，工单当前处理人处理完成后会回到该处理人，当处于加签状态下才有效') - participant_type = models.IntegerField('当前处理人类型', default=0, help_text='0.无处理人,1.个人,2.多人,3.部门,4.角色', choices=State.type2_choices) - participant = models.JSONField('当前处理人', null=True, blank=True, help_text='可以为空(无处理人的情况，如结束状态)、userid、userid列表') + participant_type = models.IntegerField('当前处理人类型', default=0, help_text='0.无处理人,1.个人,2.多人', choices=State.type2_choices) + participant = models.JSONField('当前处理人', default=list, blank=True, help_text='可以为空(无处理人的情况，如结束状态)、userid、userid列表') act_state = models.IntegerField('进行状态', default=1, help_text='当前工单的进行状态', choices=act_state_choices) multi_all_person = models.JSONField('全部处理的结果', default=dict, blank=True, help_text='需要当前状态处理人全部处理时实际的处理结果，json格式') diff --git a/hb_server/apps/wf/services.py b/hb_server/apps/wf/services.py index c7f0159..8e4cc0f 100644 --- a/hb_server/apps/wf/services.py +++ b/hb_server/apps/wf/services.py @@ -1,6 +1,9 @@ from apps.system.models import User from apps.wf.models import CustomField, State, Ticket, Transition, Workflow from rest_framework.exceptions import APIException +from django.utils import timezone +from datetime import timedelta +import random class WfService(object): @staticmethod def get_worlflow_states(workflow:Workflow): @@ -72,16 +75,30 @@ class WfService(object): return Transition.objects.filter(**kwargs).all() @classmethod - def get_next_state_id_by_transition_and_ticket_info(cls, ticket:Ticket, transition: Transition, workflow:Workflow = None)->object: + def get_ticket_sn(cls, workflow:Workflow): + """ + 生成工单流水号 + """ + now = timezone.now() + today = str(now)[:10]+' 00:00:00' + next_day = str(now+timedelta(days=1))[:10]+' 00:00:00' + ticket_day_count_new = Ticket.objects.filter(create_time__gte=today, create_time__lte=next_day, workflow=workflow).count()+1 + return '%s_%04d%02d%02d%04d' % (workflow.sn_prefix, now.year, now.month, now.day, ticket_day_count_new) + + + + @classmethod + def get_next_state_id_by_transition_and_ticket_info(cls, ticket:Ticket, transition: Transition)->object: """ 获取下个节点状态 """ - if ticket: # 如果是新建工单 - source_state = ticket.state - else: - source_state = cls.get_workflow_start_state(workflow) - if transition.source_state != source_state: - raise APIException('流转错误') + # if ticket: # 如果是新建工单 + # source_state = ticket.state + # else: + # source_state = cls.get_workflow_start_state(workflow) + # if transition.source_state != source_state: + # raise APIException('流转错误') + source_state = ticket.state destination_state = transition.destination_state if transition.condition_expression: pass @@ -98,14 +115,15 @@ class WfService(object): """ return dict(destination_participant_type=State.PARTICIPANT_TYPE_PERSONAL, destination_participant=ticket.create_by, - multi_all_person="{}") + multi_all_person=dict()) elif state.type == State.STATE_TYPE_END: """ 到达结束状态 """ return dict(destination_participant_type=State.PARTICIPANT_TYPE_PERSONAL, destination_participant='', - multi_all_person="{}") + multi_all_person=dict()) + multi_all_person_dict = {} destination_participant_type, destination_participant = State.participant_type, State.participant if destination_participant_type == State.PARTICIPANT_TYPE_FIELD: @@ -123,6 +141,14 @@ class WfService(object): else: destination_participant_type = State.PARTICIPANT_TYPE_PERSONAL - return dict(destination_participant_type) + if destination_participant_type == State.PARTICIPANT_TYPE_MULTI: + if state.distribute_type == State.STATE_DISTRIBUTE_TYPE_RANDOM: + destination_participant = random.choice(destination_participant) + elif state.distribute_type == State.STATE_DISTRIBUTE_TYPE_ALL: + for i in destination_participant: + multi_all_person_dict[i]={} + return dict(destination_participant_type=destination_participant_type, + destination_participant=destination_participant, + multi_all_person=multi_all_person_dict) diff --git a/hb_server/apps/wf/views.py b/hb_server/apps/wf/views.py index 2a7d877..1702059 100644 --- a/hb_server/apps/wf/views.py +++ b/hb_server/apps/wf/views.py @@ -114,7 +114,17 @@ class TicketViewSet(OptimizationMixin, CreateUpdateCustomMixin, CreateModelMixin if value == 2: if key not in ticket_data or not ticket_data[key]: raise APIException('字段{}必填'.format(key)) - next_state = WfService.get_next_state_id_by_transition_and_ticket_info(ticket=None, transition=transition, workflow=serializer.data['workflow']) + ticket = serializer.save() + next_state = WfService.get_next_state_id_by_transition_and_ticket_info(ticket=ticket, transition=transition) + participant_info = WfService.get_ticket_state_participant_info(state=next_state, ticket=ticket, ticket_data=ticket.ticket_data) + destination_participant_type = participant_info.get('destination_participant_type', 0) + destination_participant = participant_info.get('destination_participant', '') + multi_all_person = participant_info.get('multi_all_person', '{}') # 多人需要全部处理情况 + sn = WfService.get_ticket_sn(ticket.workflow) + if next_state.type == State.STATE_TYPE_END: + act_state = Ticket.TICKET_ACT_STATE_FINISH + elif next_state.type == State.STATE_TYPE_START: + pass @action(methods=['get'], detail=True, perms_map={'get':'*'}) def flowsteps(self, request, pk=None): From 56693718c4a503f8a730f1c12b7439d45a8d7ca5 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 27 Aug 2021 08:51:47 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=B7=A5=E8=89=BA=E4=B8=8D=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/mtm/views.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hb_server/apps/mtm/views.py b/hb_server/apps/mtm/views.py index 4b98443..f1510cb 100644 --- a/hb_server/apps/mtm/views.py +++ b/hb_server/apps/mtm/views.py @@ -7,10 +7,11 @@ from apps.mtm.serializers import MaterialSerializer, ProductProcessListSerialize from apps.system.mixins import CreateUpdateModelAMixin, OptimizationMixin from rest_framework.decorators import action from rest_framework.response import Response +from utils.pagination import PageOrNot # Create your views here. -class MaterialViewSet(CreateUpdateModelAMixin, ModelViewSet): +class MaterialViewSet(PageOrNot, CreateUpdateModelAMixin, ModelViewSet): """ 物料表-增删改查 """ @@ -33,7 +34,7 @@ class MaterialViewSet(CreateUpdateModelAMixin, ModelViewSet): return Response(serializer.data) -class ProcessViewSet(CreateUpdateModelAMixin, ModelViewSet): +class ProcessViewSet(PageOrNot, CreateUpdateModelAMixin, ModelViewSet): """ 工序表-增删改查 """ @@ -66,7 +67,7 @@ class StepViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, Destro ordering = ['sort'] -class ProductProcessViewSet(CreateModelMixin, UpdateModelMixin, ListModelMixin, DestroyModelMixin, GenericViewSet): +class ProductProcessViewSet(PageOrNot, CreateModelMixin, UpdateModelMixin, ListModelMixin, DestroyModelMixin, GenericViewSet): """ 产品生产工艺流程增删改查 """