Agregar un identificador de tipo de autorizacion a la solicitud

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

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Tue Dec 06 15:51:46 ECT 2022
+#Wed Dec 14 14:28:24 ECT 2022
 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
-#Tue Dec 06 15:51:39 ECT 2022
+#Wed Dec 14 14:28:19 ECT 2022
 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
-#Tue Dec 06 15:52:13 ECT 2022
+#Wed Dec 14 14:28:44 ECT 2022
 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
-#Tue Dec 06 15:52:05 ECT 2022
+#Wed Dec 14 14:28:38 ECT 2022
 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
-#Tue Dec 06 15:52:07 ECT 2022
+#Wed Dec 14 14:28:40 ECT 2022
 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
-#Tue Dec 06 15:52:01 ECT 2022
+#Wed Dec 14 14:28:35 ECT 2022
 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
-#Tue Dec 06 15:52:06 ECT 2022
+#Wed Dec 14 14:28:39 ECT 2022
 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
-#Tue Dec 06 15:52:09 ECT 2022
+#Wed Dec 14 14:28:42 ECT 2022
 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
-#Tue Dec 06 15:51:57 ECT 2022
+#Wed Dec 14 14:28:32 ECT 2022
 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
-#Tue Dec 06 15:51:41 ECT 2022
+#Wed Dec 14 14:28:20 ECT 2022
 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
-#Tue Dec 06 15:51:56 ECT 2022
+#Wed Dec 14 14:28:31 ECT 2022
 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
-#Tue Dec 06 15:51:23 ECT 2022
+#Wed Dec 14 14:28:06 ECT 2022
 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
-#Tue Dec 06 15:51:20 ECT 2022
+#Wed Dec 14 14:28:04 ECT 2022
 version=2.1
 groupId=com.fp.base.dto
 artifactId=dto

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

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Tue Dec 06 15:52:15 ECT 2022
+#Wed Dec 14 14:28:46 ECT 2022
 version=2.1
 groupId=com.fp.base
 artifactId=facade

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

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Tue Dec 06 15:52:14 ECT 2022
+#Wed Dec 14 14:28:45 ECT 2022
 version=2.1
 groupId=com.fp.base
 artifactId=facadeclient

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

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Tue Dec 06 15:51:33 ECT 2022
+#Wed Dec 14 14:28:14 ECT 2022
 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
-#Tue Dec 06 15:51:54 ECT 2022
+#Wed Dec 14 14:28:30 ECT 2022
 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
-#Tue Dec 06 15:51:25 ECT 2022
+#Wed Dec 14 14:28:07 ECT 2022
 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
-#Tue Dec 06 15:51:37 ECT 2022
+#Wed Dec 14 14:28:17 ECT 2022
 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
-#Tue Dec 06 15:51:50 ECT 2022
+#Wed Dec 14 14:28:27 ECT 2022
 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
-#Tue Dec 06 15:51:31 ECT 2022
+#Wed Dec 14 14:28:12 ECT 2022
 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
-#Tue Dec 06 15:51:47 ECT 2022
+#Wed Dec 14 14:28:25 ECT 2022
 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
-#Tue Dec 06 15:51:49 ECT 2022
+#Wed Dec 14 14:28:26 ECT 2022
 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
-#Tue Dec 06 15:51:38 ECT 2022
+#Wed Dec 14 14:28:18 ECT 2022
 version=2.1
 groupId=com.fp.base.persistence
 artifactId=util

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

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Tue Dec 06 15:51:59 ECT 2022
+#Wed Dec 14 14:28:33 ECT 2022
 version=2.1
 groupId=com.fp.base
 artifactId=sessionbeans

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

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Tue Dec 06 15:52:15 ECT 2022
+#Wed Dec 14 14:28:47 ECT 2022
 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
-#Tue Dec 06 15:52:15 ECT 2022
+#Wed Dec 14 14:28:47 ECT 2022
 version=2.1
 groupId=com.fp.clients.maia
 artifactId=environment-eap6

frontend/src/main/java/com/fp/frontend/controller/AbstractController.java

@@ -733,8 +733,7 @@ public abstract class AbstractController<T extends AbstractDataTransport>
      * @param contentType
      * @param extension
      */
-    public void downloadFile(byte[] fileByte, String contentType,
+    public void downloadFile(byte[] fileByte, String contentType, String extension) {
-            String extension) {
         try {
             int read = 0;
             byte[] bytes = new byte[1024];
@@ -756,7 +755,7 @@ public abstract class AbstractController<T extends AbstractDataTransport>
             out.close();
             context.responseComplete();
         } catch (Exception ex) {
-
+            ex.printStackTrace();
         }
     }
 

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

@@ -433,7 +433,10 @@ public class TramiteArmasController extends AbstractController<AbstractDataTrans
      * codigo del ruc
      */
     private String codigoPasaporte;
-
+    /**
+     * NUMERO BASE DE SOLICITUD
+     */
+    private String numeroSolicitudBase;
     /**
      * Atributo para setear el vendedor
      */
@@ -1196,7 +1199,8 @@ public class TramiteArmasController extends AbstractController<AbstractDataTrans
         if (response.getResponseCode().compareTo(Response.RESPONSE_OK) != 0) {
             MessageHelper.setMessageError(response);
         } else {
-            solicitud.getRecord().setNumerosolicitud(response.get("SECUENCIALSOLICITUD").toString());
+            this.numeroSolicitudBase = response.get("SECUENCIALSOLICITUD").toString();
+            solicitud.getRecord().setNumerosolicitud(this.numeroSolicitudBase);
         }
     }
 
