diff --git a/pom.xml b/pom.xml index c9f63ff0d..70051c14c 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.com.rjconsultores ModelWeb - 1.43.0 + 1.43.1 diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java index 919845d15..3ebfc22e6 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java @@ -1,4 +1,4 @@ -package com.rjconsultores.ventaboletos.dao.hibernate; + package com.rjconsultores.ventaboletos.dao.hibernate; import java.sql.Connection; import java.sql.PreparedStatement; @@ -70,7 +70,7 @@ public class AidfHibernateDAO extends GenericHibernateDAO implements sb.append(" x.TIPOVALIDAVENTA "); sb.append(" from AIDF x where x.SERIE = '" + serie + "' "); - if( !subSerie.equals("") ) { + if( subSerie !=null && !subSerie.equals("") ) { sb.append(" AND x.SUBSERIE = '" + subSerie + "' "); } diff --git a/src/com/rjconsultores/ventaboletos/entidad/Aidf.java b/src/com/rjconsultores/ventaboletos/entidad/Aidf.java index b4a78939a..60510dc89 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Aidf.java +++ b/src/com/rjconsultores/ventaboletos/entidad/Aidf.java @@ -189,7 +189,7 @@ public class Aidf implements java.io.Serializable { } public String getSubserie() { - return subserie; + return subserie==null?"":subserie; } public void setSubserie(String subserie) { diff --git a/src/com/rjconsultores/ventaboletos/service/impl/AidfServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/AidfServiceImpl.java index 0b8b48a38..c0b2ac9dc 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/AidfServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/AidfServiceImpl.java @@ -104,7 +104,7 @@ public class AidfServiceImpl implements AidfService { public Long validarDocFiscalSerieFormInicialFinal(Aidf entidad, Connection conn) { List list = obtenerAidfFromSerieDocfiscal( - entidad.getSerie(), null, entidad.getDocfiscal().replaceAll("[^a-zA-Z0-9]+", ""), conn); + entidad.getSerie(), entidad.getSubserie(), entidad.getDocfiscal().replaceAll("[^a-zA-Z0-9]+", ""), conn); for (AidfVo aidf : list) { // desconsiderar o próprio ID, caso contrário o erro de validação sempre acontece qdo o registro é editado. diff --git a/src/com/rjconsultores/ventaboletos/vo/aidf/AidfVo.java b/src/com/rjconsultores/ventaboletos/vo/aidf/AidfVo.java index e9a6e7e4d..9409c01ca 100644 --- a/src/com/rjconsultores/ventaboletos/vo/aidf/AidfVo.java +++ b/src/com/rjconsultores/ventaboletos/vo/aidf/AidfVo.java @@ -68,7 +68,7 @@ public class AidfVo { this.serie = serie; } public String getSubserie() { - return subserie; + return subserie==null?"":subserie; } public void setSubserie(String subserie) { this.subserie = subserie;