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

子工序返回完整list

This commit is contained in:
caoqianming 2021-10-12 17:04:07 +08:00
parent 4bab6de73d
commit 2eabbf891e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hb_server/apps/mtm/views.py
View File

@ -53,11 +53,11 @@ class ProcessViewSet(PageOrNot, CreateUpdateModelAMixin, ModelViewSet):
serializer = self.serializer_class(instance=Step.objects.prefetch_related('equipments').filter(process=process, is_deleted=False), many=True) serializer = self.serializer_class(instance=Step.objects.prefetch_related('equipments').filter(process=process, is_deleted=False), many=True)
return Response(serializer.data) return Response(serializer.data)
class StepViewSet(OptimizationMixin, CreateUpdateModelAMixin, CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet): class StepViewSet(OptimizationMixin, CreateUpdateModelAMixin, ModelViewSet):
""" """
子工序-增删改查 子工序-增删改查
""" """
perms_map = {'*':'process_update'} perms_map = {'*':'*'}
queryset = Step.objects.all() queryset = Step.objects.all()
serializer_class = StepSerializer serializer_class = StepSerializer
search_fields = ['name', 'number'] search_fields = ['name', 'number']

4
hb_server/apps/wf/views.py
View File

@ -294,9 +294,9 @@ class TicketViewSet(OptimizationMixin, CreateUpdateCustomMixin, CreateModelMixin
""" """
ticket = self.get_object() ticket = self.get_object()
if ticket.create_by != request.user: if ticket.create_by != request.user:
raise APIException('非创建人不可撤单') raise APIException('非创建人不可撤回')
if not ticket.state.enable_retreat: if not ticket.state.enable_retreat:
raise APIException('该状态不可撤单') raise APIException('该状态不可撤回')
start_state = WfService.get_workflow_start_state(ticket.workflow) start_state = WfService.get_workflow_start_state(ticket.workflow)
ticket.state = start_state ticket.state = start_state
ticket.participant_type = State.PARTICIPANT_TYPE_PERSONAL ticket.participant_type = State.PARTICIPANT_TYPE_PERSONAL