From 563351d5d3027d3594d5af88c746bdedf4dc3820 Mon Sep 17 00:00:00 2001 From: leonardo Date: Fri, 6 Apr 2018 20:57:46 +0000 Subject: [PATCH] =?UTF-8?q?10464:=20VISA=5F004=20-=20Ajuste=20no=20Relat?= =?UTF-8?q?=C3=B3rio=20Vendas=20Por=20Ag=C3=AAncia=20(retorno)=20fixes=20b?= =?UTF-8?q?ug#10464=20dev:Fred=20qua:Renato?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@80611 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioAgenciaFechamentoAntigo.java | 6 +- .../RelatorioAgenciaFechamentoAntigo.jasper | Bin 51466 -> 51894 bytes .../RelatorioAgenciaFechamentoAntigo.jrxml | 137 ++++++++++-------- 3 files changed, 76 insertions(+), 67 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoAntigo.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoAntigo.java index 74922b1c3..86db92f45 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoAntigo.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoAntigo.java @@ -176,7 +176,7 @@ public class RelatorioAgenciaFechamentoAntigo extends Relatorio { StringBuilder sql = new StringBuilder(); sql.append(" SELECT "); - sql.append(" pv.PUNTOVENTA_ID AS codigo, "); + sql.append(" pv.NUMPUNTOVENTA AS codigo, "); sql.append(" pv.nombpuntoventa AS descricao, "); sql.append(" "); sql.append(" COALESCE(COUNT(CASE WHEN c.MOTIVOCANCELACION_ID IS NULL and (c.INDREMOTOINVERSO is null or c.INDREMOTOINVERSO =0) THEN c.caja_id ELSE NULL END),0) AS qtdevendido, "); @@ -214,8 +214,8 @@ public class RelatorioAgenciaFechamentoAntigo extends Relatorio { sql.append(" AND c.TIPOVENTA_ID <> 6 "); sql.append(" AND c.INDREIMPRESION = 0 "); sql.append(" AND m.empresa_id = :empresaId "); - sql.append(" GROUP BY pv.PUNTOVENTA_ID , pv.nombpuntoventa "); - sql.append(" ORDER BY pv.PUNTOVENTA_ID , pv.nombpuntoventa "); + sql.append(" GROUP BY pv.NUMPUNTOVENTA , pv.nombpuntoventa "); + sql.append(" ORDER BY pv.NUMPUNTOVENTA , pv.nombpuntoventa "); return sql.toString(); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAgenciaFechamentoAntigo.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAgenciaFechamentoAntigo.jasper index ecfc27dfc652907376b728160fe5cf88021b3411..7db4b896c15fc305e5f6a32e0112f752a830a3d4 100644 GIT binary patch delta 10886 zcma)?32+q06^3`D6%rO0q1Dam2BULzpaTIy2uUD;EAFz!2|v;KjMGl=>WeY2Zx>wSm_79K|%LwS{NBWDsCu$^xw3h!r*a1^gOv) z6h5@t5~@L)&ah#BI5#_L75p5HiiDrjQOn@R61{}}47EkKv$pTXT-L~Os|BQ2tTphH zn3~ykuU zh!ZgI*E4Ze`1vR&#+4-~?y; zRhHrHX4a&k$m}QCd^(r2JlrUVmg0t`#5B-l$|X60R+1eQKx%XIf%jx%I4O<0kDSj9 zg+H(6+Pt$(%b|tj#^zf{T}6e|r=cX^*(M1bzhlZY2n*By!j#-m8yP71&y>k<7V0rI zkJaO&{8Tt|I1epRS}EX_Dgdy+YyZzYR<}|4Mz|IEndJ6^?Ct=g_?vtjXG{UQ(6u^< zQ>Tc71u0Q1@I-qGSmcuhb467DLN;~v%(fKb%vM9h)ryE%;F-Nq$TItTp^@3NsaYZh zjP9(K1aZK@08jtfMMnv1q@da3^_a(PeH8n(8F_$ z(8-m?+-s~9ptHeDmq>9xwq$NMnt42Yc4b;piZs=UdR#5Y93TiA!)Ve^^?(Q5*cVnwX z0c;q4TJ2;3-&32Qm-|Gm0=yW&nVHTp@N*UyiWT6zn*tmQ61Xn-f=|cb&(yKyDVc7n zOs4TBjav9G(`3@_g#$OmHH82(pF*+qik#+w&P=5uC$1`T!h$q~ups563%)s3;+!HE zWQc{Uc7Yg-T?-W8O97mj#R_n)D!{QIfnz}e*9Bkj#Tfj7g$6j>JBJsFOW4I-gn{iHmSaKgp zUlRtm0P|8Y7$r*;;JX2wnL!0OR~6t`kifAZf$M@V_@Dq!Tvj5W`<4ml7nUiYe*w_U z98^GaRRN6!2^tF$v@ZBU(>HP6Ti0{TjcR|kT!2qpp#Xmhz?pec0nSwgI2I&uEJ)zG z;0yjF29H~rA}YRmr2s#;QUU%lfHU)=0-UP~a4bmRSdhSV!592R41QphQSsqb9DD)^ zUd`Sp%G;aY0XQ=k72sS|fMY=d$ASc|3%=kNF}Qh+0baUBRDAOqMaAC)aAy9b0OzU# z919XS79?<8VBll$4u@RX%~lZDo%J?O6f@;yqu{>Y2;2wO;_c)$z-HzH1vXa|*jSLT zu^?gV0@_Y~fD3(nZJPcPW+>MFF?*-3HE-8KZ_y5cjt+O1quUOfYQNj$tjih(r$;wC zx|_OMn(QvG5CKAPr>EJm#NljiX%^Dj^|6s4jRC2=WkZX{jx}$$QfE)QBx$$E!1@U7 zHlZ%O&B`6!ZZ8p)IB2gFbl-*q3j_^nmIKoByt!QpMo){pdR^_kUU;K@m!ru+$@O%N z)3go-SMD(+Dm|5);XX=eZ^u`TUH5H93>S{%MMjqN~@3q@{JT2|EhL#S;3YXKtc>GJq{`RB* z7N2M#apceKQPla3_5|uYq$4p%cOFCDdn6`MPl2rH$e@jObR_EFnGF2(j>!0tEEP5N z)ujy;i$qV&nGmD530_32+c>AHqPpCWr#oZ9b$QgBs_KS{g`y*j*KQ|_*HLFYWjpW8 z7i?ifdo;{oi*m)%Mg=Yy)U&P$QFKI1Fm^%f9ZhpuoOb>NiCtL}B7``qp{ikVHGlcY zFS^j%EV3zv?y>^=%wWkEuF3u$Q$9^LB59-B)#b5mZ11)?Ha4~QG&^jrE;{j@wsm%A zvn|(Sngz`=@7S!(;c(m5w{&%Tj2

