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

0023469: Adamantina - GLPI - 42846 Prestação de contas - conferencia de movimento 

bug#23469
dev:wallace
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@109366 d1611594-4594-4d17-8e1d-87c2c4800839
master
valdir 2021-10-29 13:41:35 +00:00
parent 796e652b91
commit 6671521bd1
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,6 +282,23 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
if (parametros.containsKey("puntoventaId")) { if (parametros.containsKey("puntoventaId")) {
sQuery.append("AND PV.PUNTOVENTA_ID = ? "); sQuery.append("AND PV.PUNTOVENTA_ID = ? ");
} }
sQuery.append(" UNION ")
.append(" SELECT PV.PUNTOVENTA_ID AS \"puntoventaId\", PV.NUMPUNTOVENTA as \"numPuntoVenta\", ")
.append(" PV.NOMBPUNTOVENTA as \"nombpuntoventa\", TO_DATE(C.FECCORTE, 'DD/MM/YY') as \"datamovimento\" ")
.append(" FROM EVENTO_EXTRA ee ")
.append(" INNER JOIN CAJA_DIVERSOS C ON C.EVENTOEXTRA_ID = EE.EVENTOEXTRA_ID ")
.append(" INNER JOIN punto_venta pv ON ee.puntoventa_id = pv.puntoventa_id ")
.append(" WHERE ee.activo = 1")
.append(" AND C.FECCORTE BETWEEN TO_DATE(?, 'DD/MM/YYYY HH24:MI') AND TO_DATE(?, 'DD/MM/YYYY HH24:MI') ");
if (parametros.containsKey("empresaId")) {
sQuery.append("AND ee.EMPRESA_ID = ? ");
}
if (parametros.containsKey("puntoventaId")) {
sQuery.append("AND PV.PUNTOVENTA_ID = ? ");
}
sQuery.append("GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, TO_DATE(C.FECCORTE, 'DD/MM/YY') "); sQuery.append("GROUP BY PV.PUNTOVENTA_ID, PV.NUMPUNTOVENTA, PV.NOMBPUNTOVENTA, TO_DATE(C.FECCORTE, 'DD/MM/YY') ");
@ -298,6 +315,18 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
if (parametros.containsKey("puntoventaId") && ((Integer)parametros.get("puntoventaId")) != -1) { if (parametros.containsKey("puntoventaId") && ((Integer)parametros.get("puntoventaId")) != -1) {
stmt.setInt(idxParametro++, (Integer) parametros.get("puntoventaId")); stmt.setInt(idxParametro++, (Integer) parametros.get("puntoventaId"));
} }
//Parametros Evento extra
stmt.setString(idxParametro++, dataIncial);
stmt.setString(idxParametro++, dataFinal);
if (parametros.containsKey("empresaId")) {
stmt.setInt(idxParametro++, (Integer) parametros.get("empresaId"));
}
if (parametros.containsKey("puntoventaId") && ((Integer)parametros.get("puntoventaId")) != -1) {
stmt.setInt(idxParametro++, (Integer) parametros.get("puntoventaId"));
}
rset = stmt.executeQuery(); rset = stmt.executeQuery();
List<ConferenciaComissaoVO> movimentos = new ArrayList<ConferenciaComissaoVO>(); List<ConferenciaComissaoVO> movimentos = new ArrayList<ConferenciaComissaoVO>();
@ -797,6 +826,10 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
@Transactional @Transactional
public void borrarLogConferencia(LogConferencia logConferencia) throws BusinessException { public void borrarLogConferencia(LogConferencia logConferencia) throws BusinessException {
try { try {
if(logConferencia == null) {
return;
}
if (logConferencia.getContaCorrentePtoVta() != null) { if (logConferencia.getContaCorrentePtoVta() != null) {
ContaCorrentePtoVta contaCorrentePtoVta = logConferencia.getContaCorrentePtoVta(); ContaCorrentePtoVta contaCorrentePtoVta = logConferencia.getContaCorrentePtoVta();
contaCorrentePtoVta.setActivo(Boolean.FALSE); contaCorrentePtoVta.setActivo(Boolean.FALSE);