From 0fed3d14834f3e7dd1aa43213ee0973f7e6bb1f2 Mon Sep 17 00:00:00 2001
From: julio <julio@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 12 Jan 2018 19:54:39 +0000
Subject: [PATCH] fixes bug #10474

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@78000 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../dao/hibernate/AidfHibernateDAO.java       |  4 ++--
 .../dao/hibernate/FiscalHibernateDAO.java     | 24 ++++++-------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java
index e7fb4b721..d24fef681 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java
@@ -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 ");
diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
index 6470d9c95..86475b0a2 100644
--- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
+++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
@@ -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 = ? ");