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

Fixes bug #9459 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@74620 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabio 2017-10-09 13:40:59 +00:00
parent c88b368e51
commit a626878484
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java
View File

@ -68,6 +68,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderOcd;
@Scope("prototype") @Scope("prototype")
@Controller("conferenciaController") @Controller("conferenciaController")
@SuppressWarnings({"unchecked", "rawtypes"})
public class ConferenciaController extends MyGenericForwardComposer { public class ConferenciaController extends MyGenericForwardComposer {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -249,7 +250,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
ocdsList.setItemRenderer(new RenderOcd() { ocdsList.setItemRenderer(new RenderOcd() {
@Override @Override
@SuppressWarnings("unchecked")
public void render(Listitem lstm, Object o) throws Exception { public void render(Listitem lstm, Object o) throws Exception {
super.render(lstm, o); super.render(lstm, o);
final OcdVO ocd = (OcdVO) o; final OcdVO ocd = (OcdVO) o;
@ -284,7 +284,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
eventosFinanceirosList.setItemRenderer(new RenderEventosFinanceiros() { eventosFinanceirosList.setItemRenderer(new RenderEventosFinanceiros() {
@Override @Override
@SuppressWarnings("unchecked")
public void render(Listitem lstm, Object o) throws Exception { public void render(Listitem lstm, Object o) throws Exception {
super.render(lstm, o); super.render(lstm, o);
final EventosFinanceirosVO eventoFinanceiro = (EventosFinanceirosVO) o; final EventosFinanceirosVO eventoFinanceiro = (EventosFinanceirosVO) o;
@ -383,7 +382,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
private void ajustarListsBilhetes() { private void ajustarListsBilhetes() {
bilhetesManualList.setItemRenderer(new RenderBoletoComissao() { bilhetesManualList.setItemRenderer(new RenderBoletoComissao() {
@Override @Override
@SuppressWarnings("unchecked")
public void render(Listitem lstm, Object o) throws Exception { public void render(Listitem lstm, Object o) throws Exception {
super.render(lstm, o); super.render(lstm, o);
final BoletoComissao boletoComissao = (BoletoComissao) o; final BoletoComissao boletoComissao = (BoletoComissao) o;
@ -418,7 +416,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
bilhetesList.setItemRenderer(new RenderBoletoComissao() { bilhetesList.setItemRenderer(new RenderBoletoComissao() {
@Override @Override
@SuppressWarnings("unchecked")
public void render(Listitem lstm, Object o) throws Exception { public void render(Listitem lstm, Object o) throws Exception {
super.render(lstm, o); super.render(lstm, o);
final BoletoComissao boletoComissao = (BoletoComissao) o; final BoletoComissao boletoComissao = (BoletoComissao) o;
@ -455,7 +452,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
bilhetesCanceladosList.setItemRenderer(new RenderBoletoComissao() { bilhetesCanceladosList.setItemRenderer(new RenderBoletoComissao() {
@Override @Override
@SuppressWarnings("unchecked")
public void render(Listitem lstm, Object o) throws Exception { public void render(Listitem lstm, Object o) throws Exception {
super.render(lstm, o); super.render(lstm, o);
final BoletoComissao boletoComissao = (BoletoComissao) o; final BoletoComissao boletoComissao = (BoletoComissao) o;
@ -490,7 +486,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
bilhetesDevolvidosList.setItemRenderer(new RenderBoletoComissao() { bilhetesDevolvidosList.setItemRenderer(new RenderBoletoComissao() {
@Override @Override
@SuppressWarnings("unchecked")
public void render(Listitem lstm, Object o) throws Exception { public void render(Listitem lstm, Object o) throws Exception {
super.render(lstm, o); super.render(lstm, o);
final BoletoComissao boletoComissao = (BoletoComissao) o; final BoletoComissao boletoComissao = (BoletoComissao) o;
@ -525,7 +520,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
bilhetesGapList.setItemRenderer(new RenderBoletoComissao() { bilhetesGapList.setItemRenderer(new RenderBoletoComissao() {
@Override @Override
@SuppressWarnings("unchecked")
public void render(Listitem lstm, Object o) throws Exception { public void render(Listitem lstm, Object o) throws Exception {
super.render(lstm, o); super.render(lstm, o);
final BoletoComissao boletoComissao = (BoletoComissao) o; final BoletoComissao boletoComissao = (BoletoComissao) o;
@ -560,7 +554,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
bilhetesGapCanceladosList.setItemRenderer(new RenderBoletoComissao() { bilhetesGapCanceladosList.setItemRenderer(new RenderBoletoComissao() {
@Override @Override
@SuppressWarnings("unchecked")
public void render(Listitem lstm, Object o) throws Exception { public void render(Listitem lstm, Object o) throws Exception {
super.render(lstm, o); super.render(lstm, o);
final BoletoComissao boletoComissao = (BoletoComissao) o; final BoletoComissao boletoComissao = (BoletoComissao) o;
@ -595,7 +588,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
bilhetesGapDevolvidosList.setItemRenderer(new RenderBoletoComissao() { bilhetesGapDevolvidosList.setItemRenderer(new RenderBoletoComissao() {
@Override @Override
@SuppressWarnings("unchecked")
public void render(Listitem lstm, Object o) throws Exception { public void render(Listitem lstm, Object o) throws Exception {
super.render(lstm, o); super.render(lstm, o);
final BoletoComissao boletoComissao = (BoletoComissao) o; final BoletoComissao boletoComissao = (BoletoComissao) o;
@ -710,6 +702,10 @@ public class ConferenciaController extends MyGenericForwardComposer {
for (BoletoComissao b : boletosComissaos) { for (BoletoComissao b : boletosComissaos) {
log.info(b.toString()); log.info(b.toString());
if(b.isMotivocancelacionGeracaoOcd()) {
continue;
}
if (b.getIndCancelacion()) { if (b.getIndCancelacion()) {
if (b.isMotivocancelacionDevolvido()) { if (b.isMotivocancelacionDevolvido()) {
this.lsBilhetesDevolvidos.add(b); this.lsBilhetesDevolvidos.add(b);
@ -1305,7 +1301,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
Labels.getLabel("editarLogConferenciaComissaoController.window.title"), args, MODAL); Labels.getLabel("editarLogConferenciaComissaoController.window.title"), args, MODAL);
} }
@SuppressWarnings("unchecked")
private boolean isObservacaoLancada(BoletoComissao boletoComissao) { private boolean isObservacaoLancada(BoletoComissao boletoComissao) {
for (LogConferenciaVO logConferencia : (List<LogConferenciaVO>) logsConferenciaList.getListData()) { for (LogConferenciaVO logConferencia : (List<LogConferenciaVO>) logsConferenciaList.getListData()) {
; ;
@ -1581,7 +1576,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
lsLogsConferencia.add(logConferenciaVO); lsLogsConferencia.add(logConferenciaVO);
} }
@SuppressWarnings("unchecked")
private void gravarLogConferenciaBilhete(MyListbox bilhetes, BoletoComissao boletoComissao, Tab tab, String label) { private void gravarLogConferenciaBilhete(MyListbox bilhetes, BoletoComissao boletoComissao, Tab tab, String label) {
try { try {
LogConferencia logConferencia = gravarLogConferencia(boletoComissao.getConferencia(), TipoLogConferencia.BOLETO, boletoComissao.getCajaId(), boletoComissao.getNumFolioSistema()); LogConferencia logConferencia = gravarLogConferencia(boletoComissao.getConferencia(), TipoLogConferencia.BOLETO, boletoComissao.getCajaId(), boletoComissao.getNumFolioSistema());
@ -1596,7 +1590,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
} }
} }
@SuppressWarnings("unchecked")
private void removerLogConferenciaBilhete(MyListbox bilhetes, BoletoComissao boletoComissao, Tab tab, String label) { private void removerLogConferenciaBilhete(MyListbox bilhetes, BoletoComissao boletoComissao, Tab tab, String label) {
try { try {
LogConferencia logConferencia = conferenciaComissaoService.obtenerLogConferenciaID(boletoComissao.getLogconferenciaId()); LogConferencia logConferencia = conferenciaComissaoService.obtenerLogConferenciaID(boletoComissao.getLogconferenciaId());
@ -1613,7 +1606,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
} }
} }
@SuppressWarnings("unchecked")
private void gravarLogConferenciaEventoFinanceiro(EventosFinanceirosVO eventoFinanceiro) { private void gravarLogConferenciaEventoFinanceiro(EventosFinanceirosVO eventoFinanceiro) {
try { try {
LogConferencia logConferencia = gravarLogConferencia(eventoFinanceiro.getConferencia(), TipoLogConferencia.EVENTO_FINANCEIRO, eventoFinanceiro.getEventoextraId(), null); LogConferencia logConferencia = gravarLogConferencia(eventoFinanceiro.getConferencia(), TipoLogConferencia.EVENTO_FINANCEIRO, eventoFinanceiro.getEventoextraId(), null);
@ -1628,7 +1620,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
} }
} }
@SuppressWarnings("unchecked")
private void removerLogConferenciaEventoFinanceiro(EventosFinanceirosVO eventoFinanceiro) { private void removerLogConferenciaEventoFinanceiro(EventosFinanceirosVO eventoFinanceiro) {
try { try {
LogConferencia logConferencia = conferenciaComissaoService.obtenerLogConferenciaID(eventoFinanceiro.getLogconferenciaId()); LogConferencia logConferencia = conferenciaComissaoService.obtenerLogConferenciaID(eventoFinanceiro.getLogconferenciaId());
@ -1645,7 +1636,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
} }
} }
@SuppressWarnings("unchecked")
private void gravarLogConferenciaOcd(OcdVO ocd) { private void gravarLogConferenciaOcd(OcdVO ocd) {
try { try {
LogConferencia logConferencia = gravarLogConferencia(ocd.getConferencia(), TipoLogConferencia.OCD, ocd.getOcdId(), null); LogConferencia logConferencia = gravarLogConferencia(ocd.getConferencia(), TipoLogConferencia.OCD, ocd.getOcdId(), null);
@ -1660,7 +1650,6 @@ public class ConferenciaController extends MyGenericForwardComposer {
} }
} }
@SuppressWarnings("unchecked")
private void removerLogConferenciaOcd(OcdVO ocd) { private void removerLogConferenciaOcd(OcdVO ocd) {
try { try {
LogConferencia logConferencia = conferenciaComissaoService.obtenerLogConferenciaID(ocd.getLogconferenciaId()); LogConferencia logConferencia = conferenciaComissaoService.obtenerLogConferenciaID(ocd.getLogconferenciaId());