|  |  |  | @ -658,6 +658,7 @@ public class OrderController { | 
			
		
	
		
			
				
					|  |  |  |  |         OrderEntity orderEntity = orderService.findById(orderFilterRequest.getId()); | 
			
		
	
		
			
				
					|  |  |  |  |         orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); | 
			
		
	
		
			
				
					|  |  |  |  |         orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN); | 
			
		
	
		
			
				
					|  |  |  |  |         orderEntity.setErpFk(" "); //将业务单据号置空
 | 
			
		
	
		
			
				
					|  |  |  |  |         List<WarehouseEntity> warehouseEntityList = codesService.findByReceiptId(orderEntity.getId()); | 
			
		
	
		
			
				
					|  |  |  |  |         codesTempService.insertCodesTemp(warehouseEntityList); | 
			
		
	
		
			
				
					|  |  |  |  |         codesService.deleteByOrderId(orderEntity.getId()); | 
			
		
	
	
		
			
				
					|  |  |  | @ -665,7 +666,6 @@ public class OrderController { | 
			
		
	
		
			
				
					|  |  |  |  |         orderService.updateOrder(orderEntity); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |         return ResultVOUtils.success("单据撤回成功!"); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |     } | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |     public List<String> getDocids(List<ErpOrderEntity> mergeList) { | 
			
		
	
	
		
			
				
					|  |  |  | 
 |