Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
This commit is contained in:
commit
6482ff4c25
|
@ -150,7 +150,7 @@ class SubProductionPlanViewSet(CreateUpdateModelAMixin, ListModelMixin, UpdateMo
|
||||||
"""
|
"""
|
||||||
子生产计划-列表/修改
|
子生产计划-列表/修改
|
||||||
"""
|
"""
|
||||||
perms_map = {'get': '*', 'put':'subplan_update'}
|
perms_map = {'get': '*', 'put':'*'}
|
||||||
queryset = SubProductionPlan.objects.select_related('process',
|
queryset = SubProductionPlan.objects.select_related('process',
|
||||||
'workshop', 'subproduction', 'product',
|
'workshop', 'subproduction', 'product',
|
||||||
'production_plan__product', 'leader_1', 'leader_2', 'leader_3', 'first_test')
|
'production_plan__product', 'leader_1', 'leader_2', 'leader_3', 'first_test')
|
||||||
|
@ -176,7 +176,7 @@ class SubProductionPlanViewSet(CreateUpdateModelAMixin, ListModelMixin, UpdateMo
|
||||||
serializer = SubProductionProgressSerializer(instance=obj.progress_subplan, many=True)
|
serializer = SubProductionProgressSerializer(instance=obj.progress_subplan, many=True)
|
||||||
return Response(serializer.data)
|
return Response(serializer.data)
|
||||||
|
|
||||||
@action(methods=['post'], detail=True, perms_map={'post':'subplan_issue'}, serializer_class=serializers.Serializer)
|
@action(methods=['post'], detail=True, perms_map={'post':'*'}, serializer_class=serializers.Serializer)
|
||||||
@transaction.atomic
|
@transaction.atomic
|
||||||
def issue(self, request, pk=None):
|
def issue(self, request, pk=None):
|
||||||
"""
|
"""
|
||||||
|
@ -193,7 +193,7 @@ class SubProductionPlanViewSet(CreateUpdateModelAMixin, ListModelMixin, UpdateMo
|
||||||
return Response()
|
return Response()
|
||||||
raise APIException('计划状态有误')
|
raise APIException('计划状态有误')
|
||||||
|
|
||||||
@action(methods=['post'], detail=True, perms_map={'post':'subplan_start'}, serializer_class=serializers.Serializer)
|
@action(methods=['post'], detail=True, perms_map={'post':'*'}, serializer_class=serializers.Serializer)
|
||||||
def start(self, request, pk=None):
|
def start(self, request, pk=None):
|
||||||
"""
|
"""
|
||||||
开始生产
|
开始生产
|
||||||
|
|
Loading…
Reference in New Issue