SQL Server - Busqueda filtrada

SELECT DISTINCT OF_Cod_Maq,sum(convert (numeric,OF_MT_Tirada))as MetrosL, sum( OF_Cantidad) as Cant, sum(convert (numeric,OF_M2_Papel)) as M2, sum(convert (numeric,OF_MT_Papel))as MetrosR FROM OrdenesHistorico JOIN VCLIENTE ON (OrdenesHistorico.OF_Cod_Cli = VCLIENTE.Clie_Codigo) where (OF_Cod_Maq >= '$MacIni' and OF_Cod_Maq <= '$MacFin') or (Fechtraspaso>= $Fec_Inic and Fechtraspaso <= $Fec_Fin) or (Clie_nombre>= '$Cliein' and Clie_nombre <= '$Cliefin')  group by OF_Cod_Maq

SELECT

   oh.OF_Cod_Cli,

   oh.OF_Cod_Maq,

   sum(convert(numeric, oh.OF_MT_Tirada)) AS MetrosL,

   sum(oh.OF_Cantidad) AS Cant,

   sum(convert(numeric, oh.OF_M2_Papel)) AS M2,

   sum(convert(numeric, oh.OF_MT_Papel)) AS MetrosR

FROM OrdenesHistorico oh

   INNER JOIN VCLIENTE vc

      ON oh.OF_Cod_Cli = vc.Clie_Codigo

WHERE

      ((oh.OF_Cod_Maq >= '$MacIni' AND oh.OF_Cod_Maq <= '$MacFin') OR '$MacIni' ISNULL OR '$MacFin' IS NULL)

   OR ((oh.Fechtraspaso BETWEEN $Fec_Inic AND $Fec_Fin) OR $Fec_Ini IS NULL OR $Fec_Fin IS NULL)

   OR ((vc.Clie_nombre >= '$Cliein' AND vc.Clie_nombre <= '$Cliefin') OR '$Cliein' IS NULL OR 'Cliefin' IS NULL)

GROUP BY oh.OF_Cod_Cli, oh.OF_Cod_Maq;