From 63d53eea4db469bbabdc435d1684ca5a1a68004c Mon Sep 17 00:00:00 2001 From: julio Date: Thu, 25 Oct 2018 17:30:56 +0000 Subject: [PATCH] fixes bug#12397 dev: wallace qua: renato git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@86485 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioDocumentosFiscais.java | 56 ++++++++++-------- .../RelatorioDocumentosFiscais.jasper | Bin 46766 -> 46706 bytes .../RelatorioDocumentosFiscais.jrxml | 56 ++++++++++-------- 3 files changed, 62 insertions(+), 50 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDocumentosFiscais.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDocumentosFiscais.java index 86264450b..aa9f34a66 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDocumentosFiscais.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDocumentosFiscais.java @@ -76,9 +76,7 @@ public class RelatorioDocumentosFiscais extends Relatorio { bean.setFormInicial((String) rset.getObject("formInicial")); bean.setFormFinal((String) rset.getObject("formFinal")); bean.setSerie((String) rset.getObject("serie")); - // datamov - // bean.setSubSerie((String) rset.getObject("subSerie")); - + bean.setSubSerie((String) rset.getObject("subSerie")); bean.setValorContabil((BigDecimal) rset.getObject("valorContabil")); bean.setValorBaseCalculo((BigDecimal) rset.getObject("valorBaseCalculo")); bean.setValorAliquiotaICMS((BigDecimal) rset.getObject("valorAliquiotaICMS")); @@ -86,6 +84,7 @@ public class RelatorioDocumentosFiscais extends Relatorio { bean.setOutras((BigDecimal) rset.getObject("outras")); bean.setValorCancelado((BigDecimal) rset.getObject("valorCancelado")); bean.setNomeEstado((String) rset.getObject("nomeEstado")); + bean.setIsentas((BigDecimal) rset.getObject("isentas")); lsDadosRelatorio.add(bean); } @@ -99,14 +98,14 @@ public class RelatorioDocumentosFiscais extends Relatorio { bean.setValorAliquiotaICMS(bean.getValorAliquiotaICMS().setScale(2, RoundingMode.HALF_EVEN)); bean.setValorICMS(bean.getValorICMS().setScale(2, RoundingMode.HALF_EVEN)); bean.setOutras(bean.getOutras().setScale(2, RoundingMode.HALF_EVEN)); - // bean.setIsentas(bean.getIsentas().setScale(2, RoundingMode.HALF_EVEN)); + bean.setIsentas(bean.getIsentas().setScale(2, RoundingMode.HALF_EVEN)); bean.setValorCancelado(bean.getValorCancelado().setScale(2, RoundingMode.HALF_EVEN)); totalValorContabil = totalValorContabil.add(bean.getValorContabil() != null ? bean.getValorContabil() : BigDecimal.ZERO); totalValorBaseCalculo = totalValorBaseCalculo.add(bean.getValorBaseCalculo() != null ? bean.getValorBaseCalculo() : BigDecimal.ZERO); totalValorAliquiotaICMS = totalValorAliquiotaICMS.add(bean.getValorAliquiotaICMS() != null ? bean.getValorAliquiotaICMS() : BigDecimal.ZERO); totalValorICMS = totalValorICMS.add(bean.getValorICMS() != null ? bean.getValorICMS() : BigDecimal.ZERO); - // totalValorIsentas = totalValorIsentas.add(bean.getIsentas() != null ? bean.getIsentas() : BigDecimal.ZERO); + totalValorIsentas = totalValorIsentas.add(bean.getIsentas() != null ? bean.getIsentas() : BigDecimal.ZERO); totalValorOutras = totalValorOutras.add(bean.getOutras() != null ? bean.getOutras() : BigDecimal.ZERO); totalValorCancelado = totalValorCancelado.add(bean.getValorCancelado() != null ? bean.getValorCancelado() : BigDecimal.ZERO); } @@ -136,39 +135,43 @@ public class RelatorioDocumentosFiscais extends Relatorio { StringBuilder sql = new StringBuilder(); sql.append("SELECT "); - // sql.append(" tabela.datamov, "); sql.append(" coalesce(tabela.numAidf, '') AS numAidf, "); - sql.append(" min(tabela.folio) AS formInicial, "); - sql.append(" max(tabela.folio) AS formFinal, "); + sql.append(" tabela.forminicial AS formInicial, "); + sql.append(" tabela.formfinal AS formFinal, "); sql.append(" tabela.serie AS serie, "); + sql.append(" tabela.subserie AS subSerie, "); sql.append(" tabela.nomeEstado AS nomeEstado, "); sql.append(" coalesce(sum(tabela.valorContabil),0) AS valorContabil, "); sql.append(" sum(valorBaseCalculo) AS valorBaseCalculo, "); sql.append(" tabela.valorAliquiotaICMS AS valorAliquiotaICMS, "); sql.append(" sum(tabela.valorICMS) AS valorICMS, "); - sql.append(" coalesce(sum(tabela.valorCancelado),0) AS valorCancelado, "); - sql.append(" sum(tabela.outras) AS outras "); + sql.append(" sum(tabela.qntancelados) AS valorCancelado, "); + sql.append(" sum(tabela.outras) AS outras, "); + sql.append(" sum(tabela.vlrisento) AS isentas "); sql.append("FROM "); sql.append(" (SELECT DISTINCT "); sql.append(" c.caja_id, "); - // sql.append(" TRUNC(c.feccreacion) as datamov, "); sql.append(" a.ACFISCAL AS numAidf, "); - sql.append(" c.NUMFOLIOPREIMPRESO as folio, "); - sql.append(" c.NUMSERIEPREIMPRESA as serie, "); + sql.append(" a.forminicial, "); + sql.append(" a.formfinal, "); + sql.append(" a.serie AS serie, "); + sql.append(" a.subserie AS subserie, "); sql.append(" c.MOTIVOCANCELACION_ID AS motivoCancelacion, "); sql.append(" c.PRECIOBASE AS tarifa, "); - sql.append(" ei.ICMS AS valorAliquiotaICMS, "); + sql.append(" ei.TRIBUTACAOIMPORTACAO AS valorAliquiotaICMS, "); + sql.append(" CASE WHEN c.MOTIVOCANCELACION_ID IS NOT NULL THEN 1 ELSE 0 END AS qntancelados, "); sql.append(" CASE WHEN c.MOTIVOCANCELACION_ID IS NULL THEN c.PRECIOPAGADO ELSE 0 END AS valorContabil, "); sql.append(" CASE WHEN c.MOTIVOCANCELACION_ID IS NOT NULL THEN c.PRECIOPAGADO ELSE 0 END AS valorCancelado, "); sql.append(" (coalesce(ei.PORCREDBASEICMS, 0) / 100.0) AS redBaseCalcIcms, "); sql.append(" CASE WHEN c.MOTIVOCANCELACION_ID IS NULL THEN c.PRECIOPAGADO - (c.PRECIOPAGADO * (coalesce(ei.PORCREDBASEICMS, 0) / 100.0) ) ELSE 0 END AS valorBaseCalculo, "); - sql.append(" CASE WHEN c.MOTIVOCANCELACION_ID IS NULL THEN ((c.PRECIOPAGADO - (c.PRECIOPAGADO * (coalesce(ei.PORCREDBASEICMS, 0) / 100.0) )) * ed.ICMS) / 100 ELSE 0 END AS valorICMS, "); + sql.append(" CASE WHEN c.MOTIVOCANCELACION_ID IS NULL THEN ((c.PRECIOPAGADO - (c.PRECIOPAGADO * (coalesce(ei.PORCREDBASEICMS, 0) / 100.0) )) * ei.TRIBUTACAOIMPORTACAO) / 100 ELSE 0 END AS valorICMS, "); sql.append(" CASE WHEN c.MOTIVOCANCELACION_ID IS NULL THEN c.PRECIOPAGADO - (c.PRECIOPAGADO - (c.PRECIOPAGADO * (coalesce(ei.PORCREDBASEICMS, 0) / 100.0) )) ELSE 0 END AS outras, "); sql.append(" coalesce(eos.estado_id, eo.estado_id) AS estadoId, "); sql.append(" coalesce(eos.NOMBESTADO, eo.NOMBESTADO) AS nomeEstado, "); sql.append(" coalesce(pos.DESCPARADA, po.DESCPARADA) AS origem, "); sql.append(" coalesce(pds.DESCPARADA, pd.DESCPARADA) AS destino, "); - sql.append(" CASE WHEN((coalesce(eos.cveestado, eo.cveestado)) = (coalesce(eds.cveestado, ed.cveestado))) THEN 0 ELSE 1 END AS isInterEstadual "); + sql.append(" CASE WHEN((coalesce(eos.cveestado, eo.cveestado)) = (coalesce(eds.cveestado, ed.cveestado))) THEN 0 ELSE 1 END AS isInterEstadual, "); + sql.append(" COALESCE((IMPORTETAXAEMBARQUE + IMPORTEPEDAGIO + IMPORTESEGURO),0) AS vlrisento "); sql.append(" FROM caja c "); sql.append(" INNER JOIN aidf a ON a.aidf_id = c.aidf_id "); sql.append(" JOIN marca m ON c.marca_id = m.marca_id "); @@ -197,8 +200,10 @@ public class RelatorioDocumentosFiscais extends Relatorio { sql.append(" )tabela "); sql.append(tipoLinha.equals("INTERMUNICIPAL") ? " where tabela.isInterEstadual = 1" : tipoLinha.equals("INTERESTADUAL") ? " where tabela.isInterEstadual = 0" : " "); sql.append("GROUP BY tabela.numAidf, "); - // sql.append(" tabela.datamov, "); sql.append(" tabela.serie, "); + sql.append(" tabela.subserie, "); + sql.append(" tabela.forminicial, "); + sql.append(" tabela.formfinal, "); sql.append(" tabela.nomeEstado, "); sql.append(" tabela.valorAliquiotaICMS "); sql.append("ORDER BY tabela.nomeEstado, tabela.numAidf "); @@ -210,26 +215,27 @@ public class RelatorioDocumentosFiscais extends Relatorio { StringBuilder sql = new StringBuilder(); sql.append("SELECT tabela.docfiscal AS numAidf, "); - // sql.append(" tabela.datamov, "); sql.append(" tabela.forminicial AS formInicial, "); sql.append(" tabela.formfinal AS formFinal, "); sql.append(" tabela.serie AS serie, "); + sql.append(" tabela.subserie AS subSerie, "); sql.append(" tabela.nomeEstado AS nomeEstado, "); sql.append(" coalesce(sum(tabela.valorContabil),0) AS valorContabil, "); sql.append(" sum(valorBaseCalculo) AS valorBaseCalculo, "); sql.append(" tabela.valorAliquiotaICMS AS valorAliquiotaICMS, "); sql.append(" sum(tabela.valorICMS) AS valorICMS, "); sql.append(" coalesce(sum(tabela.valorCancelado),0) AS valorCancelado, "); - sql.append(" sum(tabela.outras) AS outras "); + sql.append(" sum(tabela.outras) AS outras, "); + sql.append(" sum(tabela.vlrisento) AS isentas "); sql.append("FROM "); sql.append(" (SELECT DISTINCT "); sql.append(" aidf.DOCFISCAL, "); sql.append(" aidf.forminicial, "); sql.append(" aidf.formfinal, "); sql.append(" coalesce(cdv.NUMSERIEPREIMPRESA, 'X') AS numAidf, "); + sql.append(" aidf.serie AS serie, "); + sql.append(" aidf.subserie AS subserie, "); sql.append(" coalesce(cdv.NUMFOLIOPREIMPRESO, '0') AS folio, "); - sql.append(" coalesce(cdv.NUMSERIEPREIMPRESA, 'X') AS serie, "); - // sql.append(" trunc(ee.fechoringreso) as datamov, "); sql.append(" case when cdv.precio < 0 then 31 else null end AS motivoCancelacion, "); sql.append(" cdv.precio AS tarifa, "); sql.append(" cdv.precio as valor, "); @@ -244,7 +250,8 @@ public class RelatorioDocumentosFiscais extends Relatorio { sql.append(" es.NOMBESTADO AS nomeEstado, "); sql.append(" '' AS origem, "); sql.append(" '' AS destino, "); - sql.append(" 0 AS isInterEstadual "); + sql.append(" 0 AS isInterEstadual, "); + sql.append(" 0 AS vlrisento "); sql.append("from evento_extra ee "); sql.append(" join caja_diversos cdv on cdv.eventoextra_id = ee.eventoextra_id "); sql.append(" join aidf aidf on aidf.serie = cdv.numseriepreimpresa and cdv.numfoliopreimpreso between aidf.forminicial and aidf.formfinal "); @@ -261,8 +268,9 @@ public class RelatorioDocumentosFiscais extends Relatorio { // sql.append(somenteCancelado == true ? " AND c.INDCANCELACION = 1" : " "); sql.append(" )tabela "); // sql.append(tipoLinha.equals("INTERMUNICIPAL") ? " where tabela.isInterEstadual = 1" : tipoLinha.equals("INTERESTADUAL") ? " where tabela.isInterEstadual = 0" : " "); - sql.append("GROUP BY tabela.serie, "); - // sql.append(" tabela.datamov, "); + sql.append("GROUP BY tabela.numAidf, "); + sql.append(" tabela.serie, "); + sql.append(" tabela.subSerie, "); sql.append(" tabela.nomeEstado, "); sql.append(" tabela.valorAliquiotaICMS, "); sql.append(" tabela.docfiscal, "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDocumentosFiscais.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDocumentosFiscais.jasper index 453cb4be07169b106d6ddc0eedacf590488be917..79e6f61756b686d8a3f2da2c3ad8778625272f45 100644 GIT binary patch delta 10098 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 bs2xVoUk3CRQ^AcF~@ z)e6Q#txynDlnR1MFucSIdO`42TB&Kl$CWDuD^`#SEf2l>e@rrArfc21)?M6n*J@n* z_uK#8|Ng%7&-wQ`Gy2^*-2M%|y0=~EbVL7z@xL+KFsQEagLWgab4YEaVZ5CqqEK0B z#mpFF#RWfSYn=|ZGM!=VJ1sCd!`^s3xLZ5OZ?t#5=T@*=jtSw7^|4r= zyXLx`)z*c$Ay(zsPS&?$7TW6O8B0J8ORdPb(01XS~&JWTZ335hgGt!@&nXW0a;f=QP&H(?kcVuYrPtOz_vlu zl*4*iQ~3dEs(`Gip{VJFTywpwdHcAxY}-UlIc$|Rl^>v{3douoike=?HMh!|o5mlq zy&-DKVXv&I`~WpoK-Sby)bv8Gx!1ao@SW{lQBMv>WIg2vsHXz5o`#~H7jnHLQscVB zk=Ad=hcq@PR+v4$taKZ;dn>BSQ|6WwmN?7ACl6<=8Iya5iBJa-N-mk}8?cK&yJ}Ze ziK{g`R7?g}*A!&8oxerQcbe}ktEft>;M=dD#7hx7r9XUWjZNvvbd39m#BMS%p{!(H zO-Y5@nUa{6ttmJ|36dFY16{?^po$uIm9x4vy{DM%teBm13teT-qKejNcM%PlTT$*x zs&=Cc3KKC3C&yS~jb&qUgposu~CUmUI&eyoa(ySg*$F zsWre`@?mC_WlIZ%XscgZRIf9940#_*o%5a1HSUtK=rm`gyaO=Wnvr%Z=Pykg%enj0 zBHF9m!4^3BSXa}!@@%K{zML^My&vP$^gfJBd5pFmN$=;A-Pd|Q-OjV0%8aY&KN}ql z+;f;VD=EW~l`}ilk(iL0BxymB*jojqRunqRTwYBT4x!0%4B&dZ9fI*=M_2y?$Qqx~ElM+mYNo{0gzRkQOPH9HrTHv(Mr4pmvt~WnyS;b%&5WU3_v?&E z=IE3;n(?Ge!RN~CAEB$-vW5EOl%&*&+1_OvG9$X{a8PneYECQ9hnaDaI?_$cnU<23 zlbev5GTk>T%1X`>AJ6nGLA^LjZ0Opofs7AiMf8jYLu_5h#Dts#rcO^t^)hpmnPoI6 zCnYC0)!~ht%kJGnN7^T)Wn?8~C-{W8{JiW?F5f0CJ0mGE#rv6vPz!TTN`_;0YD)U# z8;W$u5qe{%^h3UPQga4|i;t2|J#LU>s1-z5t9~BQL-XH|VSSR*CoIr1>)68Z?&@B? zammcwe)b!eSkL4}MYf&f8%wM=BKUC@EFWsN#*4X+L+LKw%t~jmYqHB(jsj2fGDxLW7iVMHaNcXA47zt6B9SRQS9BsFmILV^y&#fkZ{S6p&1Aa0F2pQJP z1yk({`PK;%(hR$xQp}NsePNI_zHoqTq?nY$aLKQH$*-Z{S1 zkGPTl(IUbBQcpE{)UY;d1F@+cKd>4i8B+%9m<16lxRCe+ybWRTj7%L?Ihm5X{)4>aGRvjkZJlU7=T9S%o`q#T%hZ1vDVni znX+_*wX<@nZJ($thdr{q@@07qMR^4Sl-D`3{2p0;_dHQvbmEw*zECe4(NRGnhj%22 z@+FCeVyhGkK%xVFTlEfq@UhmQ>MVUdR`n#?$AU@@$0e2WC6$KadK3&mrE}!<9GBN) zxyAKdaOc~;6s6^GN|si>EUlrq3Izj{)&ak(I3=&*dQGn0w(|MjZTn6T%Hg~uRK6tC zP!K8@fKUhg2+vEx!UfaxwjEzEr6c_)xa4qMaw%VOX(;wh!2n!3NABBoxo>~0-3}qv zg$Ki}XC4UE&*t|Z=xr@7i^?;*F`F9fs#vMd^H)bz!1t?pn?Sk$3hUrQp*>Y;zG$`H z`|vjHR>Q&-VRN`w5u4G{uguPT%z9bLi~8`*I_uUUd1ikhP7Zwoh*Qx3;(P;b#HoM~ z7o?%sCbO^nikh-`hTfb5i}mJ23w}8a4ZyFW0r-6bZTM9{ZjR3J+nk}Y>Fjv0L~FTo ziPkb!XpzI109sTufEM3C8!ajzwdfo_En}pX!JhlImhB#`Ws1-uhsgo7sAvE!zJWGc zR6uIcIeuCuOD!9hP7j;FZ^q|tym7e8*c?Pe=AGb^k3gYT_eSWm$BddAHCi zhiL({s%QYMzJWGcRX}RhIeuEFNv#oeVIaTISPoCDb!Dmd=nZ~I@8Z2enH-7&C{xh@ z%6tQDl&OGJrgQw16-j05>cgz)x+!5v{IlP+06S^DSf?erg+w`21(2ws0VMhc+DKFZ zDN*P6Nvx7R@r5~Et!?##tQnq8tv@?PT6325>JlQqa-@i+!`j2FN0;^H9|FZ=?%*=< zzIm{2@U&$@w;bvM=vL7Hx_tv}bgO{Wt#kZz*U7Ejwfuaqv#Cb6A}9aq>2fDllvkFN zxhAs5ir}pE){22qZ;Tr+Hr?pBAecwHfVJY9uq9x1csR22nRkEK`zFVt;W;pdS)(5A z(>-S7Ph&?7kBJ>UeAMhaV@HpO8`0hXD|7Xr##IkLPS&u;qPp5EomI|qm)lh}J1ILS zVWOka@z~PfsP6h#g=9xoS_1zrk&u|<$jT1}6O168cfmT*ZfeIeXMw9M+RZ*B1Ww-^I1_-x#)ku>HVCJA|zVTNGO~8^<7-EsJdy zTN&E|wmP)6Ca?q)m8cHHn7 zbc(@wNZX9p_rb(`a~Dive8C5w_Q8J=m{iUOKJy2C=3n=jf5~Tl{T(}v)FzmE0MeLY z)g7VWXzB{tjF&OaZIbW-Yu5{X!tddUVl|Pm4@&ZPK`EytSzo`<-!p*AWVDp&!QL|I zm2gHddv|+1xWZMcWEJ?9pai}wnr)ygyvY+}4n zEm^~Gv4SfZE>W8vpk+|H~mv<-fj`d zWUsQtOJr|)ixK|yu~N? zZRljY!>9KM^fcb*6Z`=TG=9gY`1cTNe9R}g8RCtTe40Oj6yrbmM1KLf#%Vs)e+H-V z7e3ivLxu4zpYHRp(D)ml@b6){@edCl^DFSY@dF?AA7MKXG;!P71HsS?9pD6Xg456$ z&O$f12%&HZ!V%yWG@&A~77IFaieQK)4MD!w`&tp*R9!@GgkO1c<{_xDy>P z2J_%&I331e0gOi%OvG|X!bS24 zP6&=+o=|I zP(3u#3fM&ru$xxH8?+Ag(*`(5Ti`9)28U@kyhHooJvt2U(@{7^$KiL>41b_g@G+f+ z6Wp3k(na{3uEH4u;At4gz0@1i_iQn`d?rGb^ zW#jhk;rk#jKNPrY&)}2$aufXe08DHGXA`)%NB@)FF4pXV``auCh4Logt{|5AwtdfL zyy<=4x9xlW5Bk1u+xNh_HhrHxpT4hR-oCG5-oCG6y6Sw zTwZ1%;O`t0)K%k@o{Y6f7alWxDKDfP53L^jK9WL*xP{{aW6iL`|$-lgfHR| z+=9n&D}Kb$llUrrhCA^qd>zl>9=yz%SMW`0hyO;w_%?;&zf%u9LXmis2H*!Y3_s*& z0REoh@go|K%`_GNNa^?q<>RL`1HYhRJVmAWXR5(7REu9zJ)WZ#c%B;Y0o|F+M7oB!_L<{7~BH~ZcHzxNEF+YO{4#x?#r`~$@R z&`1cOIOs&9p$CnDo^%&P(Kr}Li4aW_A(ke?7)pV7N`qv6l}({6$f9h>r97BLcY~8( zYs+XRRFD%EPysBYd!deBbC=Wo{0yKne)p|}tu&9{cWa=D=EELZ2+g#J-(5X$nwG*@ zS_T(sIb5QjBhaI0(n{<|tFQ}M7|#7Lf}X~Kv<3&$dW@lGa0ESvchU2hK$|g@euEBr z8S}VLPN&zffOepZny{R9VI_I?VJ*FZi|7E>(?MK8hj1kw#s+#9*U)>oj(&@q=ooIM z6ByHdK@o$}2dG{cObVzU>On*FH8 z>`%4k0ID|!(hBo-YB2Ah)n+uUGl$Uza|CTMN76QP6zw)g(>^nv4x4w;QF8(vHxsGZ zoJ6P0$#mLGrSoPQT{JW4s+rHvfM@v&02;l)ZFHX<8|VKcl-n3C|HqmcO+Ee#`~DBM diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDocumentosFiscais.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDocumentosFiscais.jrxml index c2c13ee1e..3322a304f 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDocumentosFiscais.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDocumentosFiscais.jrxml @@ -1,7 +1,7 @@ - - - + + + @@ -50,7 +50,7 @@ <band height="28"> <textField> - <reportElement x="258" y="2" width="300" height="20" uuid="e15d26de-6873-4576-b49b-8dc546b39dbe"/> + <reportElement x="258" y="2" width="300" height="26" uuid="e15d26de-6873-4576-b49b-8dc546b39dbe"/> <textElement textAlignment="Center"> <font size="12"/> </textElement> @@ -68,42 +68,42 @@ <textFieldExpression><![CDATA[$R{header.periodo}]]></textFieldExpression> </textField> <textField> - <reportElement x="634" y="6" width="123" height="20" uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60"/> + <reportElement x="611" y="0" width="123" height="20" uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60"/> <textElement> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression> </textField> <textField evaluationTime="Report"> - <reportElement x="833" y="26" width="22" height="17" uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f"/> + <reportElement x="810" y="20" width="22" height="17" uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f"/> <textElement textAlignment="Right"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression> </textField> <textField> - <reportElement x="767" y="26" width="42" height="17" uuid="be1692e9-f130-4d08-9173-6ca3e4699030"/> + <reportElement x="744" y="20" width="42" height="17" uuid="be1692e9-f130-4d08-9173-6ca3e4699030"/> <textElement> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy HH:mm"> - <reportElement x="757" y="6" width="98" height="20" uuid="6f671365-868e-41a6-81ee-a308d1d91e1d"/> + <reportElement x="734" y="0" width="98" height="20" uuid="6f671365-868e-41a6-81ee-a308d1d91e1d"/> <textElement textAlignment="Left"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <textField> - <reportElement x="809" y="26" width="24" height="17" uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a"/> + <reportElement x="786" y="20" width="24" height="17" uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a"/> <textElement textAlignment="Right"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression> </textField> <line> - <reportElement x="-1" y="87" width="858" height="1" uuid="ee05e1fa-6963-4ff9-b3c8-c6cd1bb54e94"/> + <reportElement x="-1" y="87" width="834" height="1" uuid="ee05e1fa-6963-4ff9-b3c8-c6cd1bb54e94"/> </line> <textField> <reportElement x="99" y="23" width="159" height="20" uuid="4d4f219a-3607-4255-b549-fc5ada2ad59e"/> @@ -172,7 +172,7 @@ <columnHeader> <band height="32" splitType="Stretch"> <line> - <reportElement mode="Transparent" x="0" y="30" width="857" height="1" uuid="ae94e51c-f84c-405c-a9c3-d8fd0c48f03a"/> + <reportElement mode="Transparent" x="0" y="30" width="832" height="1" uuid="ae94e51c-f84c-405c-a9c3-d8fd0c48f03a"/> </line> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="0" y="2" width="99" height="26" isPrintWhenDetailOverflows="true" uuid="2cbc8ddc-38e5-4914-8189-5761ddeb2ce9"/> @@ -297,14 +297,14 @@ </textElement> <textFieldExpression><![CDATA[$F{valorBaseCalculo}]]></textFieldExpression> </textField> - <textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true"> + <textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="false"> <reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="634" y="1" width="67" height="16" isPrintWhenDetailOverflows="true" uuid="b7842ed3-aa20-4fe9-996a-c8397aa66c40"/> <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> <font size="11" isBold="false"/> </textElement> - <textFieldExpression><![CDATA[$F{isentas}]]></textFieldExpression> + <textFieldExpression><![CDATA[$F{isentas} == null ? BigDecimal.ZERO :$F{isentas}]]></textFieldExpression> </textField> - <textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true"> + <textField isStretchWithOverflow="true" pattern="###0.00" isBlankWhenNull="true"> <reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="492" y="1" width="66" height="16" isPrintWhenDetailOverflows="true" uuid="36f5d507-0340-4c7e-b44b-5057c1e8bee6"/> <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> <font size="11" isBold="false"/> @@ -339,7 +339,7 @@ </textElement> <textFieldExpression><![CDATA[$F{numAIDF}]]></textFieldExpression> </textField> - <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> + <textField isStretchWithOverflow="true" pattern="#,##0" isBlankWhenNull="true"> <reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="767" y="1" width="66" height="16" isPrintWhenDetailOverflows="true" uuid="e2ad1400-e2c6-48b0-98c8-812d3c8f008d"/> <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> <font size="11" isBold="false"/> @@ -349,19 +349,20 @@ </band> </detail> <columnFooter> - <band height="8"/> + <band/> </columnFooter> <pageFooter> - <band height="8"/> + <band/> </pageFooter> <summary> - <band height="33"> + <band height="30"> <textField pattern="¤ #,##0.00"> <reportElement x="634" y="0" width="67" height="26" uuid="dbf285d9-c756-4ee7-92fd-3f406c0d15fe"/> + <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$P{TOTAL_VALOR_ISENTAS}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="3" y="0" width="96" height="26" isPrintWhenDetailOverflows="true" uuid="b21a7ce5-7a71-46fe-b541-2a6ea4aed506"/> + <reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="0" y="0" width="99" height="26" isPrintWhenDetailOverflows="true" uuid="b21a7ce5-7a71-46fe-b541-2a6ea4aed506"/> <textElement textAlignment="Center" verticalAlignment="Top" markup="none"> <font size="10" isBold="true"/> </textElement> @@ -369,29 +370,32 @@ </textField> <textField pattern="¤ #,##0.00"> <reportElement x="558" y="0" width="76" height="26" uuid="d9e6ccc3-bd50-4f69-aefc-038ead5d42a1"/> + <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$P{TOTAL_VALOR_ICMS}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00"> <reportElement x="701" y="0" width="66" height="26" uuid="0421c020-3268-4108-b906-74dc51966ceb"/> + <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$P{TOTAL_VALOR_OUTRAS}]]></textFieldExpression> </textField> <textField pattern="¤ #,##0.00"> <reportElement x="311" y="0" width="110" height="26" uuid="24994170-a664-4bbd-a1af-5adf2065859f"/> + <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$P{TOTAL_VALOR_CONTABIL}]]></textFieldExpression> </textField> - <textField pattern="¤ #,##0.00"> - <reportElement x="492" y="0" width="66" height="26" uuid="1e6a74f4-2122-4488-b1c9-b5428257dd34"/> - <textFieldExpression><![CDATA[$P{TOTAL_VALOR_ALIQUIOTA_ICMS}]]></textFieldExpression> - </textField> <textField pattern="¤ #,##0.00"> <reportElement x="421" y="0" width="71" height="26" uuid="dc457e5a-f70b-4ddd-a7f3-84203983597d"/> + <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$P{TOTAL_VALOR_BASE_CALCULO}]]></textFieldExpression> </textField> - <textField pattern="¤ #,##0.00"> - <reportElement x="764" y="0" width="69" height="26" uuid="a1630e46-8a69-4338-a9d8-eef4f6237895"/> - <textElement verticalAlignment="Bottom"/> + <textField pattern="###0"> + <reportElement x="767" y="0" width="66" height="26" uuid="a1630e46-8a69-4338-a9d8-eef4f6237895"/> + <textElement textAlignment="Center" verticalAlignment="Top"/> <textFieldExpression><![CDATA[$P{TOTAL_VALOR_CANCELADO}]]></textFieldExpression> </textField> + <line> + <reportElement mode="Transparent" x="3" y="0" width="831" height="1" uuid="6cb873e3-df62-410f-bf16-52f7d714f139"/> + </line> </band> </summary> <noData>