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

bug #6817 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@54703 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2016-04-06 21:06:24 +00:00
parent bdbc1ef286
commit 27dc65408d
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -344,7 +344,7 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<String, String> impl
sql.append(" INNER JOIN estado ed ON ed.estado_id = cd.estado_id ");
sql.append(" WHERE r4.datamov BETWEEN ? AND ? ");
sql.append(" AND b.marca_id = ? ");
sql.append(" AND b.motivocancelacion_id in (31, 32, 10) ");
sql.append(" AND b.motivocancelacion_id in (31, 32) ");
sql.append(" GROUP BY r4.numserie20, ");
sql.append(" r4.coo, ");
sql.append(" r4.datainicialemissao, ");
@ -422,7 +422,6 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<String, String> impl
sql.append(" INNER JOIN estado ed ON ed.estado_id = cd.estado_id ");
sql.append(" WHERE r4.datamov BETWEEN ? AND ? ");
sql.append(" AND b.marca_id = ? ");
sql.append(" AND r4.coo in (027319, 004172) ");
sql.append(" GROUP BY r4.numserie20, ");
sql.append(" r4.coo, ");
sql.append(" r4.datainicialemissao, ");
@ -494,7 +493,7 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<String, String> impl
item.setModeloImpressora(rset.getString("modeloImpressora"));
item.setNumCaixa(rset.getString("numCaixa"));
item.setStatus(rset.getString("status"));
if (isCancelados) {
item.setMotivocancelacion(rset.getInt("motivocancelacion"));
item.setValorMulta(rset.getBigDecimal("valorMulta"));
@ -523,9 +522,11 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<String, String> impl
}
List<ItemFiscalVO> itensFiscais = validaItensFiscais(fiscal, codProduto);
fiscal.setItensFiscais(itensFiscais);
list.add(fiscal);
if (fiscal != null) {
List<ItemFiscalVO> itensFiscais = validaItensFiscais(fiscal, codProduto);
fiscal.setItensFiscais(itensFiscais);
list.add(fiscal);
}
if (!getConexao().isClosed())
getConexao().close();

33
src/com/rjconsultores/ventaboletos/utilerias/ValidadorImportacaoEcf.java
View File

@ -4,36 +4,51 @@ import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.math.BigDecimal;
public class ValidadorImportacaoEcf {
public static void main(String[] args) {
BufferedReader br;
int linha = 1;
BigDecimal soma = BigDecimal.ZERO;
try {
br = new BufferedReader(new FileReader("c:\\Users\\Wilian\\Downloads\\fiscal_201604050547.txt"));
br = new BufferedReader(new FileReader("c:\\Users\\rjgw\\Downloads\\fiscal_cancel_201604060542.txt"));
try {
int linha = 1;
// int linha = 1;
String line = br.readLine();
Integer l1 = null;
Integer l2 = null;
try {
while (line != null) {
if(line.startsWith("1")) {
l1 = Integer.valueOf(line.substring(51, 65));
if (line.startsWith("1")) {
l1 = Integer.valueOf(line.substring(51, 65).trim());
System.out.println("Linha: " + linha + " -- " + "Valor: " + l1);
soma = soma.add(new BigDecimal(l1).divide(new BigDecimal(100)));
l2 = 0;
}
if(line.startsWith("2")) {
l2 += Integer.valueOf(line.substring(47, 62));
if (line.startsWith("2")) {
l2 += Integer.valueOf(line.substring(47, 62).trim());
}
line = br.readLine();
if(line.startsWith("1") && l1 != null && l2 != null) {
if(l1.compareTo(l2) != 0) {
if (line.startsWith("1") && l1 != null && l2 != null) {
if (l1.compareTo(l2) != 0) {
System.out.println("Linha: " + linha);
}
}
linha++;
}
} catch (NullPointerException e) {
}
System.out.println("Soma: " + soma);
} catch (IOException e) {
e.printStackTrace();
} catch (Exception e) {
System.out.println("Linha: " + linha);
e.printStackTrace();
} finally {
try {
br.close();
@ -44,5 +59,5 @@ public class ValidadorImportacaoEcf {
} catch (FileNotFoundException e) {
}
}
}