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

fixes bug #7439 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@56482 d1611594-4594-4d17-8e1d-87c2c4800839
master
lucas.taia 2016-05-30 22:39:28 +00:00
parent 91b0a716cf
commit 0f16bac20d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/rjconsultores/ventaboletos/service/impl/AidfServiceImpl.java
View File

@ -100,14 +100,14 @@ public class AidfServiceImpl implements AidfService {
List<AidfVo> list = obtenerAidfFromSerieDocfiscal(entidad.getSerie() , entidad.getDocfiscal().replaceAll("[^a-zA-Z0-9]+","") , conn);
for (AidfVo e : list) {
for (AidfVo aidf : list) {
// desconsiderar o próprio ID, caso contrário o erro de validação sempre acontece qdo o registro é editado.
if (e.getAidfId() != entidad.getAidfId()) {
if (e.getDocfiscal().trim().equals(entidad.getDocfiscal().replaceAll("[^a-zA-Z0-9]+", "").trim())) {
if (e.getSerie().trim().equals(entidad.getSerie().trim())) {
if ((Long.parseLong(entidad.getForminicial()) >= Long.parseLong(e.getForminicial()) && Long.parseLong(entidad.getForminicial()) <= Long.parseLong(e.getFormfinal()))
|| (Long.parseLong(entidad.getFormfinal()) >= Long.parseLong(e.getForminicial()) && Long.parseLong(entidad.getFormfinal()) <= Long.parseLong(e.getFormfinal()))) {
return e.getAidfId();
if (aidf.getAidfId().compareTo(entidad.getAidfId()) != 0) {
if (aidf.getDocfiscal().trim().equals(entidad.getDocfiscal().replaceAll("[^a-zA-Z0-9]+", "").trim())) {
if (aidf.getSerie().trim().equals(entidad.getSerie().trim())) {
if ((Long.parseLong(entidad.getForminicial()) >= Long.parseLong(aidf.getForminicial()) && Long.parseLong(entidad.getForminicial()) <= Long.parseLong(aidf.getFormfinal()))
|| (Long.parseLong(entidad.getFormfinal()) >= Long.parseLong(aidf.getForminicial()) && Long.parseLong(entidad.getFormfinal()) <= Long.parseLong(aidf.getFormfinal()))) {
return aidf.getAidfId();
}
}
}