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

fixes bug #6817 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@50880 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2015-12-03 12:41:31 +00:00
parent c4db428de8
commit ade88b31b4
4 changed files with 74 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,9 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<String, String> impl
sql.append(" to_char(b.fechorventa, 'yyyyMMdd') as dataEmissao, ");
sql.append(" b.preciopagado as valorTotal, ");
sql.append(" co.codibge as origenId, ");
sql.append(" eo.cveestado as origenUf, ");
sql.append(" cd.codibge as destinoId, ");
sql.append(" ed.cveestado as destinoUf, ");
sql.append(" r5.totparcial as repTributado, ");
sql.append(" b.preciopagado as valorItem, ");
sql.append(" r5.tipopassagem as tipoPassagem, ");
@ -117,7 +119,9 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<String, String> impl
sql.append(" b.importeseguro, ");
sql.append(" fi.numserie, ");
sql.append(" fi.modelo, ");
sql.append(" r4.usuario_id ");
sql.append(" r4.usuario_id, ");
sql.append(" eo.cveestado, ");
sql.append(" ed.cveestado ");
Query query = getSession().createSQLQuery(sql.toString())
.addScalar("numImpressora", StringType.INSTANCE)
@ -147,7 +151,9 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<String, String> impl
.addScalar("aidf", StringType.INSTANCE)
.addScalar("numpdv", StringType.INSTANCE)
.addScalar("modeloImpressora", StringType.INSTANCE)
.addScalar("numCaixa", StringType.INSTANCE);
.addScalar("numCaixa", StringType.INSTANCE)
.addScalar("origenUf", StringType.INSTANCE)
.addScalar("destinoUf", StringType.INSTANCE);
query.setResultTransformer(new AliasToBeanResultTransformer(ImportacionManualFiscalVO.class));
query.setInteger("empresaId", empresaId);
@ -258,7 +264,9 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<String, String> impl
sql.append(" b.boleto_id as boletoId, ");
sql.append(" b.marca_id as empresaId, ");
sql.append(" co.codibge as origenId, ");
sql.append(" eo.cveestado as origenUf, ");
sql.append(" cd.codibge as destinoId, ");
sql.append(" ed.cveestado as destinoUf, ");
sql.append(" fi.numcnpj as cnpjImpressora, ");
sql.append(" fi.numserie as numpdv, ");
sql.append(" r5.totparcial as repTributado, ");
@ -273,13 +281,16 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<String, String> impl
sql.append(" AND r4.datamov = r5.datamov AND r4.contador = r5.contador ");
sql.append(" INNER JOIN fiscal_impressora fi ON fi.numserie20 = r4.numserie20 ");
sql.append(" AND fi.fiscalimpressora_id = r5.fiscalimpressora_id ");
sql.append(" INNER JOIN boleto b ON b.boleto_id = r4.boleto_id AND r4.empresa_id = b.marca_id ");
sql.append(" INNER JOIN boleto b ON b.boleto_id = r4.boleto_id ");
// sql.append(" INNER JOIN boleto b ON b.boleto_id = r4.boleto_id AND r4.empresa_id = b.marca_id ");
sql.append(" LEFT JOIN alias_servico ase ON ase.origen_id = b.origen_id ");
sql.append(" and ase.destino_id = b.destino_id and ase.ruta_id = b.ruta_id ");
sql.append(" INNER JOIN parada o ON coalesce(ase.aliasorigen_id, b.origen_id) = o.parada_id ");
sql.append(" INNER JOIN ciudad co ON o.ciudad_id = co.ciudad_id ");
sql.append(" INNER JOIN estado eo ON eo.estado_id = co.estado_id ");
sql.append(" INNER JOIN parada d ON coalesce(ase.aliasdestino_id, b.destino_id) = d.parada_id ");
sql.append(" INNER JOIN ciudad cd ON d.ciudad_id = cd.ciudad_id ");
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(" GROUP BY r4.numserie20, ");
@ -300,7 +311,9 @@ public class FiscalHibernateDAO extends GenericHibernateDAO<String, String> impl
sql.append(" r5.numitem, ");
sql.append(" r5.codproduto, ");
sql.append(" fi.modelo, ");
sql.append(" r4.usuario_id ");
sql.append(" r4.usuario_id, ");
sql.append(" eo.cveestado, ");
sql.append(" ed.cveestado ");
sql.append(" ORDER BY r4.numserie20, ");
sql.append(" r4.coo, ");
sql.append(" r4.datainicialemissao ");