Bg5OH%hBQLb=c^7;MrvBcH5gAwsj6qpTps_ zb-DVwJ*L?|yhD?#y{E(3O+wveNn`qgXgVQ~5?y2bk9bV?xa}Jpl@5EeqYKU)A})9I zv|rK%gm?2Qk9$lSJaqaW76-@Z6SJqQ#{nmg>c>M5yF1NRKB)dLm`r_N((S4VTAX6v z^Zd^cYfpXBMcTZ+bZ!L*BOAj`(*G5*x2HloL$3DJ##~ahf^&Z)GkS|@qaXKH$Gm>$ zM%P%QxW2lHH0-Fdy6VL>wZ5%QCOz=}z5?qRcIAxg?&+|hH5MK^{V$R1_0i)*ZYGx7 zSLAkI4h6AooS-p1dV~(Elc|Z8J(wKpiz3+z?nwY&Bf{uw@?FAQ-k3d-O<$q!(kXLO zE@fN0$@+iT?xk!NGPG%Y4Cfjv(r4@FT>^ZwDIUu-uM58XO_<-j)p$2DeX9WP-O9k_!o&J%W(F!k*8{2WTvdQ$K?28u1g;Cd;BE}w zyv=xhd~_QF-z3SdgG~!54b3fQDz3x!a95P+PYH__6J*((?2;4A9IRQb2Q6 z0gVL-8VeG%F8D$p643h}Y!#Ir^;5mlVaM|t!v_j}{(DDq=-Je?*){CrfSkf_Aq8fh zQ>4IEMG9DuQow?gf-d-`@SI2i>YlY@vPi?eLrj>*cd!X_Vh4ISG@k`xvBui zf&`8Q30xO^!B1oGM|VykukB{||aQX6tU5}ZWR~6t~Re)nb0>^>`t_!~4 zuVV11^d042gcHwHWYavTGPHGIV76e`DBuI yoOF^XW-a6}nPth(%`Ge}$ScS#EXr%lFUroDGIi)H@@8IyLh$JSjOy#l5&r{lm~x2# delta 10714 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAgenciaFechamentoAntigo.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAgenciaFechamentoAntigo.jrxml index ec964c188..fc1044747 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAgenciaFechamentoAntigo.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAgenciaFechamentoAntigo.jrxml @@ -1,8 +1,12 @@ - - + + + + + + @@ -72,76 +76,80 @@ - + - + + - + - + + - + + - + + - + - + - + - + - + - + - + - + @@ -152,220 +160,220 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -376,49 +384,49 @@ - + - + - + - + - + - + - + @@ -426,52 +434,52 @@ - + - + - + - + - + - + - + - + @@ -482,7 +490,8 @@ - + +