Merge branch 'alertaArmasPersona'

base/bpm/bpmlib/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:27:36 ECT 2023
+#Wed Feb 01 16:24:02 ECT 2023
 version=2.1
 groupId=com.fp.base.bpm
 artifactId=bpmlib

base/bpm/simple/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:27:30 ECT 2023
+#Wed Feb 01 16:23:57 ECT 2023
 version=2.1
 groupId=com.fp.base.bpm
 artifactId=simple

base/business/armas/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:28:01 ECT 2023
+#Wed Feb 01 16:24:22 ECT 2023
 version=2.1
 groupId=com.fp.base.business
 artifactId=armas

base/business/general/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:27:53 ECT 2023
+#Wed Feb 01 16:24:16 ECT 2023
 version=2.1
 groupId=com.fp.base.business
 artifactId=general

base/business/log/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:27:56 ECT 2023
+#Wed Feb 01 16:24:18 ECT 2023
 version=2.1
 groupId=com.fp.base.business
 artifactId=log

base/business/person/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:27:50 ECT 2023
+#Wed Feb 01 16:24:13 ECT 2023
 version=2.1
 groupId=com.fp.base.business
 artifactId=person

base/business/report/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:27:55 ECT 2023
+#Wed Feb 01 16:24:17 ECT 2023
 version=2.1
 groupId=com.fp.base.business
 artifactId=report

base/business/viaticos/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:27:58 ECT 2023
+#Wed Feb 01 16:24:19 ECT 2023
 version=2.1
 groupId=com.fp.base.business
 artifactId=viaticos

base/core/alfresco-client/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:27:46 ECT 2023
+#Wed Feb 01 16:24:10 ECT 2023
 version=2.1
 groupId=com.fp.base.core
 artifactId=alfresco-client

base/core/bpm/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:27:32 ECT 2023
+#Wed Feb 01 16:23:58 ECT 2023
 version=2.1
 groupId=com.fp.base.core
 artifactId=bpm

base/core/firmas/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:27:45 ECT 2023
+#Wed Feb 01 16:24:09 ECT 2023
 version=2.1
 groupId=com.fp.base.core
 artifactId=firmas

base/dto/common/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:27:18 ECT 2023
+#Wed Feb 01 16:23:44 ECT 2023
 version=2.1
 groupId=com.fp.base.dto
 artifactId=common

base/dto/dto/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:27:15 ECT 2023
+#Wed Feb 01 16:23:42 ECT 2023
 version=2.1
 groupId=com.fp.base.dto
 artifactId=dto

base/facade/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:28:02 ECT 2023
+#Wed Feb 01 16:24:24 ECT 2023
 version=2.1
 groupId=com.fp.base
 artifactId=facade

base/facadeclient/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:28:01 ECT 2023
+#Wed Feb 01 16:24:23 ECT 2023
 version=2.1
 groupId=com.fp.base
 artifactId=facadeclient

base/persistence/commondb/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:27:26 ECT 2023
+#Wed Feb 01 16:23:53 ECT 2023
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=commondb

base/persistence/parmas/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:27:43 ECT 2023
+#Wed Feb 01 16:24:08 ECT 2023
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=parmas

base/persistence/pbpm/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:27:19 ECT 2023
+#Wed Feb 01 16:23:46 ECT 2023
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=pbpm

base/persistence/pcustomer/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:27:28 ECT 2023
+#Wed Feb 01 16:23:55 ECT 2023
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=pcustomer

base/persistence/pfirmas/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:27:40 ECT 2023
+#Wed Feb 01 16:24:05 ECT 2023
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=pfirmas

base/persistence/pgeneral/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:27:24 ECT 2023
+#Wed Feb 01 16:23:51 ECT 2023
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=pgeneral

base/persistence/plog/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:27:38 ECT 2023
+#Wed Feb 01 16:24:03 ECT 2023
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=plog

base/persistence/pviaticos/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:27:39 ECT 2023
+#Wed Feb 01 16:24:05 ECT 2023
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=pviaticos

base/persistence/util/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:27:29 ECT 2023
+#Wed Feb 01 16:23:56 ECT 2023
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=util

base/sessionbeans/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:27:48 ECT 2023
+#Wed Feb 01 16:24:12 ECT 2023
 version=2.1
 groupId=com.fp.base
 artifactId=sessionbeans