27
src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java
View File

@ -107,6 +107,7 @@ public class FiscalServiceImpl implements FiscalService {
String totalICMSIsento = StringHelper.preencherZeroEsquerda(null, 14);
String totalICMSNaotributado = StringHelper.preencherZeroEsquerda(null, 14);
String origenUf = StringHelper.preencherStringEspacoEsquerda(imf.getOrigenUf(), 2);
String origen = imf.getOrigenId().toString();
if (origen.length() > 2) {
origen = origen.substring(2);
@ -115,6 +116,7 @@ public class FiscalServiceImpl implements FiscalService {
origen = StringHelper.preencherStringEspacoEsquerda(origen, 5);
}
String destinoUf = StringHelper.preencherStringEspacoEsquerda(imf.getDestinoUf(), 2);
String destino = imf.getDestinoId().toString();
if (destino.length() > 2) {
destino = destino.substring(2);
@ -125,15 +127,16 @@ public class FiscalServiceImpl implements FiscalService {
String subSerie = StringHelper.preencherStringEspacoEsquerda(imf.getSubSerie(), 2);
String aidf = StringHelper.preencherStringEspacoEsquerda(imf.getAidf(), 30);
String brancos175 = StringHelper.preencherStringEspacoEsquerda(null, 175);
String brancos171 = StringHelper.preencherStringEspacoEsquerda(null, 171);
seq++;
sequencial = StringHelper.preencherZeroEsquerda(seq.toString(), 6);
String header = headerDocumentoFiscal("1", data, cnpjFilial, coo, serie, especie, codigoCliente,
filialCliente, condicaoPagamento, valorTotalDocumanto, valorItens, baseCalICMS, valorTotalICMS,
valorPIS, valorCofins, valorCSLL, totalICMSIsento, totalICMSNaotributado, origen, destino, subSerie,
aidf, brancos175, sequencial);
valorPIS, valorCofins, valorCSLL, totalICMSIsento, totalICMSNaotributado, origenUf, origen,
destinoUf, destino, subSerie,
aidf, brancos171, sequencial);
gravarArq.println(header);
for (String itemDoc : montarItensFiscaisManual(imf, imf.getItens(), seq)) {
@ -436,7 +439,9 @@ public class FiscalServiceImpl implements FiscalService {
item.setCnpjCliente(rset.getString("cnpjCliente"));
item.setCnpjImpressora(rset.getString("cnpjImpressora"));
item.setOrigenId(rset.getInt("origenId"));
item.setOrigenUf(rset.getString("origenUf"));
item.setDestinoId(rset.getInt("destinoId"));
item.setDestinoUf(rset.getString("destinoUf"));
item.setNumpdv(rset.getString("numpdv"));
item.setValorTotal(rset.getBigDecimal("valorTotal"));
item.setNumItem(rset.getString("numItem"));
@ -473,7 +478,7 @@ public class FiscalServiceImpl implements FiscalService {
fiscal.getItensFiscais().add(item);
String data = fiscal.getDataEmissao();
String brancos207 = StringHelper.preencherStringEspacoEsquerda(null, 207);
String brancos203 = StringHelper.preencherStringEspacoEsquerda(null, 203);
String serie = StringHelper.preencherStringEspacoEsquerda(null, 3);
String especie = StringHelper.preencherStringEspacoDireita("CF", 5);
@ -498,6 +503,7 @@ public class FiscalServiceImpl implements FiscalService {
String totalICMSIsento = aliquotaBaseCalculo.get("totalICMSIsento");
String totalICMSNaotributado = aliquotaBaseCalculo.get("totalICMSNaotributado");
String origenUf = StringHelper.preencherStringEspacoEsquerda(fiscal.getOrigenUf(), 2);
String origen = fiscal.getOrigenId().toString();
if (origen.length() > 2) {
origen = origen.substring(2);
@ -506,6 +512,7 @@ public class FiscalServiceImpl implements FiscalService {
origen = StringHelper.preencherStringEspacoEsquerda(origen, 5);
}
String destinoUf = StringHelper.preencherStringEspacoEsquerda(fiscal.getDestinoUf(), 2);
String destino = fiscal.getDestinoId().toString();
if (destino.length() > 2) {
destino = destino.substring(2);
@ -524,8 +531,9 @@ public class FiscalServiceImpl implements FiscalService {
header = headerDocumentoFiscal("1", data, cnpjFilial, coo, serie, especie, codigoCliente,
filialCliente, condicaoPagamento, valorTotalDocumanto, valorItens, aliquota, imposto,
valorPIS, valorCofins, valorCSLL, totalICMSIsento, totalICMSNaotributado, origen, destino, null,
null, brancos207, seqHeader);
valorPIS, valorCofins, valorCSLL, totalICMSIsento, totalICMSNaotributado, origenUf, origen,
destinoUf, destino, null,
null, brancos203, seqHeader);
/*
* Item da importacion Fiscal ECF
@ -813,8 +821,9 @@ public class FiscalServiceImpl implements FiscalService {
private String headerDocumentoFiscal(String identificador, String data, String cnpjImpressora, String coo,
String serie, String especie, String codigoCliente, String filialCliente, String condicaoPagamento,
String valorTotalDocumanto, String valorItens, String aliquota, String imposto, String valorPIS,
String valorCofins, String valorCSLL, String totalICMSIsento, String totalICMSNaotributado, String origen,
String destino, String subSerie, String aidf, String brancos, String sequencial) {
String valorCofins, String valorCSLL, String totalICMSIsento, String totalICMSNaotributado, String origenUf,
String origen, String destinoUf, String destino, String subSerie, String aidf, String brancos,
String sequencial) {
StringBuilder header = new StringBuilder();
header.append(identificador);
@ -835,7 +844,9 @@ public class FiscalServiceImpl implements FiscalService {
header.append(valorCSLL);
header.append(totalICMSIsento);
header.append(totalICMSNaotributado);
header.append(origenUf);
header.append(origen);
header.append(destinoUf);
header.append(destino);
header.append(subSerie == null ? "" : subSerie);
header.append(aidf == null ? "" : aidf);

18
src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionFiscalVO.java
View File

@ -15,7 +15,9 @@ public class ImportacionFiscalVO {
private String cnpjImpressora;
private BigDecimal valorTotal;
private Integer origenId;
private String origenUf;
private Integer destinoId;
private String destinoUf;
private String numpdv;
private String modeloImpressora;
private String numCaixa;
@ -174,4 +176,20 @@ public class ImportacionFiscalVO {
this.modeloImpressora = modeloImpressora;
}
public String getOrigenUf() {
return origenUf;
}
public void setOrigenUf(String origenUf) {
this.origenUf = origenUf;
}
public String getDestinoUf() {
return destinoUf;
}
public void setDestinoUf(String destinoUf) {
this.destinoUf = destinoUf;
}
}

19
src/com/rjconsultores/ventaboletos/vo/impressaofiscal/ImportacionManualFiscalVO.java
View File

@ -13,7 +13,9 @@ public class ImportacionManualFiscalVO {
private String dataEmissao;
private BigDecimal valorTotal;
private Integer origenId;
private String origenUf;
private Integer destinoId;
private String destinoUf;
private String repTributado;
private BigDecimal valorItem;
private String tipoPassagem;
@ -30,7 +32,6 @@ public class ImportacionManualFiscalVO {
private BigDecimal importeseguro;
private String subSerie;
private String aidf;
private String numpdv;
private String modeloImpressora;
private String numCaixa;
@ -269,4 +270,20 @@ public class ImportacionManualFiscalVO {
this.numCaixa = numCaixa;
}
public String getOrigenUf() {
return origenUf;
}
public void setOrigenUf(String origenUf) {
this.origenUf = origenUf;
}
public String getDestinoUf() {
return destinoUf;
}
public void setDestinoUf(String destinoUf) {
this.destinoUf = destinoUf;
}
}