@@ -1409,7 +1413,15 @@ public class TramiteArmasController extends AbstractController<AbstractDataTrans
         this.armas.getRecord().getModifiedData().put("clase", clase.getDescription());
         this.armas.setClase(clase.getPk().getCatalog());
     }
-
+    /**
+     * MODIFICAR EL NUMERO DE SOLICITUD POR TIPO DE TRAMITE
+     */
+    public void setNumeroSolicitudPorTramite(){
+        if(this.tipoAutorizacion.getLegalcode() != null && this.solicitud.getRecord().getNumerosolicitud()!=null){
+            this.solicitud.getRecord().setNumerosolicitud(this.numeroSolicitudBase.concat(this.tipoAutorizacion.getLegalcode()));
+        }
+        
+    }
     /**
      * Regresa del LOV para cargar valores
      *
@@ -1426,11 +1438,14 @@ public class TramiteArmasController extends AbstractController<AbstractDataTrans
             if (!verificaAptitudPersona(tarmTramite)) {
                 return;
             }
-
+                
             this.armas.setTarmTramite(this.tarmTramite);
             solicitud.getRecord().setCtramite(tramite.getPk());
             tipoTramite = CatalogDetailController.findxCodigoCodcatalogo(tramite.getTipotramite(), tramite.getTipotramitecodigo());
             tipoAutorizacion = CatalogDetailController.findxCodigoCodcatalogo(tramite.getTipoautorizacion(), tramite.getTipoautorizacioncodigo());
+            
+            setNumeroSolicitudPorTramite();
+            
             TgeneCatalogDetail categoria = CatalogDetailController.findxCodigoCodcatalogo(tramite.getCategoria(), tramite.getCategoriacodigo());
             actividad = CatalogDetailController.findxCodigoCodcatalogo(tramite.getUsoactividad(), tramite.getUsoactividadcodigo());
             this.getSolicitud().addField("tipoTramite", tipoTramite.getDescription());

frontend/src/main/webapp/pages/armas/armas.xhtml

@@ -103,7 +103,7 @@
 	                    </p:column>
 	                    <p:column styleClass="m-action-column">
 	                    	<p:commandButton value="#{msg_general.btn_delete}" 
-	                    		rendered="#{row.estado == 'REG'}"
+	                    		rendered="#{row.pk == null || row.estado == 'REG'}"
 	                    		update=":formTable:data-content" styleClass="m-action-button" 
 	                    		icon="ui-icon-trash"  action="#{armasController.remove()}" 
 	                    		process="@this, :formTable:data-content">
@@ -253,18 +253,17 @@
 									<h:outputText value="" />
 									
 									<p:outputLabel for="txtSerieLote" value="#{msg_armas.lbl_serielote}:"/>
-									<p:inputText id="txtSerieLote" maxlength="30" value="#{armasController.record.lote}" disabled="#{armasController.showRow}" required="true"/>
+									<p:inputText id="txtSerieLote" value="#{armasController.record.lote}" disabled="#{armasController.showRow}" required="true"/>
 									<h:outputText value="" />
 									
 									<p:outputLabel for="txtSerieCanon" value="#{msg_armas.lbl_seriecanon}:"/>
 									<p:inputText id="txtSerieCanon" value="#{armasController.record.seriecanon}" disabled="#{armasController.showRow}"/>
 									<h:outputText value="" />
-									
+									<h:outputText value=""  />
 									<h:outputText value="" />
-									<h:outputText value="" />
+									<h:outputText value=""  />
-									<h:outputText value="" />
+
-									
+                                                                        <p:outputLabel for="txtCantidad" value="#{msg_armas.lbl_cantidad}:"/>
-									<p:outputLabel for="txtCantidad" value="#{msg_armas.lbl_cantidad}:"/>
 									<pe:inputNumber id="txtCantidad" value="#{armasController.record.cantidad}" disabled="#{armasController.showRow or armasController.bloquearUnidadCantidad}"/>
 									<h:outputText value="" />
 									
@@ -282,17 +281,21 @@
 									
 									<p:outputLabel for="selUnidadMedidaPeso" value="#{msg_armas.lbl_unidadpeso}:"/>
 									<p:inputText id="selUnidadMedidaPeso" value="#{armasController.record.modifiedData['unidadMedidaPeso']}" disabled="true"/>
-                                                                </h:panelGrid>		
+									<h:outputText value="" />
-                                                                <h:panelGrid columns="4" style="width:100%;" >								
+									
-                                                            <p:outputLabel for="observacionmodificacion" rendered="#{!armasController.record.isnew}" value="#{msg_armas.lbl_observacionmodificacion}:"/>
+									<h:outputText value="" />
-                                                                            <p:inputTextarea style="width: 100%" id="observacionmodificacion" rendered="#{!armasController.record.isnew}" value="#{armasController.record.observacionmodificacion}" required="#{!armasController.record.isnew}"/>
+									<h:outputText value="" />
-                                                                        
+									<h:outputText value="" />
+									
 									<!-- documento 3 espacios-->
-						    		<p:outputLabel for="fileUploadCmpt" value="Documento:" 
+						    		
+								</h:panelGrid>
+                                                            <h:panelGrid columns="6">
+                                                                <p:outputLabel for="fileUploadCmpt" value="Documento:" 
 						    		rendered="#{armasController.record.estado=='RPER' or armasController.record.isnew}"/>		
 									<h:panelGrid columns="1" rendered="#{armasController.record.estado=='RPER' or armasController.record.isnew}">
 										<h:outputText value="#{msg_armas['msg_tamano_archivo_requisitos_jpg_png_1']}"  style="color:blue;font-weight: bold;"/>					              		
-                                                                                <p:fileUpload id="fileUploadCmpt" fileUploadListener="#{armasController.handleUpload}" update="descFileUpload"
+						               	<p:fileUpload id="fileUploadCmpt" fileUploadListener="#{armasController.handleUpload}" update="descFileUpload"
 																	allowTypes="/(\.|\/)(pdf|jpeg|jpg|png)$/" description="Seleccionar documento"
 																	fileLimit="1"
 																	required="true"
@@ -303,20 +306,18 @@
 																	invalidSizeMessage="#{msg_armas.lbl_mensajearchivoinvalidom} #{msg_armas.lbl_1mb}" 
 																	fileLimitMessage="#{msg_armas['msg_error_exedeelnumero']}"
 																	sizeLimit="#{msg_armas.lbl_archivounmega}"
-																	/>
+																	/>	
-                                                                
-									
 									</h:panelGrid>
-                                                                </h:panelGrid> 
+                                                                	<h:outputText value="" rendered="#{armasController.uploadedFile != null}" />
-   
+                                                                        <h:panelGrid id="descFileUpload" columns="1" style="width:100%;" 
-                                                                        
+                                                                                rendered="#{armasController.record.estado=='RPER' or armasController.record.isnew}">								
-                                                         
-							</h:panelGroup>               
-				               		<h:panelGrid id="descFileUpload" columns="1" style="width:100%;" 
-				               		rendered="#{armasController.record.estado=='RPER' or armasController.record.isnew}">								
 										<p:outputLabel  value="#{armasController.recorteNombre(armasController.uploadedFile.fileName)}" rendered="#{armasController.uploadedFile != null}"/>
 									</h:panelGrid> 
-								</h:panelGrid>
+                                                                        <p:outputLabel for="txtObservacionModificacion" value="#{msg_armas.lbl_observacionmodificacion}:" rendered="#{!armasController.record.isnew}"/>
+                                                                        <p:inputTextarea rows="3" cols="40" id="txtObservacionModificacion" value="#{armasController.record.observacionmodificacion}" rendered="#{!armasController.record.isnew}" 
+                                                                                     required="#{!armasController.record.isnew}"
+                                                                                     disabled="#{armasController.showRow}"/>
+                                                            </h:panelGrid>
 							</h:panelGroup>
 						</p:panelGrid>
 						<p:panelGrid columns="1">
@@ -418,8 +419,8 @@
 	            			<h:panelGrid columns="2">
 	            				<p:inputText id="documento" value="#{armasController.nuevoPropietarioArma.identification}" disabled="true" required="true"/>
 	        				    <p:commandButton icon="ui-icon-link" styleClass="m-lov-button" actionListener="#{armasController.openLovCambioUsuario}" immediate="true" process="@this" update="@this" >
-									<p:ajax event="dialogReturn" listener="#{armasController.onReturnCambioUsuario}" process="@this" update="tipodocumento documento razonsocial pnlBotones" immediate="true"/>
+							<p:ajax event="dialogReturn" listener="#{armasController.onReturnCambioUsuario}" process="@this" update="tipodocumento documento razonsocial pnlBotones" immediate="true"/>
-								</p:commandButton>
+						    </p:commandButton>
 	            			</h:panelGrid>
 	            			<p:outputLabel for="razonsocial" value="#{msg_armas['lbl_nombrerazonsocial']}:"/>
 							<p:inputText id="razonsocial" value="#{armasController.nuevoPropietarioArma.name}" style="width:350px;" disabled="true"/>