From c1099496dd47b5a5cdf943c331fd315d214cc515 Mon Sep 17 00:00:00 2001 From: wilian Date: Wed, 7 Oct 2020 14:02:44 +0000 Subject: [PATCH] fixes bug#20380 dev:fabio qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@103706 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioDepositos.java | 50 ++++++++++++++---- .../templates/RelatorioDepositos.jasper | Bin 44189 -> 44506 bytes .../templates/RelatorioDepositos.jrxml | 17 +++--- .../utilitarios/RelatorioDepositoBean.java | 40 +++++++++++++- 4 files changed, 87 insertions(+), 20 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java index 9c2e7a1f5..818029b94 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java @@ -6,7 +6,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Map; @@ -18,7 +17,6 @@ import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioDepositoBe import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; -@SuppressWarnings("unchecked") public class RelatorioDepositos extends Relatorio { private static Logger log = Logger.getLogger(RelatorioDepositos.class); @@ -57,25 +55,47 @@ public class RelatorioDepositos extends Relatorio { rs.setFetchSize(500); lsDadosRelatorio = new ArrayList(); + + Integer puntoventaIdAux = null; + Integer empresaIdAux = null; + BigDecimal pendente = BigDecimal.ZERO; + BigDecimal totalFechamento = BigDecimal.ZERO; while (rs.next()) { - RelatorioDepositoBean deposito = new RelatorioDepositoBean(); deposito.setNombempresa(rs.getString("nombempresa")); deposito.setNombpuntoventa(rs.getString("nombpuntoventa")); deposito.setNumpuntoventa(rs.getString("numpuntoventa")); deposito.setDtmotivo(rs.getDate("dtmotivo")); deposito.setSaldo(rs.getBigDecimal("saldo").multiply(BigDecimal.valueOf(-1))); - deposito.setVrdeposito(rs.getBigDecimal("vrfechamento")); - deposito.setVrfechamento(rs.getBigDecimal("vrdeposito")); -// deposito.setNumdeposito(rs.getString("numdeposito")); + deposito.setVrdeposito(rs.getBigDecimal("vrdeposito")); + deposito.setVrfechamento(rs.getBigDecimal("vrfechamento")); + deposito.setEmpresaId(rs.getInt("empresaId")); + deposito.setPuntoventaId(rs.getInt("puntoventaId")); + + if((puntoventaIdAux == null || !puntoventaIdAux.equals(deposito.getPuntoventaId())) || + (empresaIdAux == null || !empresaIdAux.equals(deposito.getEmpresaId()))) { + + puntoventaIdAux = deposito.getPuntoventaId(); + empresaIdAux = deposito.getEmpresaId(); + pendente = deposito.getVrfechamento(); + totalFechamento = totalFechamento.add(deposito.getVrfechamento()); + + if(!lsDadosRelatorio.isEmpty()) { + lsDadosRelatorio.get(lsDadosRelatorio.size() - 1).setSomarPendente(true); + } + } + pendente = pendente.subtract(deposito.getVrdeposito()); + deposito.setVrpendente(pendente); + lsDadosRelatorio.add(deposito); } - Collections.sort(lsDadosRelatorio); if (lsDadosRelatorio.size() > 0) { + lsDadosRelatorio.get(lsDadosRelatorio.size() - 1).setSomarPendente(true); setLsDadosRelatorio(lsDadosRelatorio); } + parametros.put("totalFechamento", totalFechamento); setNomeSubReporte(nomeSubReporte); } @@ -109,15 +129,19 @@ public class RelatorioDepositos extends Relatorio { sql.append(" tmp.numdeposito, "); } - sql.append(" tmp.vrdeposito "); + sql.append(" tmp.vrdeposito, "); + sql.append(" tmp.puntoventaId, "); + sql.append(" tmp.empresaId "); sql.append(" FROM "); sql.append(" ( SELECT DISTINCT e.nombempresa, "); sql.append(" p.nombpuntoventa, "); sql.append(" p.numpuntoventa, "); + sql.append(" p.puntoventa_id as puntoventaId, "); + sql.append(" e.empresa_id as empresaId, "); sql.append(" f.fecfechamento AS dtmotivo, "); sql.append(" ( SUM(NVL(fd.valor_pago,0)) - f.total ) AS saldo, "); - sql.append(" SUM(NVL(fd.valor_pago,0)) AS vrfechamento , "); - sql.append(" f.total AS vrdeposito, "); + sql.append(" SUM(NVL(fd.valor_pago,0)) AS vrdeposito , "); + sql.append(" f.total AS vrfechamento, "); if (! filtrarPendentes){ sql.append(" fdp.NUMDEPOSITO as numdeposito, "); @@ -152,6 +176,8 @@ public class RelatorioDepositos extends Relatorio { sql.append(" GROUP BY e.nombempresa, "); sql.append(" p.nombpuntoventa, "); sql.append(" p.numpuntoventa, "); + sql.append(" p.puntoventa_id, "); + sql.append(" e.empresa_id, "); sql.append(" f.fecfechamento, "); sql.append(" f.FECHAMENTOCNTCORRENTE_ID, "); @@ -168,7 +194,9 @@ public class RelatorioDepositos extends Relatorio { sql.append(" ORDER BY tmp.nombempresa, "); sql.append(" tmp.nombpuntoventa, "); sql.append(" tmp.dtmotivo, "); - sql.append(" tmp.vrdeposito "); + sql.append(" tmp.vrdeposito, "); + sql.append(" tmp.puntoventaId, "); + sql.append(" tmp.empresaId "); return sql.toString(); } } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jasper index 8f0af5596b307f35c8315be9b626d5893916e2e1..339c7c202963495085b63f728f26cff7c72eff1f 100644 GIT binary patch literal 44506 zcmeHwd7M0ugXrpN9c7;r(v zU2!KO?ki$^CTeguA@bB1m&E6qn5c;{zvzob6MY(^;rBgNb?>d)eW#}}zW2xbyn$P{ z?y3Eps#E7wovOa~Bi1hwXA?Uk$)ZGS(VB3gD-w@Kx?=HUqA1e2I@%d2S|ot=0?5SQ z;cptu46*#?SVvd1JyIS{hLdbWXia!sxHuXsZivLA;r8gp@T&I6u^~2CMXL#SL>jtV zTcbTmHbh2l4|lFEZb-(XovRUXfQlF|YY!(9r?In`(GzD!W~$q&Z~_&qFU2dhf|IM* z=(>iArRB9v4HflOC84He74;2OwKYvktIDfba8)dsjCE9p<7i|RwWYngqq8j5-I=VS zn$TB6SGXBfb3#vuwj|qDutCw)ow0bNE{v4nWHi>ff(?x(D%)e>WSK};8H*(&af+B| z=Knrx4#G*v9GJ<^(#6)k1? zv3NAn3526u1a*lVqO03b>;Cj1>R5^ZAT?PVN7kr*oFdpw?VpTw*|`<0Z;N!+#E628 z8@eJPmbWV0ymoaQXlO~YLqouQaiX=@(=Uo;zbGcOcea3T10}Y~qwz>HRV&G6WK5Vu zNyYWuolb&^&h8H66O{Q#JP`RU2PTmuU@KXm1=USNl8GdnxH4l&i|VOmh)TJ)L|Vh$ z?a7AZhW1F3P3R+`h=yc2EsZ?+7O=!_CQ9e1qG= zf%0gF7;g=cWReY(1EV_`ZO1sGdIxBbbc3>DK!jKU21k-Qjt5Wq9pPxFYHX7ARV^1Q zRwqWK$~mV~bOhDZL0U&!7H;nb&ZcKu1d$fK;;_DYg-zVtgdCot8Y@}GlwqvvtT>yNiEk3E zic*K5o#PP3z;_FXoflE(E23KHfn7(7_|{Jfb48Uy?>j*3pnvZ7R$Tg%+c6G={6gt+Sp z2EN_U)gDcjw719BM_NK`sOZ&1(2Aa}cqEY!ym4~IKCr0Xjf*}tper83jGT-{64ha# z{m4EN*XhxbzJG#hM65l@25EC{>4qdt%>_=d>Y!6I<}XILXd~q)`(~WY$P%j+?U4@5 zTnjL{5JB)qeZT;RYi^6Sx5N=<*HN&)P&6UW`RuEYS?keW<#%M>RlnrbHa^vmM&b5sYP9n)tHo%1-XayUNo|cS9 zlFe--MAWW}#9PtjLTp&Lv$-u6Cqc{YMZ}N}#3bz&BPh`K3@DnOcktV!h$c$GSJw(w-`(DxWJC3#iA*Em zPE;n(?E{pOMv8!-;_5rME1X1gJJsi4^_fy3F!SmA(Vf)@5+hU$(FvJ4G$f=|F%mPW z4r8Gd$S(-O&>`&c9A2L+77(;b3Eri8qQO!amoO2La+?DFCj;ujEiDkly@;ynOh#5m z;>a@43ZavFy~2a|Zor_X?<3HIF({%N5hvVU(hlLB*pRC3D4!tJ!)ImWG=di{^yaI& zcn;_rYj2?vCZTfCL=_5-HmmOe(L`NKYemPZNJ~q^jxNXWONMOh` zEyQLNEI*o9+6jE4D~R@?2%#W&5IT@lhIDl16IdaWvIA~%DWB39bh5sL#*mB%eCJad zr5sTi-ruC^pFi!Pl(H=$82 zqEdakfbh=d81*5QGl43-y+&$D9yAUTic>lsg97eFWFQ`sTA9Mg0Q*~^qc~%QMR%%K zIVfC^qUNbifdkOTNFJcxstm@Akc>8`_x2HK0jhFG^|4y5Hn|e zq$9R2LOqXS2u57Wf?cshlyp}TY@lQ(SHLKW%A&BWk{)ZkLX zbk!0f*t#gjXOd+`Ds)p#A+=KxgVY5cDq$Rog!UNGi!|3pHmI&_b;Mc(C%`c5Pku$y zDSgwl8nIPp%g5LPTNLbuGR_ULQ5uN2t1~64f(PqJQ-x-s`PXTvR)zaX%2ddKAvW9* zqJ=zC)&_+nA{K`ZOBIhP#Tdu~N@m{RPJ`LV14?w(Qh^qOw2q)!m<3x?!Ws1*)j+Ge z8-2*04uyET6w6Q$P?c&o*jDUV87AJ>Y4R0Ja1b?WywJ3=Q|eN&E2nYBNU5W|hF}t{ ztU9r&z9Ll8ShcL8sj(LS>!<`MjTyyW;!#B@ZS%?g08iE>p-@FbV^eMEqKdLc2-Z@q z6w)|h;EC(ZFSd7_R}4j95eq`_NhBMht4pKF#3Gj85p%wJx-Q>tI(|Rbs)A-`{e_7n?6Q23jUY@H$$+0KXdK#;fVZ6dXVQ-fd&^uX*

