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

fixes bug #9065 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@70900 d1611594-4594-4d17-8e1d-87c2c4800839
master
edgar 2017-06-30 20:29:33 +00:00
parent 3d2abd4741
commit d2750eb2c7
4 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/rjconsultores/ventaboletos/dao/ConferenciaComissaoDAO.java
View File

@ -54,4 +54,6 @@ public interface ConferenciaComissaoDAO extends GenericDAO<Conferencia, Long> {
public DiaConferenciaComissaoVO carregarConferenciaRegistrada(Date datamovimento, Empresa empresa, PuntoVenta puntoVenta) throws BusinessException; public DiaConferenciaComissaoVO carregarConferenciaRegistrada(Date datamovimento, Empresa empresa, PuntoVenta puntoVenta) throws BusinessException;
public Conferencia cancelarChegadaMalote(Conferencia conferencia) ;
} }

8
src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
View File

@ -32,6 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.zkoss.util.resource.Labels;
import com.rjconsultores.ventaboletos.constantes.Constantes; import com.rjconsultores.ventaboletos.constantes.Constantes;
import com.rjconsultores.ventaboletos.dao.ConferenciaComissaoDAO; import com.rjconsultores.ventaboletos.dao.ConferenciaComissaoDAO;
@ -519,6 +520,13 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
} }
} }
@Override
@Transactional
public Conferencia cancelarChegadaMalote(Conferencia conferencia) {
conferencia.setIndmaloterecebido(Boolean.FALSE);
return suscribirOrActualizacion(conferencia);
}
@Override @Override
@Transactional @Transactional
public Conferencia suscribirOrActualizacion(Conferencia entidad) { public Conferencia suscribirOrActualizacion(Conferencia entidad) {

2
src/com/rjconsultores/ventaboletos/service/ConferenciaComissaoService.java
View File

@ -31,6 +31,8 @@ public interface ConferenciaComissaoService extends GenericService<Conferencia,
public Conferencia confirmarChegadaMalote(Conferencia conferencia) throws BusinessException; public Conferencia confirmarChegadaMalote(Conferencia conferencia) throws BusinessException;
public Conferencia cancelarChegadaMalote(Conferencia conferencia);
public Conferencia encerrarMovimentoDiario(Conferencia conferencia) throws BusinessException; public Conferencia encerrarMovimentoDiario(Conferencia conferencia) throws BusinessException;
public List<EventosFinanceirosVO> carregarEventosFinanceiros(Conferencia conferencia) throws BusinessException; public List<EventosFinanceirosVO> carregarEventosFinanceiros(Conferencia conferencia) throws BusinessException;

5
src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java
View File

@ -1001,4 +1001,9 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic
return true; return true;
} }
} }
@Override
public Conferencia cancelarChegadaMalote(Conferencia conferencia) {
return conferenciaComissaoDAO.cancelarChegadaMalote(conferencia);
}
} }