fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug #8156 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@61978 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2016-10-25 20:53:41 +00:00
parent 98dd03a760
commit da03a83010
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaPacoteVoucher.java
View File

@ -61,11 +61,12 @@ public class RelatorioVendaPacoteVoucher extends Relatorio {
ResultSet rset = null; ResultSet rset = null;
NamedParameterStatement stmt = null; NamedParameterStatement stmt = null;
try { try {
StringBuilder sQuery = new StringBuilder("SELECT VP.DATAPACOTE,VP.DATAVENDA,VP.SUBTOTAL,VP.TOTAL,VP.DESCONTO,VP.NUMOPERACION,P.NOMPACOTE,P.DESCPACOTE,E.NOMBEMPRESA,VP.SITUACAO,U.NOMBUSUARIO "); StringBuilder sQuery = new StringBuilder("SELECT VP.DATAPACOTE,VP.DATAVENDA,VP.SUBTOTAL,VP.TOTAL,VP.DESCONTO,VP.NUMOPERACION,P.NOMPACOTE,P.DESCPACOTE,E.NOMBEMPRESA,VP.SITUACAO,U.NOMBUSUARIO,M.MARCA_ID ");
sQuery.append("FROM VENDA_PACOTE VP ") sQuery.append("FROM VENDA_PACOTE VP ")
.append("JOIN PACOTE P ON P.PACOTE_ID = VP.PACOTE_ID ") .append("JOIN PACOTE P ON P.PACOTE_ID = VP.PACOTE_ID ")
.append("JOIN EMPRESA E ON E.EMPRESA_ID = P.EMPRESA_ID ") .append("JOIN EMPRESA E ON E.EMPRESA_ID = P.EMPRESA_ID ")
.append("JOIN USUARIO U ON U.USUARIO_ID = VP.USUARIO_ID ") .append("JOIN USUARIO U ON U.USUARIO_ID = VP.USUARIO_ID ")
.append("LEFT JOIN MARCA M ON M.EMPRESA_ID = E.EMPRESA_ID ")
.append("WHERE VP.VENDAPACOTE_ID = :vendapacoteId ") .append("WHERE VP.VENDAPACOTE_ID = :vendapacoteId ")
.append("AND VP.MOTIVOCANCELVENDAPACOTE_ID IS NULL "); .append("AND VP.MOTIVOCANCELVENDAPACOTE_ID IS NULL ");
log.debug(sQuery); log.debug(sQuery);
@ -87,6 +88,8 @@ public class RelatorioVendaPacoteVoucher extends Relatorio {
pacoteVoucher.setNombusuario(rset.getString("nombusuario")); pacoteVoucher.setNombusuario(rset.getString("nombusuario"));
pacoteVoucher.setSituacaoVendaPacote(SituacaoVendaPacote.getSituacaoVendaPacote(rset.getInt("situacao"))); pacoteVoucher.setSituacaoVendaPacote(SituacaoVendaPacote.getSituacaoVendaPacote(rset.getInt("situacao")));
carregarLogo(conexao, rset.getInt("marca_id"));
carregarPacoteItem(conexao, pacoteVoucher); carregarPacoteItem(conexao, pacoteVoucher);
carregarEnderecoApanhe(conexao, pacoteVoucher); carregarEnderecoApanhe(conexao, pacoteVoucher);
carregarClientePacote(conexao, pacoteVoucher); carregarClientePacote(conexao, pacoteVoucher);
@ -297,8 +300,6 @@ public class RelatorioVendaPacoteVoucher extends Relatorio {
pacoteTarifaVoucher.setCorridaId(rset.getInt("corrida_id")); pacoteTarifaVoucher.setCorridaId(rset.getInt("corrida_id"));
} }
carregarLogo(conexao, rset.getInt("marca_id"));
lsPacoteTarifasVouchers.add(pacoteTarifaVoucher); lsPacoteTarifasVouchers.add(pacoteTarifaVoucher);
} }
pacoteVoucher.setPacoteTarifasVouchers(lsPacoteTarifasVouchers); pacoteVoucher.setPacoteTarifasVouchers(lsPacoteTarifasVouchers);