clients/comaco/ear/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:28:03 ECT 2023
+#Wed Feb 01 16:24:24 ECT 2023
 version=2.1
 groupId=com.fp.clients.maia
 artifactId=maiaear

clients/comaco/environment-eap6/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Feb 01 16:28:02 ECT 2023
+#Wed Feb 01 16:24:24 ECT 2023
 version=2.1
 groupId=com.fp.clients.maia
 artifactId=environment-eap6

frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ArmasController.java

@@ -1542,7 +1542,7 @@ private String descategoria;
             ArmasController cc = new ArmasController();
             cc.init();
             cc.recperpage = 1000;
-            cc.addFilter("carma", carma);
+            cc.addFilter("pk", carma);
             cc.querydatabaseFechaMax();
             if ((cc.lrecord != null) && !cc.lrecord.isEmpty()) {
                 return cc.lrecord;
@@ -2356,8 +2356,8 @@ private String descategoria;
         numeroDocumento = personaDetailSelecionada.getIdentification();
         filtroPersona = " and t.cregistro in (select i.pk from TarmRegistroArmas i where i.personcode ="
                 + personaDetailSelecionada.getPk().getPersoncode() + ")";
-        querydatabase();
         obtenerArmas(personaDetailSelecionada);
+        querydatabase();
 
     }
     
@@ -2425,7 +2425,7 @@ private String descategoria;
                tramite = TarmTramiteController.findSimple(tarmSolicitud.getCtramite().toString());
                 if(tramite.getNumeromaxarmas() != null){
                     numMaxArmas = tramite.getNumeromaxarmas().intValue();
-                    lstSolicitudArmas = TarmSolicitudArmasController.findPorCSolicitud(longitud);
+                    lstSolicitudArmas = TarmSolicitudArmasController.findPorCSolicitud(tarmSolicitud.getPk());
                     if(lstSolicitudArmas!= null && !lstSolicitudArmas.isEmpty()){
                         for (TarmSolicitudArmas solicitudArma : lstSolicitudArmas) {
                             lArmasSolicitud = ArmasController.findxCarma(solicitudArma.getPk().getCarma());

frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/CargarDepositoController.java

@@ -438,12 +438,17 @@ public class CargarDepositoController extends AbstractController<TarmSolicitudTr
      * Metodo para validar el comprobante de deposito/
      */
     public void validarComprobanteDeposito() {
-        List<TarmSolicitudTramite> usandoComprobanteList = SolicitudTramiteController.findByNumeroComprobante(this.record.getNumerocomprobante().trim());
-        if (usandoComprobanteList != null && usandoComprobanteList.size() > 0) {
-            isTrueNComprobante = Boolean.FALSE;
-            MessageHelper.setMessageError(MsgControlArmas.getProperty("msg_error_comprobanteDepositoUsado"));
-        } else {
-            isTrueNComprobante = Boolean.TRUE;
+        this.record.setNumerocomprobante(this.record.getNumerocomprobante().replaceAll(" ", ""));
+        String []data = this.record.getNumerocomprobante().split("-");
+        for(String s: data){
+            List<TarmSolicitudTramite> usandoComprobanteList = SolicitudTramiteController.findByNumeroComprobante(s);
+            if (usandoComprobanteList != null && usandoComprobanteList.size() > 0) {
+                isTrueNComprobante = Boolean.FALSE;
+                MessageHelper.setMessageError(MsgControlArmas.getProperty("msg_error_comprobanteDepositoUsado"));
+                break;
+            } else {
+                isTrueNComprobante = Boolean.TRUE;
+            }
         }
     }
 

frontend/src/main/java/com/fp/frontend/controller/security/LoginController.java

@@ -341,7 +341,7 @@ public class LoginController {
                             MessageHelper.setMessageInfo(String.format("Documento %s, perteneciente a %s expira el %s.",doc.getNumerodocumento(), personaPermiso.getName(), doc.getFechaexpiracion()));
  
                         }
-                        RequestContext.getCurrentInstance().execute("PF('advicesDialog').show()");
+                        //RequestContext.getCurrentInstance().execute("PF('advicesDialog').show()");
                     }
                 }
     }