车间操作移除半成品bug

hb_server/apps/pm/views.py

@@ -411,7 +411,7 @@ class ResourceViewSet(GenericViewSet):
             del(half_list[0])
         return Response(res)
 
-    @action(methods=['post'], detail=False, perms_map={'post':'resource_cal_equip'}, serializer_class=ResourceCalListSerializer)
+    @action(methods=['post'], detail=False, perms_map={'post':'resource_cal'}, serializer_class=ResourceCalListSerializer)
     def cal_equip(self, request, pk=None):
         """
         设备状态查看

hb_server/apps/sam/views.py

@@ -63,7 +63,7 @@ class OrderViewSet(CreateUpdateCustomMixin, ModelViewSet):
             return OrderCreateUpdateSerializer
         return super().get_serializer_class()
 
-    @action(methods=['get'], detail=False, perms_map={'get':'order_toplan'})
+    @action(methods=['get'], detail=False, perms_map={'get':'*'})
     def toplan(self, request, pk=None):
         queryset = Order.objects.filter(count__gt=F('planed_count')).order_by('-id')
         page = self.paginate_queryset(queryset)

hb_server/apps/wpm/views.py

@@ -141,7 +141,7 @@ class WMaterialViewSet(CreateUpdateModelAMixin, ListModelMixin, GenericViewSet):
     ordering_fields = ['material__number']
     ordering = ['material__number']
 
-    @action(methods=['post'], detail=False, perms_map={'post': 'pick'}, serializer_class=PickSerializer)
+    @action(methods=['post'], detail=False, perms_map={'post': 'wmaterial_pick'}, serializer_class=PickSerializer)
     def pick(self, request, pk=None):
         """
         领料
@@ -817,6 +817,7 @@ class OperationWproductViewSet(ListModelMixin, DestroyModelMixin, UpdateModelMix
             raise exceptions.APIException('该操作已提交')
         instance.delete()
         wp = instance.wproduct
+        wp.state = WProduct.WPR_ACT_STATE_DOWAIT
         wp.operation = None
         wp.save()
         return Response()