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

bug#11600 

dev: julio
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@84394 d1611594-4594-4d17-8e1d-87c2c4800839
master
julio 2018-08-20 13:31:21 +00:00
parent 16e1013a3f
commit 756409157a
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java
View File

@ -179,7 +179,10 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
String pICMS = null; String pICMS = null;
String vICMS = null; String vICMS = null;
String pRedBC = null; String pRedBC = null;
String vBP = null; // String vBP = null;
String vPgto = null;
String vIsenta = null;
if (StringUtils.isNotBlank(xml)) { if (StringUtils.isNotBlank(xml)) {
if (tbpe.getInfBPe().getImp().getICMS().getICMS00() != null) { if (tbpe.getInfBPe().getImp().getICMS().getICMS00() != null) {
@ -194,19 +197,17 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
} }
if (tbpe.getInfBPe().getInfValorBPe() != null) { if (tbpe.getInfBPe().getInfValorBPe() != null) {
vBP = tbpe.getInfBPe().getInfValorBPe().getVBP(); // vBP = tbpe.getInfBPe().getInfValorBPe().getVBP();
vPgto = tbpe.getInfBPe().getInfValorBPe().getVPgto();
for (TBPe.InfBPe.InfValorBPe.Comp comp : tbpe.getInfBPe().getInfValorBPe().getComp()) {
if (comp.getTpComp().equals("3"))
vIsenta = comp.getVComp();
}
} }
} }
// db.setPrecioBase(rset.getBigDecimal("PRECIOBASE")); BigDecimal valorContabil = StringUtils.isNotBlank(xml) && db.getTotalBilhete().floatValue() > 0 ? new BigDecimal(vPgto == null ? "0.0" : vPgto) : db.getTotalBilhete();
// db.setPrecioPagado(rset.getBigDecimal("PRECIOPAGADO"));
// db.setImporteoutros(rset.getBigDecimal("IMPORTEOUTROS"));
// db.setImportepedagio(rset.getBigDecimal("IMPORTEPEDAGIO"));
// db.setImporteseguro(rset.getBigDecimal("IMPORTESEGURO"));
// db.setImportetaxaembarque(rset.getBigDecimal("IMPORTETAXAEMBARQUE"));
// BigDecimal valorContabil = StringUtils.isNotBlank(xml) && db.getTotalBilhete().floatValue() > 0 ? new BigDecimal(vBP == null ? "0.0" : vBP) : db.getTotalBilhete();
BigDecimal valorContabil = new BigDecimal(vBC == null ? "0.0" : vBC);
db.setValorContabil(valorContabil); db.setValorContabil(valorContabil);
BigDecimal baseCalculoICMS = new BigDecimal(vBC == null ? "0.0" : vBC); BigDecimal baseCalculoICMS = new BigDecimal(vBC == null ? "0.0" : vBC);
@ -219,6 +220,8 @@ public class RelatorioDevolucaoBilhetes extends Relatorio {
BigDecimal outras = new BigDecimal(pRedBC == null ? "0.0" : pRedBC); BigDecimal outras = new BigDecimal(pRedBC == null ? "0.0" : pRedBC);
db.setValorOutras(outras); db.setValorOutras(outras);
db.setValorIsenta(StringUtils.isNotBlank(xml) && db.getTotalBilhete().floatValue() > 0 ? new BigDecimal(vIsenta == null ? "0.0" : vIsenta) : BigDecimal.ZERO);
db.setEstornoEstadual(BigDecimal.ZERO); db.setEstornoEstadual(BigDecimal.ZERO);
db.setEstornoMunicipal(BigDecimal.ZERO); db.setEstornoMunicipal(BigDecimal.ZERO);