erBxFr 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 literal 44189 zcmeHw33wdEv43~ZSXxVKTRyM>+p%meV`Iq&7_c!|r!9MRAjvkC0kM)+)?!I3Rx4XJ zH|7k1a3AJ|aE6d@nk#|810H7}34s6!1VRp8$i)!|0sg=0?wRS?9j(@c_rCA{zNb&q z)6;iXRaaGaSNGojJ{!@WWHWnXsgnNAlB1*jeX(RR)|W`8`b%QH>*Kw#k`*$rQ3f*k zx7VwJSrJy)p6Ka|cgHHDsc4E#j2s=^7%hz_N}FQIc(gmdCEC^PpoO6 zvok)JV&hce?r87&(xy~0-n$+NN9lygitcEC|1sJ~uP+z(SdU`7o1HGvl zY6*Qc^+ns!G&golyd%}s!iwVSdlSi6Llilqsd%Edg^iE*S9d3(sS25|I*~}ll9aH& zX`rVkn%rC$+l1t?7FO&At%;|)C~SEw+7U~Z^>#S9M#uY`66A8BfOAsaYwuAZx}H zYAS6U=yfwx^$zr)oUkfK!GX|kyI~4QGHe|Sb)dQZu~dJG&0LqYrWK9UGbE+bJ7S&D zf$mgOYIAoi#r7B`qfCZuc^$D-G~TV7GfI6mIUU_=xKdO?lryd~k?e`4s-x|xL~^r7 z;Q)EOM~=6qSSrQFsDUw%ig#liQM*GlNCtpeIUpizGzLeC2*(Gf!k%cnS9dnWhHI7w z6}uOsQkR_9D+xh&wa6f})zR(&z-)fj-b%FAd(^41DoNDWR!y`-_PVYy9<}PK<_%v} zgG=GErgbc@pHK^`*mF3laFCnduZE{=#yU1K73=Bij;5%L(&5Tb{H9sw0HQ{uXw>Q+ zjrR{M-K+hE@6{ULfRsHO>|^ZlW^mpKc(`K0Vzzp#Kx+kKqKQH%$pqGSLXyqP#y1I9 zCFw)ZDRCTQ;Jc%VotF^tl~60p$i5WVe{*9W{Xu$^WUI;G(0bIUl1PT|b!y7*To{OMcIoVK4pX8=FO(a_mBHk9h}TA80+kmPm6h`Y8h z@a?9)?s%%KyF0Nd))8UjB~=qbs|Nd$vHpI^8)s#uffbEjTF}&}zGMOtITerf*G2*M zIm2XbFq0$y$bM=OvGx=zGGuP~<`jwM(QdRR(79R5mm^&EkxEpwnPdxcglbiHtOt^7 z8H5WV1b;*W0vxWrE8g9aM4Zz`$^Ihoe#y6EM!po=Cu<7YR9hmk z0Xo5kNNi)QyPS=VZ3K6f^1M0T6Dwz9x&Yi{cf5B)GnA89s+^7TLJ-x$b^@iPlCe~K z7by|-8)L~%kX(dKi1xO3C6c6Qc~nFUX)=VgSB=EL@Dfla1CfmPa#90xXJu8sj!ANX zv;(B|SkNuo#qC|0Y<@=5C%Fko?4?DoW8;nJB)SgO3k+q!a13R+1LcOO&V{~Cam#9q zb;dxF?dkPJ*sgAx=0u`974J)HQG|I7_78ps74iOZ@YM~H)em%cr`ULNXrjV3BG#$id zbXZ}$e^oEw4N{Q(Llts@-~;Fwnlfa9vyg%{FsV4eCZEbFPhd_qoYELk2?6gy%A+So zR1DBwWCUsW<)AH6k-8iQcElM6`lwXUJLp>?Ubht!oMd!;GTPUb0%SqbS>`4*s%27Y zZyx~O+nyjA(j`++wV!I#EXfDPA~|u&gkxBS`vDnBCe*A6wZW2{8g&U8 z7Bo@wHD|ONV2+Ujg!-E@77`&9Z_lLmi5U^Par+M6xYcHvvW4I)xvG8{JY{k=o>IeH zrD_sJ3+eeaz14BB^)+2!j-;MRAt+;@hsU6@cgUXfx3FDx4&ttra_;5`NJK(%HpY4q z8)HOyltMD%au)7O^v7xLN{S68+5Jkq(pL=|v5DsWHH;79*$kzM=E&{D;0V>=QWMOn zB~-ADag5It%MMh`O^peulZzOnsqjz@(@`a6k1?}KYeQ_aCS|)P(IGhjhT%x^Yn;v= z9;dZPt%4ggg8^z?d61?|l}wJXom?ea z>LV3hn2^Ne;?SPy>M`Y*0)0U1%$q$in2SE3Rc9j?a8YCsg6?4sY)va?L_NBL_P_vW z$PtH9yf)(~8+^@mDZ$7$e)}kw~JFerLMBe=; zEG;L%DY&52vEF1=s|DlUzVoETy7;K1xPgC)$!(G#itJ z$`$4m8*9v2tPleL!)1&&Ol8rpz5n#}uOIZ+KVh&`JA;Lw zS$PNmO`bZ}Sw#7>u6-F02C^cG5_Wiuzn6@L@D$x$qct3y`s@=otuaFkyPG&%?S6a`pP;nn>D|106pjNA{e$5UHAy3ItWswB3YnX_4U_rjUYoK=nl&`tNEyj4IR8SUR zX|xpCa-YPQ*^l!=8)MOKH%6}B?Tf`>Ra2J5;q;n%*8b$z@s&5MaufhsCtjE%gH9{U z1Ar)JHbFdsm!7$c!9FX6t*cZ|A{F15aL`CJw4x6yy9FH`rM0!CoAIak%N`k;;l-$+ zj4H{{45^fZs7Uf0A_=kVj)upgC71o>2OR}>OjvJ~?eFPJl&Grj1bS7cu*p_c-AsNo zL;cD8D^)A%1NorTB&Cy*iAiVW(sx*v^Z|TR6{I2#A2w@iwiIZ)Y(blXLZ^g9%ITB) zrXmQ2_`|TFe#d3D4G7q8fWAratIiO{M)xLq+WN37j7cK|n^TSkSPICH*)y?KiBfi< zYKFiT=xm=H=`3x@yeOM0fCc4Fx&7=+1X|cGH0hPoD7B4R-&+-JmwV4GY%IlLgOpZQ zl}4<#ty9rt3LDVSD6kK%_BM17rEFp04Y62Xa{|lLU9`hIsVCmMT<(K3Cz_0eV59A{ zrM@}}lK_|lV8=G=taL@AlM*Z-bE$Z|ziV2N$zfMb?LRso(b`PmdfJNcZB33dg7kJ3 zVLAkFn5%*kywY1$;}~5bd9_ktT{|{E4&IdOfzvd+HJ=& z0ylvZGxu?BD78-4n0>*77;0&a*(qJ;WVftX(%fHnr9*^G8zPBMh(y@LcrR9gqTRAR z9(SiUPX;gV^_G|mB<#!{jdr1_dy|8HEr%WfK=)+Fh2Ew=gUzs*I7U>| zuc~Wy+2N>kcF0p~=ib<+Voy8QlkJ)F_6B1_E3#_8gus#v1O~LjuB)%B((Ii0^61cMG3?&e# z-Lu_xTN0=~4M2qer1tC?GiJN-qo50#;wC4>E|a|lv^cM>zOl9}qMEmp2JcRQ7Wh~? zw0xSx180A<^R$b9G2w~P+jjcs@a1c@6b8l#oJv1kM&2FJAnv8~(m6{tC|Ge&$y5s8 zgv*QwRvgR}!HR=UfqqEn`xJ+>96|5CvndV>2dF!K#i3v$cE$Q=tus^E3+=YgZoADb znLAh29IQMXK{y;jdC;)es@}c*%b%Px_}Gja2fuwwq`fxp>p;*`)FbIUkqtpASpb5} zh+qVnDS{ECQv@RD2^TSrCmVwH4?s|OW3n^W-UXfx<<2QYlQA^)Tu^jf&M0~)vbOD} zmggs|IOFBpjw)U{{p&!{FR8K8c_kZ)RI&gRnGwM#GE)SjNT&!y(JKy6-FG$=9pIwK zR?N@_XIdSpuBupGR*QAi`quKYx{7+2Z5EXD545F{u&0~prXO8d)llD5laZE_c#?m) z3m^MV@o>XbPME3qoH*%&yTAC@ z!?*2wRDEp9&)zz*{AWRE+^FkUt&w2KHd*EZ>6N4Bih-g|C(A^mFCq|)z7&CIbW)(n z8EE9p#h>FbK#xf3t~Wg1U964QQQRQeb(d*1UcOEpB_Be9VzgghBc%HfdqB{F+sw|+mrD=*vFK2EQBix&#W@dpJlr^Kq0hWe6hB zGrxngu5r-xqLge80;ovN1JzjJ49l5{l(H;mDpC>$z4=t#tiSg;imm6XTVSH{}oJ<)E-D*1FoyQ{XuJo)Z2 zi?NRlUJ~;Xr!5#7S&YqR?4pBjc$o@ml@X@o7(3D2av0MKBf~Hq@u|GIXDh^<)S1f| zxw7=fFA;LfGY&Aoeo;S$b#D}gm+@qdpqN0GUF#D&kd@5HhaFmqw=TV*bxY*)!S|e@ zrDpQqG({v<^@!ZgWlXKc(8onGh!z1xrVGqrR#7PT6}l*$J*uOQsga zkD{TcDv?_kazEl=Y=qR|z?PEivhcEpf4FGeQ6C<6<)uIV=(Gb5Uw%TmP9_zUtV<7+ zf_J)3o9dIJh8eLc!dz(3*;It1eP!fulrA#@eUt4smlZfZ(*8_BO4qe^Nk`EL>_>FT z^I|0$$-dHLeVM?28R(G+pysh6fAJ?6};Fw45+#Cs9?HOJL zmXM$VC7tkN0zj@}13+#@_&{z(_&}~B01WamAIOjKfrvh`fqd6=kY|hvRUB0VnxmJY z+)g0n76K#RVC8HFctv4)?K{XT!nx;HyrM`h{lTEJJ>jv76RB6}>|%0y(Ev;U$M$m# znJ0)_*umU_gHrLAxpl_R^T2+P#4)k3-P79yaE+q{YHedRvoqS=A5(LG^vR*{JEtWE z=e>Mf#oG@yzBl9j+OZx(ktNe+W}dq}I-;>=+4AA{MtgMM)>I6 zjPTLBjsQ#?dY5qL7bqwhu0iV=+nsx)gAXe%X)7p3NstahPPf764b=G;E`w3GXL{Ya zq3)vH{&eOGw?F?t{D`AM){N@UJ=78CFOyifoXB^0dGI~TA)T88kfmY+kYz^rkYz^r zkfkFskae>GT;(YF3r(Jk=mS z;%BAzBR9nV;N+)&F?DXs-g6JM??3CEa;S)oxh@rtuG4GyQTkIPhJS8z*fo`u2hW!A4YLp$U`IuBclc%iJtiHsYNxXa>cAD9u8Cp2 zWMpS@ecMKLj9aX$rqwF>Md1An^@6c4pL>ovO5K)h;0=6Wp>FSN<_dDF)Hy{!h0vd| zMweILPK=J%d!dejeDe||9B+`+0a$^3Xcc1QoQ>5u8*)!SE7nLM{_0q}e*6~&Ehm2G!tdTS@zBwyme2bdMw*yL zSd-3_Y*>2ze|3c2^VyR}{Ay+5^|C9LUc2?t%7U*0VHJch=`78LFqJF- zVP-@y!ps!G2-7J75w_F;uk#)jVbcQ;HclhV*e5W`%Zj!#(mn9^)zNnE=Gq$<{PUpG zrao}sTlZhM?5VE9Qt?h7Zwg=D1w{TCgKCR=8o^m}JL~7$rhc$^&l4`NxBT&z zx~0!~NOJ0f{1I827=#fyq()IEMfq8KNe z`cu*3x>#@5Ku>XHtncx=$>eZ`uf6Uxb*5gRF7VcUspaQj-Lx?V%W>Rikw6*JYOx=i zWNJ@7%l@-xJ}`rY&zbf3QPZ7`vPqc5?#L-JX@sBvO7<8d<)MS>L=xM-J$)(cmS&o; z!(dyVyq6pAX?7IDZe)+{#YJDZTLb&?hN*a<5yXyeZ*#yI%RP-SM{8`x$~qQ%4r`Wl zsJD-^&Z^bbVsvH=t2#25I98RolPeM9<`#Z zsiCS7N5836W~Q9)fAp0%*6Us!4tL{fMYBwG?Na|S-B`is?N#^S`LY-3?6qZwsl5j; zH_@cps&qO&PA9G`Yc6YTs$bPuQROAasgi7q6zUehCTWxs*n*~t#+ruaNR6$5f$ zt!j+4E-xbpH3qd(9aJFFKtj5>AlkDWcZYPl$3%REPSAx`*F>r?Mw;p)xG>c0bk-x_ zs?)d)m5|bndscj9yXdH@ZNR+?RZV8O%4kCtfW^M@L~NwGrYchD%V`*)kkN~; z$~^P~48p7^E7Q>yan;f!%~z5$_Ey(4Hm@p+)U@nCsW{LTPo@UwI@mOjOsHvUtyzXM z3018PWy@;na2ti6ffy$%^nRYxDrIj$JAjb9#Aruiepk~QZ;vO;?grbZfTJK6jCzoV zEKRhXkFx5?o+Yojrg>GQKKD8%#QP-)$2)NwPeURpH(Jf?L-Y|NL8<{{SfSR83sWqN z`&H?p(2^~QL=XDxd}86>^}|kYzhG84D6SP5i3F0d_W!-y!E{}uBs zNU^0mSRWl6ERpBK-Kq~6t_YlC!|_Y9c}Q(8p>x@>lD1fCQ!Lh7l1yyE;&=JKQ36)W zamKNK5c-Njha8E^qy1eFpd<2M`|;xwk9x^sq8jJd!HU!gGu*bD>VmZv?j!0L>^o#B z(IN|P3c)SH69U5*zrrqob0?^H4Jy{Wk_8Lq%{BfOQnFve=A{qox67qr2Zg)|WUE$r zVXvo{SU8tre*<&ZRC0g}-^3d!#%17JI*@vitL2}x*rayrn;4A)+p~u=hLm}ov)cYE zYGG4{`#~Z2X>3X|F8krBe=Yyx?c?5y?G@Rt{*baupjj$&%Pg9uYi`;0yRFAvw$JuT zN3k3$%XF=+h;d}eD#XQ22`vpjD0m0sv4WhB9--D zy|QrumHA*xpgl*TWgCQmJSr*yon~GmlaX^nZm@O`onKeqyd0N^&Upr0N8u*47R{g~AFt8l zFa?on=Q29ns}xV&@L(l(s1ZHMZL}7j+4x9PeQjCm>PCl=P;<^9XGr>nfx$t+x|{m( z329)E<*)=PFZ5^F9E`vmt9dQ;bx?vQM;qmU1x;%+K&qkY?0-88nx`Ii+vq($-+IOR z!qPiOHr9N!V+)$r@o1lNj#WC6X^pI7RfK7c?29lLG<^}~f~FIJUPxe=#t7E2vUjGF zZBcVcIw4>MxuBJDeYxz>y-?uaDj2 zaD4<-=Kt9V+{ZS=j7bro(b8pf^K865<1W(?+1d-H~SrY@{|xJ zi8v!{Nc^m`ndb1$9i`<=B_QTJ~idj zJN{mCk^?Wrt#h@6v$jz+(zz^vW2o2wj$ualIEESF;}|*u9m?bwm-$9HePrVp`vh=| zLcQlicXRj(la(1(FB;Yd;Hb$tcrR34nKz0q+uAcAgW^cg1-gn8mXR zIRX9Nw@*I(?wOyQdE3*S>)w1UvLv0r0mxi|eh&d%I(G#CUBw0f-Hh-7-Hh-7T}K20 z{jOnvF12u6L9UksB-UugRpNqQ$S~47^JWy!D4wl1^RL zsSAItsX{>+rO6))Y*_2{6&DO~ek!0%3_ds7zvSvp@z>i%J$u4qH9xtww)(Afh|2+# z)qa&ySY&;yoEHP2tzrY9ZASQ@ZASQ@ts?@V{h|*%^pOqPb6sfb%Z)IZ@z&wp0T2fD z&nSNUT4NX>p||*M);R=5B>M+OauWd$?X&S`bst`vJn`AkFYf-w^2a=k$l}TJb+i(_ z!=vT5gcj-iCIBreHUKSVgbyudgbyt`0>F@s^l9n8F+n8#+0Zi2MT;H;fVQ)5VHOk& zYu2gxO>VHht!?68w}tPoe`Uj;>i4r=iG3GV%9au>0%!v24~c=sX{X`9;?Ke>uO9KR+RV zVv*)(#GvTUScwQ>1G%{d761xb-t;2RI|ss_)&25L=5(lnaGN%vt_Y4jMnQwV(-$Hx zdTHj7`)|0R?VidJOG|fNd9{al6M_-|0hU$vcq(2xV>6MhV>6NMi!hPxi!hPxM4(Z! zEhdYz$C^!*evA`&z{ay^QojhAIZW;Xv|@O2gVv>+Zri&OuzXo z3w;*nM4vzUPTxP`3*KGWw6^}QXZMsF=gEy)70iO@b2dR-I(r8|T*U@J+>G!++>G!+ zTt}c$ne=ILaMfy;KC9g;`#RfpjjPOCrjPOBAM+8D^fr(h@&qkk%2he8IFctKfv5s$)xB~>bZ%zbyaq&qP zmvz3n^p)yU54m~n%7=Ckh(h0?4 zECn#AcYSuW=)0hEg2@93w!4(|tBgIN-1;_VFk7$&!70wZ7>BG#4P{=uYA@p8+msMP5b9vW&ASUXV7gFs$x4+chKF zHSpy4sVwI%H(1EJ_JW*!!wU~GaSSTewTR_xT1IZa@v*P`pv_FqCTA1@i)d{!%;nFF zsVnFlaBF*M&ZcH&G>k@rpk>$xbGCa%_5g!XU;Be>5`B15MwJ{tGUmeCwLJ`imEVLm z2-L3mb5JA8(|to0dQ`(XNqK| zHjRJG;(gb6akh(FjCXcJ+0An{-5(cl@i{Q%rb#pQF^f*O$1x#iSk8c{xurRK{mP~T zgWZkEyu8=U=eGqhV^l>>yjfzVO@rC5G~)x#@(!Z={14{Lnz{FC&g=^O++mn4Vv7ry z&6b4O2$naJ33f=Be_98iqBftfMK+#wy>cFqQ~p*qSgKuY7C6Y=ZKw3$vY+?}#v)sC=zqHc9!SVYajK zwTIa*%7-59s(kCiY_jsj!)%K3Z3wfe>>Jd}o-muHe2FkCR=#7xY`XIGhuI9}8wj)A zly6g*?XG;A!?@E;mU3*E?WugnhuL1rcVd{$WP4K`Cx>y-i1cj@v)RgbTA1yld}oB& z9OXMJ%u1B+>@X`;zH`ECuJV05%;qWI`C&F+`7R8z1_Fwaj&aPkpz6IeV{*;=z)QH2W-ewoXwr7uF{|t zyi&R)GW#cyRsj)O1M%X1@Tm0sd#?_&o7l|-fY2>EZMD2BHq35Q!QbWhonREPI+_F~ zzNZ53;LLxHB*cDzAUYmV>a;DN-39W-&#-W|r>>SxPL$TS9gTAYi}yBuq)i8f**)yu zLUuR14?WF6H}a`7`RsnQz^BH9*n=2pN`DElhtd5^#U;dk1op4PU5zEg9tH01 zz`mU@L-Po+7rlNODo2R@6!J@F2+%b`?B{4zkdhH%zW@}Kb`fH)a$_qc#9s4y>DMPh z>A7)&1Z=H2~Bepg%JBQ28pL7gxFs}Ce$1)5ku_nfMSq-5Mm#4=CgYY zv5&dFX*R?@p>jO6AjJNO07D@Nv43&7?mOIkfjWtyDu2=_pM8OT`gDO1nc4WvqeEPv zPoDe_aT_U2$sgi*D8?uALmUNV+|U=|1rT~t2MCb!Asz;gOOx;+J{kq3%k~g2LiY`+ z9^&JGcfULj@d-d#rX&yXiAd|nXeIkYd}oCDrFV$$iu{>!JH)4;ooNy~#J>SLh|$GF z*f#;u&#VbxU;t#*V0#Q_LUHsJ<5TiO$@J*Q(>D=Q&*!^gjC&FKXKM2K9?$|%DERRr zzE=U?lg~tj;GWVX3q&&8VM=oywF1&E>^m>RlVp^E( zWORr(6A`p1B3Mm;TLV^@4!H7x&dyjepRX;z@AED}hh+jOc4<>DpC1l>4TA!#u7NQQ zBYG78RgsIs{7Bx4Qu$G78Ha?tk+F?3wu91A36(sZXkA>zcqgS@k1?(RMN2p#9tV{e z0n#QY#5aIt6^D2a4LU<-aGE3sOoGbm1DDd-l}$y6gM#vD%*N_F(`YF`3vt_*;sXVI z3Ev20ka<9e4;Jtv2+|fd=t3N)^bF(D5I-LMa5zJKH(*|fVGEBO2w{Gb8lorDKs*^# z=OnG_PvI_aobpB(GPs{Q+i8^TOMW^kQ|E)h*<;X&@f(&{Y?_ZZ<_Pc!njy$H<_GeP z*@1jxZXn;78OS&01@etqfqY|5Am5k~$T#K#@{QSmd}A&k-uXV(@0J;IjhMzjGPv74kzbGa*iUWjhqg0I?3rG=V)@e$>}AhkDMeqDRMTF zGf2)Ba*iYC1aeLy=M-{ICFgW<&LroXqbICc6oD0agh@4Bvxs04`W!1f1Of_otW|(GIkY$>B&$3rAx@I382MoiPa{f|!9R;9i*g?E?~@hp&a0>Mh13 zZz-mCRhZbVKx{oGbIkzuT1@4R#3ZgAsk<<7>%o)_yW(sUrfJ6^_sJL@r(;rfHtIYN z6S0d?+BQtSuEDhHJD70Y3Pjz3((eYU?q^Hb581)&F?I-h3bj243#*q{Ij*3qV6Wr4 z-?vcvyR4eM$Ck0bu;uJSR>M9;Yra5VI7+)wAsjWSfmt+b_I7sbtbMk#+h@($&c5$K zfcnnZY7E;on6@8=iTGON!Q@MoAjUJCf<4L}z(3K>>~RnILdp^H zLtjWGLLTvjR3qfazL4bzdE6JW0wGWMLLvxx$`?|Hkf(hi4G4MG7t)B3=Y1i~2>FRG zWHmxw@`W6Rke~TNS`hNGFXV89yy6Qv5+T3zg&c*D*L@*v2>F#Sqyr&u`a(Jp@*7`B z7ee0gg&d8LcYPt<9zxqdyo^Ob2yGzLb`V(y2qeZ@V5-#3)?@3i3*;AP*R!KBvE9I) zMChv^*7vZb_%D{=qgfv>X2wI7Td(HW`iIIOv5#aeWVD4 z-HS&3UN`EGkFr0~NS{6KzkDHm2zlQZl0?W~d?6`>{LL4#5g{M=LIx4?kuPKmLjK_k zISwJ8`a(`X$Y;KglRU7MV5y3+lK{4p0k%^Bwygl$sQ}w)0MO|G+Zh1cnE=~a0NXbK z0xUWx5b$gC7^y%7pX&;~e3X4jtZVjo&V50rQjp~fI-P<>_=3))pnPA@Hz{bOFX&qo zROkyjmx4z5g3hC$F}|P+C}^xN=pqUl?+dzwf_Cx+T}DBZd_mhNXcu45l@v7D7j!iR zP4xv`OF`3oK?ZAH0aP${0o)70Y%cKDeO94%C6_-VDy|9bLc3121>N?wL3|}yvKny3jy1C?d03=Cc_x| zgFQAMfd}`Q@rihliTDPY%|}6=O#QThd+wv1w3!yc@NJg zP>G;ti0OE$@HF9x;_1e-1<#pyF2r*+o?G$UgXa-E&)~t&5r~f&v%rR}B0N*@%)+w} zPbHoPJcD?);z2vC+wpA2^Ddqb@O**3O~W$>&tg0^c-G)a;yDQq^4M46xsBJ}Y<>43 zzUNwiWN-MdG5i-A{xisLsWitL;Rz$W-3VV}gs(Kh4>7_Q7~y*v;ggNmIi8 zK0fDBURryz_y}LexnIA>*9q>|FMTPW^`-owFXi{~b#_sS}k+|2UE^FxrP4`E)D+VC}~QXsB*)_7iaAFqP9#uu>|Ur9IF z93)$&lFfj(MtLW}yHa_>@YX6XhqqpO`N!}cs=WUNZ8c0BLh&W}N!Q)CT$q5zd=Bog+^gzO7Sh$L+i zGfVF0n~-HZ-;DARih_Z!B~E4RMTAwVu-cp1V-N8o(8Mk9ZueU2RW_c3pj0!VPrCg; z@-y+JagVPp_;Rrh71tm{=)^AQ;M3rh1jQ;4prL_6_QRK^H+=1dFHMK|+67-OlvyEq z58AG(-RB1ke1)`F{!d6J#=c83iHF#oU|e_cQCO~?$hPAb)gJ-_dzkNmwc`@@V?K{P z0Y>&DUxHQLYW6IzVLt&wdy%igO6!sAWgca}1Y>)R_h3zQBYTr?X77N({g$7G)yZ?Q zrgJ`fAB^tL{3@&|-o!rOx3YhL;e7(N`d?srpYz8#=PzLK?jlzU~vgA7gzHNaUEYKZsp6x?K~px;k9BrKU6%z8^vRMwRncF z5zq5=;$?ogc$FU|KIT#JDUVr#cUmL((N+=PV2$SqYYOkPrty?Diw{_H_-1P%-(nre zPp~TaiPkc{)oS3UT21^+YmlF19m~(Lw(@hW)A0% zex3C$zux)-zsdT5-)w!%ziWNLZ?`%Bfjy1iY0u#I+H?4Q_FVp;y_i2_AIu-IYxtvf zg#U-VhCgAq@Tcu0f5sl*FW4vXpV(XZ&+K#g&+YU1tM--rm-aRMS76k?w!g>Uw(o^# z;rzt^6K(%1McXMp(Wbw&XwzR>wCOJ`+VqzeZTd@#wymycBVSh0hKw1aO&6v`8>I*o zZ8}1WHvRSAA=;>DSG3VbHqk~s4i;@XCP1|5n4v`*D)mGgwZM@Xxr#Q_@INQobY%ge zjrsvuqeUBa1YcUT;R}FsM4SH7qKyCq`2^8MKA&jQg=o=6(I`ZVHvOeVoBkS7wDAw1 zyMKhuolkiI|0f^Czrbe7mwXpt@fpH~&XrP@tAd>c+#pAPg%>vvsQz6&T0}bT7%*x z>sax!wN?DWI$gYGohx3q&KGZ5w~M!|?~C7B+r_)qgW`|YyW&0T58}_(2jVZ*$KnI) z3-O`N#V7VO@u@vSd~VMXU)XakVK25U`(P{IuCYRP#0uMMtWkE0HP%jAN7-}Zqomsvo`8+uxQgU0isRE3@zFK5l^%c$aYk;p@#oC(WWa45N*^CPqa}- zJkf?PL$v8HE!qe`O0<#BC)#u&TC`ELC))Iv7H#@#NYQ33X2M#+Lsl6tu*&%;tC~;5 zoMRVjC7)qM_#T*hlvs!IdDbev$Xd;pSS`HTTE}awR^DhG#aCG!{75UtqgEXAnWK4+ z)yp?p3Cv;o`6*V4pN2Whxz=WWzI8m`W}Sff$tjqZY~{CFXYjkMGx@#NxA>#hIs9?V zV_vW>;4fL1@HebW`J2`i{5|VR{=RiB|HQhEe`eh%@~oT0Nb5E+-TJQB9YUeX`hi$( z-6NW;d&O$&0TG3O=&*hyx~)esJs|zY&jEZ$mi!PCR4%UOaF87lhHD#H-d{#mCm)#HZFrmasmy zMp*x}imcD9@z$3R9L$<#+YlBbtU2~bYoT3W9cYiXD(x}WGJCw$U{A1`?47Madl&0i zd#bh7{)TnBJ;OTJ-pxAS-pjh(o@ssG-pAT*&#@k~=UMOC^Q}MF3#||A{jHB7z`n2# zvbnv~o@STXGwdpRj$LifwO81S?UnYycD-F=H`o!o*vRmx6b`tJ@eWZPo-D+>O z+wF7h4*Pt&%f8Z%+t=7V_HA~r{XL|**WLorh6O*&*Kq)Lr$9^m6q}#zmM8ao!V1{7 Kwd+#^$^QqH0h-$Y diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml index 4e67c619e..a84e1a24f 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositos.jrxml @@ -1,8 +1,8 @@ - - + + @@ -14,6 +14,7 @@ + @@ -27,6 +28,8 @@ + + @@ -45,8 +48,8 @@ - - + + @@ -201,7 +204,7 @@ - + @@ -369,7 +372,7 @@ - + @@ -428,7 +431,7 @@ - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java index 68f3f9eea..1cfe9efee 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioDepositoBean.java @@ -10,12 +10,16 @@ public class RelatorioDepositoBean implements Comparable { private BigDecimal saldo; private BigDecimal vrdeposito; private BigDecimal vrfechamento; + private BigDecimal vrpendente; private Date dtmotivo; private String numdeposito; private String numpuntoventa; private String codigoInstFinanceira; private String nomeInstFinanceira; private Long fechamentocntcorrenteId; + private Boolean somarPendente; + private Integer puntoventaId; + private Integer empresaId; public String getCodigoInstFinanceira() { return codigoInstFinanceira; @@ -58,13 +62,13 @@ public class RelatorioDepositoBean implements Comparable { this.nombempresa = nombempresa; } public BigDecimal getVrdeposito() { - return vrdeposito; + return vrdeposito != null ? vrdeposito : BigDecimal.ZERO; } public void setVrdeposito(BigDecimal vrdeposito) { this.vrdeposito = vrdeposito; } public BigDecimal getVrfechamento() { - return vrfechamento; + return vrfechamento != null ? vrfechamento : BigDecimal.ZERO; } public void setVrfechamento(BigDecimal vrfechamento) { this.vrfechamento = vrfechamento; @@ -111,5 +115,37 @@ public class RelatorioDepositoBean implements Comparable { return 0; } + + public Boolean getSomarPendente() { + return somarPendente != null ? somarPendente : false; + } + + public void setSomarPendente(Boolean somarPendente) { + this.somarPendente = somarPendente; + } + + public BigDecimal getVrpendente() { + return vrpendente != null ? vrpendente : BigDecimal.ZERO; + } + + public void setVrpendente(BigDecimal vrpendente) { + this.vrpendente = vrpendente; + } + + public Integer getPuntoventaId() { + return puntoventaId; + } + + public void setPuntoventaId(Integer puntoventaId) { + this.puntoventaId = puntoventaId; + } + + public Integer getEmpresaId() { + return empresaId; + } + + public void setEmpresaId(Integer empresaId) { + this.empresaId = empresaId; + } }