Compare commits
	
		
			No commits in common. "7b8ec7f9d673d227ee2a39d9118b9a7c895a78c1" and "de99f85259848349f735aeb54bbd04af45d09d43" have entirely different histories.
		
	
	
		
			7b8ec7f9d6
			...
			de99f85259
		
	
		| 
						 | 
					@ -505,7 +505,7 @@ class HandoverViewSet(CustomModelViewSet):
 | 
				
			||||||
        Prefetch('b_handover', queryset=Handoverb.objects.select_related('wm__defect'))
 | 
					        Prefetch('b_handover', queryset=Handoverb.objects.select_related('wm__defect'))
 | 
				
			||||||
    ]
 | 
					    ]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def perform_destroy(self, instance:Handover):
 | 
					    def perform_destroy(self, instance):
 | 
				
			||||||
        user = self.request.user
 | 
					        user = self.request.user
 | 
				
			||||||
        if instance.submit_time is not None:
 | 
					        if instance.submit_time is not None:
 | 
				
			||||||
            raise ParseError('该交接记录已提交不可删除')
 | 
					            raise ParseError('该交接记录已提交不可删除')
 | 
				
			||||||
| 
						 | 
					@ -570,9 +570,6 @@ class HandoverViewSet(CustomModelViewSet):
 | 
				
			||||||
        交接记录撤回
 | 
					        交接记录撤回
 | 
				
			||||||
        """
 | 
					        """
 | 
				
			||||||
        ins: Handover = self.get_object()
 | 
					        ins: Handover = self.get_object()
 | 
				
			||||||
        if ins.new_batch: # 如果是合批
 | 
					 | 
				
			||||||
            if Handoverb.objects.filter(wm=ins.new_batch, handover__submit_time__isnull=True).exists():
 | 
					 | 
				
			||||||
                raise ParseError("该合批存在未提交的交接记录,不可撤回")
 | 
					 | 
				
			||||||
        if ins.submit_time:
 | 
					        if ins.submit_time:
 | 
				
			||||||
            handover_revert(ins, handler=request.user)
 | 
					            handover_revert(ins, handler=request.user)
 | 
				
			||||||
        return Response()
 | 
					        return Response()
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue