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

fixes bug #10474 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@78000 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2018-01-12 19:54:39 +00:00
parent ae234d0f1f
commit 0fed3d1483
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java
View File

@ -160,7 +160,7 @@ public class AidfHibernateDAO extends GenericHibernateDAO<Aidf, Long> implements
sb.append(" select max(folio) as ultimo ");
sb.append(" from folio_consumo_rmd ");
sb.append(" where activo = 1 ");
sb.append(" and (indimpresso = 1 or indcancelacion = 1) and indinactivo = 0 ");
sb.append(" and (indimpresso = 1 or indcancelacion = 1) ");
sb.append(" and rmd_id = :rmdId ");
sb.append(" and empresa_id = :empresaId ");
sb.append(" and estado_id = :estadoId ");
@ -186,7 +186,7 @@ public class AidfHibernateDAO extends GenericHibernateDAO<Aidf, Long> implements
sb.append(" select max(folio) as ultimo ");
sb.append(" from folio_consumo_rmd ");
sb.append(" where activo = 1 ");
sb.append(" and (indimpresso = 1 or indcancelacion = 1) and indinactivo = 0 ");
sb.append(" and (indimpresso = 1 or indcancelacion = 1) ");
sb.append(" and rmd_id = :rmdId ");
sb.append(" and empresa_id = :empresaId ");
sb.append(" and estado_id = :estadoId ");

24
src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
View File

@ -3189,8 +3189,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
List<String> foliosRmd = new ArrayList<String>();
inativarFolioConsumoRmd(connection, empresaId, estado.getEstadoId(), aidf.getAidfId(), folioInicial, folioFinal,
isCancela, isInativa);
inativarFolioConsumoRmd(connection, empresaId, estado.getEstadoId(), aidf.getAidfId(), folioInicial, folioFinal);
for (DetalhadoRMD brp : buscarRegistroImpressaoBPR(connection, inicio, fim, empresaId, estado.getCveestado(), aidf.getAidfId(),
folioInicial, folioFinal, isBPR, isECF, true)) {
@ -3213,31 +3212,22 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO
}
boletos.add(boletoAgr);
// for (String folio : foliosRmd) {
// insereConsulmoFolioRMD(connection, inicio, empresaId, estado.getEstadoId(), aidf, folio,
// isCancela, isInativa, false, isECF, isBPR, null, null, null, null, null, null);
// }
for (String folio : foliosRmd) {
insereConsulmoFolioRMD(connection, inicio, empresaId, estado.getEstadoId(), aidf, folio,
isCancela, isInativa, false, isECF, isBPR, null, null, null, null, null, null);
}
marcarRMDCaja(connection, boletos, null, null);
}
private void inativarFolioConsumoRmd(Connection connection, Integer empresaId, Integer estadoId,
Long rmdId, String folioInicial, String folioFinal, boolean isCancela, boolean isInativa) {
Long rmdId, String folioInicial, String folioFinal) {
PreparedStatement pstmt = null;
try {
StringBuilder sb = new StringBuilder();
sb.append(" update folio_consumo_rmd ");
sb.append(" set fecmodif = sysdate ");
if (isCancela) {
sb.append(" ,indcancelacion = 1 ");
} else if (isInativa) {
sb.append(" ,indinactivo = 1, indimpresso = 0 ");
} else {
sb.append(" ,activo = 0 ");
}
sb.append(" set activo = 0, fecmodif = sysdate ");
sb.append(" where activo = 1 ");
sb.append(" and indimpresso = 1 ");
sb.append(" and rmd_id = ? ");