车间操作创建

hb_server/apps/wpm/views.py

@@ -270,6 +270,9 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Gen
     ordering_fields = ['id']
     ordering = ['-id']
 
+    def get_queryset(self):
+        return self.queryset.filter(create_by=self.request.user)
+
     def get_serializer_class(self):
         if self.action == 'retrieve':
             return OperationDetailSerializer
@@ -283,7 +286,7 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Gen
         serializer = OperationCreateSerializer(data=data, context={'request':self.request})
         serializer.is_valid(raise_exception=True)
         vdata = serializer.validated_data #校验之后的数据
-        step = Step.objects.get(pk=vdata['step'])
+        step = vdata['step']
         op = Operation()
         op.step = step
         op.is_submited = False
@@ -291,9 +294,8 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Gen
         # 创建操作所用半成品关联记录
         if 'wproducts' in vdata:
             owps = []
-            for i in vdata['wproducts']:
+            for wpd in vdata['wproducts']:
                 owp = {}
-                wpd = WProduct.objects.get(pk=i)
                 owp['operation'] = op
                 owp['wproduct'] = wpd
                 owp['number'] = wpd.number
@@ -322,7 +324,7 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Gen
 
 
 
-class OperationWproductViewSet(ListModelMixin, GenericViewSet):
+class OperationWproductViewSet(ListModelMixin, DestroyModelMixin,  GenericViewSet):
     """
     操作使用的半成品
     """
@@ -333,6 +335,18 @@ class OperationWproductViewSet(ListModelMixin, GenericViewSet):
     ordering_fields = ['id']
     ordering = ['-id']
 
+    @transaction.atomic()
+    def destroy(self, request, *args, **kwargs):
+        instance = self.get_object()
+        if instance.operation.is_submited:
+            raise exceptions.APIException('该操作已提交')
+        instance.delete()
+        wp = instance.wproduct
+        wp.operation = None
+        wp.save()
+        return Response()
+        
+
 class DoFormInit(CreateAPIView, GenericAPIView):
     perms_map={'*':'*'}
     serializer_class=OperationInitSerializer