fixes bug#20335

dev: 
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@103359 d1611594-4594-4d17-8e1d-87c2c4800839

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMmphDer.java

@@ -39,6 +39,7 @@ public class RelatorioMmphDer extends Relatorio {
 				sql.append(" select * from ( ");
 				sql.append("   SELECT  ");
 				sql.append("     r.DESCRUTA as linha, ");
+				sql.append("     r.numruta as numlinha, ");
 				sql.append("     count( distinct b.boleto_id) as bilhete,  ");
 				sql.append("     to_char( b.fechorviaje, 'DD') as dia, ");
 				sql.append("     r.indsentidoida as sentido, ");
@@ -94,7 +95,7 @@ public class RelatorioMmphDer extends Relatorio {
 				sql.append("     and b.MOTIVOCANCELACION_ID is null ");
 				sql.append("     and b.INDSTATUSBOLETO = 'V' ");
 				
-				sql.append("   GROUP BY r.descruta, ");
+				sql.append("   GROUP BY r.descruta, r.numruta, ");
 				sql.append("     to_char(b.fechorviaje, 'DD'), ");
 				sql.append("     r.indsentidoida, ");
 				sql.append("     da.cantasientos, ");
@@ -112,7 +113,7 @@ public class RelatorioMmphDer extends Relatorio {
 				sql.append("                 '20','21','22','23','24','25','26','27','28','29', ");
 				sql.append("                 '30','31') ");
 				sql.append(" ) ");
-				sql.append(" ORDER BY linha, sentido desc");
+				sql.append(" ORDER BY linha, numlinha, sentido desc");
 
 				NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql.toString());
 
@@ -240,7 +241,8 @@ public class RelatorioMmphDer extends Relatorio {
 						}
 					}
 					
-					dataResult.put("LINHA", rset.getString("linha"));
+					String linha = rset.getString("numlinha") +"-"+ rset.getString("linha");
+					dataResult.put("LINHA", linha);
 					dataResult.put("SENTIDO", sentido);					
 					dataResult.put("SERVICO", rset.getString("servico"));
 					dataResult.put("HORARIO", rset.getString("horario"));