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

fixes bug #8882 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@68110 d1611594-4594-4d17-8e1d-87c2c4800839
master
wilian 2017-04-17 21:56:44 +00:00
parent 87cef0139c
commit e91d2d1070
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoBilhetes.java
View File

@ -46,13 +46,14 @@ public class RelatorioObservacaoBilhetes extends Relatorio {
NamedParameterStatement stmt = null;
try {
StringBuilder sQuery = new StringBuilder();
sQuery.append("SELECT PV.NOMBPUNTOVENTA, C.DATAMOVIMENTO, LOG.STATUS, LOG.OBSERVACAO, B.NUMFOLIOSISTEMA, CAT.DESCCATEGORIA, LOG.PRECO, LOG.FECMODIF, LOG.INDCREDITO, B.TIPOVENTA_ID, U.NOMBUSUARIO ")
sQuery.append("SELECT PV.NOMBPUNTOVENTA, C.DATAMOVIMENTO, LOG.STATUS, LOG.OBSERVACAO, NVL(B.NUMFOLIOSISTEMA,CJ.NUMFOLIOSISTEMA) AS NUMFOLIOSISTEMA, CAT.DESCCATEGORIA, LOG.PRECO, LOG.FECMODIF, LOG.INDCREDITO, NVL(B.TIPOVENTA_ID,CJ.TIPOVENTA_ID) AS TIPOVENTA_ID, U.NOMBUSUARIO ")
.append("FROM LOG_CONFERENCIA LOG ")
.append("INNER JOIN CONFERENCIA C ON C.CONFERENCIA_ID = LOG.CONFERENCIA_ID ")
.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = C.EMPRESA_ID ")
.append("INNER JOIN PUNTO_VENTA PV ON PV.PUNTOVENTA_ID = C.PUNTOVENTA_ID ")
.append("INNER JOIN USUARIO U ON U.USUARIO_ID = LOG.USUARIO_ID ")
.append("INNER JOIN BOLETO B ON B.BOLETO_ID = LOG.BOLETO_ID ")
.append("LEFT JOIN BOLETO B ON B.BOLETO_ID = LOG.BOLETO_ID ")
.append("LEFT JOIN CAJA CJ ON CJ.CAJA_ID = LOG.BOLETO_ID ")
.append("INNER JOIN CATEGORIA CAT ON CAT.CATEGORIA_ID = B.CATEGORIA_ID ")
.append("WHERE LOG.ACTIVO = 1 ")
.append("AND C.DATAMOVIMENTO BETWEEN :dataInicial AND :dataFinal ");

3
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoConferenciaMovimento.java
View File

@ -50,13 +50,14 @@ public class RelatorioObservacaoConferenciaMovimento extends Relatorio {
NamedParameterStatement stmt = null;
try {
StringBuilder sQuery = new StringBuilder();
sQuery.append("SELECT PV.NOMBPUNTOVENTA, C.DATAMOVIMENTO, LOG.STATUS, LOG.OBSERVACAO, B.NUMFOLIOSISTEMA, CAT.DESCCATEGORIA, LOG.PRECO, LOG.FECMODIF, LOG.INDCREDITO, B.TIPOVENTA_ID, U.NOMBUSUARIO, LOG.TIPO, EE.DESCINFO, TEE.DESCTIPOEVENTO ")
sQuery.append("SELECT PV.NOMBPUNTOVENTA, C.DATAMOVIMENTO, LOG.STATUS, LOG.OBSERVACAO, NVL(B.NUMFOLIOSISTEMA,CJ.NUMFOLIOSISTEMA) AS NUMFOLIOSISTEMA, CAT.DESCCATEGORIA, LOG.PRECO, LOG.FECMODIF, LOG.INDCREDITO, NVL(B.TIPOVENTA_ID,CJ.TIPOVENTA_ID) AS TIPOVENTA_ID, U.NOMBUSUARIO, LOG.TIPO, EE.DESCINFO, TEE.DESCTIPOEVENTO ")
.append("FROM LOG_CONFERENCIA LOG ")
.append("INNER JOIN CONFERENCIA C ON C.CONFERENCIA_ID = LOG.CONFERENCIA_ID ")
.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = C.EMPRESA_ID ")
.append("INNER JOIN PUNTO_VENTA PV ON PV.PUNTOVENTA_ID = C.PUNTOVENTA_ID ")
.append("INNER JOIN USUARIO U ON U.USUARIO_ID = LOG.USUARIO_ID ")
.append("LEFT JOIN BOLETO B ON B.BOLETO_ID = LOG.BOLETO_ID ")
.append("LEFT JOIN CAJA CJ ON CJ.CAJA_ID = LOG.CAJA_ID ")
.append("LEFT JOIN CATEGORIA CAT ON CAT.CATEGORIA_ID = B.CATEGORIA_ID ")
.append("LEFT JOIN EVENTO_EXTRA EE ON EE.EVENTOEXTRA_ID = LOG.EVENTOEXTRA_ID ")
.append("LEFT JOIN TIPO_EVENTO_EXTRA TEE ON TEE.TIPOEVENTOEXTRA_ID = EE.TIPOEVENTOEXTRA_ID ")

10
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java
View File

@ -773,8 +773,8 @@ public class ConferenciaController extends MyGenericForwardComposer {
for (EventosFinanceirosVO eventoFinanceiro : lsEventosFinanceiros) {
if (eventoFinanceiro.isCredito()) {
totalCreditosEventoFinanceiros = totalCreditosEventoFinanceiros.add(eventoFinanceiro.getImpingreso());
} else {
totalDebitosEventoFinanceiros = totalDebitosEventoFinanceiros.add(eventoFinanceiro.getImpingreso());
} else if (eventoFinanceiro.isDebito()) {
totalDebitosEventoFinanceiros = totalDebitosEventoFinanceiros.add(eventoFinanceiro.getImpingreso().abs());
}
}
@ -1246,7 +1246,7 @@ public class ConferenciaController extends MyGenericForwardComposer {
logConferencia.setIndcredito((short) 1);
if (tipo.equals(TipoLogConferencia.BOLETO)) {
logConferencia.setBoletoId(id);
logConferencia.setCajaId(id);
}
if (tipo.equals(TipoLogConferencia.OCD)) {
logConferencia.setOcdId(id);
@ -1264,7 +1264,7 @@ public class ConferenciaController extends MyGenericForwardComposer {
private void atualizarLogConferenciaList(LogConferencia logConferencia, String numfoliosistema) {
LogConferenciaVO logConferenciaVO = new LogConferenciaVO();
logConferenciaVO.setLogconferenciaId(logConferencia.getLogconferenciaId());
logConferenciaVO.setBoletoId(logConferencia.getBoletoId());
logConferenciaVO.setCajaId(logConferencia.getCajaId());
logConferenciaVO.setEventoextraId(logConferencia.getEventoextraId());
logConferenciaVO.setOcdId(logConferencia.getOcdId());
logConferenciaVO.setFecmodif(logConferencia.getFecmodif());
@ -1282,7 +1282,7 @@ public class ConferenciaController extends MyGenericForwardComposer {
@SuppressWarnings("unchecked")
private void gravarLogConferenciaBilhete(MyListbox bilhetes, BoletoComissao boletoComissao, Tab tab, String label) {
try {
LogConferencia logConferencia = gravarLogConferencia(TipoLogConferencia.BOLETO, boletoComissao.getBoletoId(), boletoComissao.getNumFolioSistema());
LogConferencia logConferencia = gravarLogConferencia(TipoLogConferencia.BOLETO, boletoComissao.getCajaId(), boletoComissao.getNumFolioSistema());
boletoComissao.setLogconferenciaId(logConferencia.getLogconferenciaId());
boletoComissao.setStatus(logConferencia.getStatus().getValue());
boletoComissao.setConferido(Boolean.TRUE);

4
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/EditarLogConfenciaComissaoController.java
View File

@ -139,7 +139,7 @@ public class EditarLogConfenciaComissaoController extends MyGenericForwardCompos
}
if(boletoComissao != null) {
logConferencia.setBoletoId(boletoComissao.getBoletoId());
logConferencia.setCajaId(boletoComissao.getCajaId());
logConferencia.setTipo(TipoLogConferencia.BOLETO);
}
@ -245,7 +245,7 @@ public class EditarLogConfenciaComissaoController extends MyGenericForwardCompos
private void atualizarLogConferenciaList(LogConferencia logConferencia) {
LogConferenciaVO logConferenciaVO = new LogConferenciaVO();
logConferenciaVO.setLogconferenciaId(logConferencia.getLogconferenciaId());
logConferenciaVO.setBoletoId(logConferencia.getBoletoId());
logConferenciaVO.setCajaId(logConferencia.getCajaId());
logConferenciaVO.setEventoextraId(logConferencia.getEventoextraId());
logConferenciaVO.setOcdId(logConferencia.getOcdId());
logConferenciaVO.setFecmodif(logConferencia.getFecmodif());

2
src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderBoletoComissao.java
View File

@ -24,7 +24,7 @@ public class RenderBoletoComissao implements ListitemRenderer {
Listcell lc = new Listcell();
if(boletoComissao.isExigeConferenciaAba() || boletoComissao.isExigeConferencia() || boletoComissao.isExigeConferenciaBoletoDevolvido()) {
Checkbox chk = new Checkbox();
chk.setId(boletoComissao.getBoletoId()+"");
chk.setId(boletoComissao.getCajaId()+"");
chk.setChecked(boletoComissao.isConferido());
chk.setParent(lc);
}