diff --git a/base/bpm/bpmlib/target/bpmlib-2.1.jar b/base/bpm/bpmlib/target/bpmlib-2.1.jar index c8fe5b0..a693557 100644 Binary files a/base/bpm/bpmlib/target/bpmlib-2.1.jar and b/base/bpm/bpmlib/target/bpmlib-2.1.jar differ diff --git a/base/bpm/bpmlib/target/maven-archiver/pom.properties b/base/bpm/bpmlib/target/maven-archiver/pom.properties index 7070fc1..6186d7b 100644 --- a/base/bpm/bpmlib/target/maven-archiver/pom.properties +++ b/base/bpm/bpmlib/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:53:00 ECT 2022 +#Mon Oct 31 16:00:16 ECT 2022 version=2.1 groupId=com.fp.base.bpm artifactId=bpmlib diff --git a/base/bpm/simple/target/maven-archiver/pom.properties b/base/bpm/simple/target/maven-archiver/pom.properties index e649b31..ad05358 100644 --- a/base/bpm/simple/target/maven-archiver/pom.properties +++ b/base/bpm/simple/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:52:54 ECT 2022 +#Mon Oct 31 16:00:10 ECT 2022 version=2.1 groupId=com.fp.base.bpm artifactId=simple diff --git a/base/bpm/simple/target/simple-2.1.jar b/base/bpm/simple/target/simple-2.1.jar index adaee9f..aab544c 100644 Binary files a/base/bpm/simple/target/simple-2.1.jar and b/base/bpm/simple/target/simple-2.1.jar differ diff --git a/base/business/armas/src/main/java/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.java b/base/business/armas/src/main/java/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.java index 6f30bee..f43f902 100644 --- a/base/business/armas/src/main/java/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.java +++ b/base/business/armas/src/main/java/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.java @@ -19,6 +19,7 @@ import com.fp.persistence.pgeneral.gene.TgeneCatalogDetail; import com.fp.persistence.pgeneral.gene.TgeneCity; import com.fp.persistence.pgeneral.gene.TgeneCityKey; import com.fp.persistence.pgeneral.gene.TgeneParameters; +import com.fp.persistence.pgeneral.gene.TgeneParametersKey; import com.fp.persistence.pgeneral.gene.TgeneSolicitude; import com.fp.sessionbeans.helper.Sequence; import java.io.BufferedReader; @@ -34,6 +35,7 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.logging.Level; import javax.annotation.PostConstruct; import javax.ejb.Schedule; import javax.ejb.Singleton; @@ -63,9 +65,9 @@ import org.w3c.dom.Element; public class ScheduleXMLSolicitud { private final Logger LOG = Logger.getLogger(ScheduleNotificacionCliente.class.getName()); - private EntityManagerFactory emf; + @PostConstruct private final void crearManager() { try { @@ -140,12 +142,10 @@ public class ScheduleXMLSolicitud { String serie = facturaObj[25] != null ? facturaObj[25].toString().replace("-", "") : noDisponible; crearAgregarHijo(doc, factura, "serie", serie); - //Fecha de emision SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy"); String fechaEmision = sdf.format(Calendar.getInstance().getTime()); crearAgregarHijo(doc, factura, "fecha", fechaEmision); - /** * ============================= DATOS DE PERSONA */ @@ -155,7 +155,6 @@ public class ScheduleXMLSolicitud { crearAgregarHijo(doc, factura, "tipoIdComprador", tipoDocumento); crearAgregarHijo(doc, factura, "razonSocialComprador", nombre); crearAgregarHijo(doc, factura, "identificacionComprador", identificacion); - /** * Direccion */ @@ -194,8 +193,6 @@ public class ScheduleXMLSolicitud { /** * ========================= Detalles ================================ */ - - // aun no estoy seguro de esos datos String []servicio = facturaObj[23] != null ? facturaObj[23].toString().split("-"): null; String codigoPrincipal = servicio != null ? servicio[0].toString() : ""; /**===> IMPORTANTE REVISAR*/ String descripcion = servicio != null ? servicio[1].toString() : "";/**===> IMPORTANTE REVISAR*/ @@ -323,23 +320,31 @@ public class ScheduleXMLSolicitud { .getResultList(); return lstPath.get(0); } - @Schedule(second = "1", minute = "1,10,20,30,40,50", hour = "*", persistent = false) + public TgeneParameters obtenerParametro(String code, EntityManager entityManager) throws Exception{ + return TgeneParameters.find(entityManager, new TgeneParametersKey(code, 1)); + } + @Schedule( hour = "*",second = "0", minute = "1,10,20,30,40,50", persistent = false) public void generarXMLs() { try { - StringBuilder comandoParametro = new StringBuilder("select t from TgeneParameters t WHERE t.pk.code = :code AND t.pk.companycode = :companycode "); - EntityManager entityManager = emf.createEntityManager(); - TgeneParameters tParameter = obtenerParametroSQL("PATHFACTURASXML", comandoParametro, entityManager); + EntityManager entityManager = emf.createEntityManager(); + + TgeneParameters ejecucion = obtenerParametro("PATHFACTURASXML", entityManager); + + if(ejecucion.getNumbervalue().compareTo(BigDecimal.ZERO) == 0){ + throw new Exception(new Date().toString().concat(": Ejecucion de la facturacion desactivada")); + } + + TgeneParameters tParameter = obtenerParametro("PATHFACTURASXML", entityManager); String folderPath = tParameter.getTextvalue(); SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy HHmmss"); String fechaActual = sdf.format(Calendar.getInstance().getTime()).replace(" ", "_"); folderPath = folderPath.concat(fechaActual).concat("/"); - //TgeneParameters sequence = obtenerParametroSQL("SECUENCIAFACTURA", comandoParametro, entityManager); - TgeneParameters rucComaco = obtenerParametroSQL("RUCCOMACO", comandoParametro, entityManager); - TgeneParameters custodio = obtenerParametroSQL("CUSTODIOSFACTURA", comandoParametro, entityManager); + TgeneParameters rucComaco = obtenerParametro("RUCCOMACO", entityManager); + TgeneParameters custodio = obtenerParametro("CUSTODIOSFACTURA",entityManager); StringBuilder strSolicitud = new StringBuilder( "SELECT t.CSOLICITUD, t.NUMEROSOLICITUD, p.PERSONCODE FROM TARMSOLICITUD t\n" + "LEFT JOIN TARMSOLICITUDTRAMITE t2 \n" @@ -385,11 +390,10 @@ public class ScheduleXMLSolicitud { carpetaBase.mkdirs(); Query q = null; StringBuilder insertAuditoria = new StringBuilder("INSERT INTO TARMINVOICEHISTORY\n" + - "(ID, USERCODE, REGISTRATIONDATE, CSOLICITUD, SOLICITUDNUMBER, TRAMITENUMBER, PATHFILE, CONTENTFILE)\n" + - "VALUES(:id, :usercode, (select now()), :csolicitud, :solicitudnumber, :tramitenumber, :pathfile, :content)" + "(USERCODE, REGISTRATIONDATE, CSOLICITUD, SOLICITUDNUMBER, TRAMITENUMBER, PATHFILE, CONTENTFILE)\n" + + "VALUES (:usercode, now(), :csolicitud, :solicitudnumber, :tramitenumber, :pathfile, :content)" ); - int id = 0; List lstFilaId = new ArrayList<>(); String pathFactura = null; for (Object[] solicitudesPers : lstSolicitudesPersona) { @@ -486,8 +490,7 @@ public class ScheduleXMLSolicitud { .setParameter("ccentro", codigoCentro); q.executeUpdate(); try { - id = obtenerIdAuditoria(entityManager, lstFilaId, id); - guardarAuditoriaXML(q, entityManager, insertAuditoria.toString(), id, "BATCH", cSolicitud, + guardarAuditoriaXML(q, entityManager, insertAuditoria.toString(), "BATCH", cSolicitud, factura[1]!= null ? factura[1].toString() : null, null, pathFactura, obtenerContenidoArchivo(pathFactura)); } catch (Exception e) { @@ -501,7 +504,7 @@ public class ScheduleXMLSolicitud { } catch (Exception ex) { - System.out.println("Error al guardar el parametro >>>> " + ex.toString()); + System.out.println("Error de ejecucion de facturacion automatica >>>> " + ex.toString()); ex.printStackTrace(); } @@ -518,10 +521,9 @@ public class ScheduleXMLSolicitud { } public void guardarAuditoriaXML(Query q, EntityManager entityManager, String sUpdate, - int id, String usercode, String csolicitud, String solicitudnumber, String tramitenumber, String pathfile, + String usercode, String csolicitud, String solicitudnumber, String tramitenumber, String pathfile, String content){ q = entityManager.createNativeQuery(sUpdate) - .setParameter("id", id) .setParameter("usercode", usercode) .setParameter("csolicitud", csolicitud) .setParameter("solicitudnumber", solicitudnumber) diff --git a/base/business/armas/target/armas-2.1.jar b/base/business/armas/target/armas-2.1.jar index 259f704..ffc5afe 100644 Binary files a/base/business/armas/target/armas-2.1.jar and b/base/business/armas/target/armas-2.1.jar differ diff --git a/base/business/armas/target/classes/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.class b/base/business/armas/target/classes/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.class index 5725a92..7b2777d 100644 Binary files a/base/business/armas/target/classes/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.class and b/base/business/armas/target/classes/com/fp/armas/rules/query/solicitud/ScheduleXMLSolicitud.class differ diff --git a/base/business/armas/target/maven-archiver/pom.properties b/base/business/armas/target/maven-archiver/pom.properties index 8fc7e29..ee6a927 100644 --- a/base/business/armas/target/maven-archiver/pom.properties +++ b/base/business/armas/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:53:21 ECT 2022 +#Mon Oct 31 16:00:43 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=armas diff --git a/base/business/general/target/general-2.1.jar b/base/business/general/target/general-2.1.jar index 253fd90..d6915a8 100644 Binary files a/base/business/general/target/general-2.1.jar and b/base/business/general/target/general-2.1.jar differ diff --git a/base/business/general/target/maven-archiver/pom.properties b/base/business/general/target/maven-archiver/pom.properties index 7a02702..b086163 100644 --- a/base/business/general/target/maven-archiver/pom.properties +++ b/base/business/general/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:53:15 ECT 2022 +#Mon Oct 31 16:00:35 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=general diff --git a/base/business/log/target/log-2.1.jar b/base/business/log/target/log-2.1.jar index d340d38..b01fd78 100644 Binary files a/base/business/log/target/log-2.1.jar and b/base/business/log/target/log-2.1.jar differ diff --git a/base/business/log/target/maven-archiver/pom.properties b/base/business/log/target/maven-archiver/pom.properties index 24fd476..bc62b75 100644 --- a/base/business/log/target/maven-archiver/pom.properties +++ b/base/business/log/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:53:17 ECT 2022 +#Mon Oct 31 16:00:38 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=log diff --git a/base/business/person/target/maven-archiver/pom.properties b/base/business/person/target/maven-archiver/pom.properties index ccde666..30185aa 100644 --- a/base/business/person/target/maven-archiver/pom.properties +++ b/base/business/person/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:53:12 ECT 2022 +#Mon Oct 31 16:00:30 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=person diff --git a/base/business/person/target/person-2.1.jar b/base/business/person/target/person-2.1.jar index bfb1e31..249df1d 100644 Binary files a/base/business/person/target/person-2.1.jar and b/base/business/person/target/person-2.1.jar differ diff --git a/base/business/report/target/maven-archiver/pom.properties b/base/business/report/target/maven-archiver/pom.properties index 5fcd972..0fbe4dc 100644 --- a/base/business/report/target/maven-archiver/pom.properties +++ b/base/business/report/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:53:16 ECT 2022 +#Mon Oct 31 16:00:36 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=report diff --git a/base/business/report/target/report-2.1.jar b/base/business/report/target/report-2.1.jar index 9c79325..4949a14 100644 Binary files a/base/business/report/target/report-2.1.jar and b/base/business/report/target/report-2.1.jar differ diff --git a/base/business/viaticos/target/maven-archiver/pom.properties b/base/business/viaticos/target/maven-archiver/pom.properties index c043596..1f043d7 100644 --- a/base/business/viaticos/target/maven-archiver/pom.properties +++ b/base/business/viaticos/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:53:18 ECT 2022 +#Mon Oct 31 16:00:40 ECT 2022 version=2.1 groupId=com.fp.base.business artifactId=viaticos diff --git a/base/business/viaticos/target/viaticos-2.1.jar b/base/business/viaticos/target/viaticos-2.1.jar index d375c97..4b36311 100644 Binary files a/base/business/viaticos/target/viaticos-2.1.jar and b/base/business/viaticos/target/viaticos-2.1.jar differ diff --git a/base/core/alfresco-client/target/alfresco-client-2.1.jar b/base/core/alfresco-client/target/alfresco-client-2.1.jar index 267ad91..20ad774 100644 Binary files a/base/core/alfresco-client/target/alfresco-client-2.1.jar and b/base/core/alfresco-client/target/alfresco-client-2.1.jar differ diff --git a/base/core/alfresco-client/target/maven-archiver/pom.properties b/base/core/alfresco-client/target/maven-archiver/pom.properties index a69c47e..c3cef67 100644 --- a/base/core/alfresco-client/target/maven-archiver/pom.properties +++ b/base/core/alfresco-client/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:53:09 ECT 2022 +#Mon Oct 31 16:00:26 ECT 2022 version=2.1 groupId=com.fp.base.core artifactId=alfresco-client diff --git a/base/core/bpm/target/bpm-2.1.jar b/base/core/bpm/target/bpm-2.1.jar index aecd23a..4c3aeb4 100644 Binary files a/base/core/bpm/target/bpm-2.1.jar and b/base/core/bpm/target/bpm-2.1.jar differ diff --git a/base/core/bpm/target/maven-archiver/pom.properties b/base/core/bpm/target/maven-archiver/pom.properties index 50c3ae7..2c7da0b 100644 --- a/base/core/bpm/target/maven-archiver/pom.properties +++ b/base/core/bpm/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:52:56 ECT 2022 +#Mon Oct 31 16:00:11 ECT 2022 version=2.1 groupId=com.fp.base.core artifactId=bpm diff --git a/base/core/firmas/target/firmas-2.1.jar b/base/core/firmas/target/firmas-2.1.jar index aaf8b3c..3ff39ae 100644 Binary files a/base/core/firmas/target/firmas-2.1.jar and b/base/core/firmas/target/firmas-2.1.jar differ diff --git a/base/core/firmas/target/maven-archiver/pom.properties b/base/core/firmas/target/maven-archiver/pom.properties index f137b45..b44c7e8 100644 --- a/base/core/firmas/target/maven-archiver/pom.properties +++ b/base/core/firmas/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:53:08 ECT 2022 +#Mon Oct 31 16:00:25 ECT 2022 version=2.1 groupId=com.fp.base.core artifactId=firmas diff --git a/base/dto/common/target/common-2.1.jar b/base/dto/common/target/common-2.1.jar index 67ada14..2e459dc 100644 Binary files a/base/dto/common/target/common-2.1.jar and b/base/dto/common/target/common-2.1.jar differ diff --git a/base/dto/common/target/maven-archiver/pom.properties b/base/dto/common/target/maven-archiver/pom.properties index e2db770..d24b57f 100644 --- a/base/dto/common/target/maven-archiver/pom.properties +++ b/base/dto/common/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:52:39 ECT 2022 +#Mon Oct 31 15:59:54 ECT 2022 version=2.1 groupId=com.fp.base.dto artifactId=common diff --git a/base/dto/dto/target/dto-2.1.jar b/base/dto/dto/target/dto-2.1.jar index 4e008b1..8ca2369 100644 Binary files a/base/dto/dto/target/dto-2.1.jar and b/base/dto/dto/target/dto-2.1.jar differ diff --git a/base/dto/dto/target/maven-archiver/pom.properties b/base/dto/dto/target/maven-archiver/pom.properties index 2eeed5c..1e8f84a 100644 --- a/base/dto/dto/target/maven-archiver/pom.properties +++ b/base/dto/dto/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:52:37 ECT 2022 +#Mon Oct 31 15:59:51 ECT 2022 version=2.1 groupId=com.fp.base.dto artifactId=dto diff --git a/base/facade/target/facade-2.1.jar b/base/facade/target/facade-2.1.jar index 7d69701..e15ce90 100644 Binary files a/base/facade/target/facade-2.1.jar and b/base/facade/target/facade-2.1.jar differ diff --git a/base/facade/target/maven-archiver/pom.properties b/base/facade/target/maven-archiver/pom.properties index 44ef3e4..5f924eb 100644 --- a/base/facade/target/maven-archiver/pom.properties +++ b/base/facade/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:53:23 ECT 2022 +#Mon Oct 31 16:00:45 ECT 2022 version=2.1 groupId=com.fp.base artifactId=facade diff --git a/base/facadeclient/target/facadeclient-2.1.jar b/base/facadeclient/target/facadeclient-2.1.jar index 594366f..b43b245 100644 Binary files a/base/facadeclient/target/facadeclient-2.1.jar and b/base/facadeclient/target/facadeclient-2.1.jar differ diff --git a/base/facadeclient/target/maven-archiver/pom.properties b/base/facadeclient/target/maven-archiver/pom.properties index 1624c74..d0f1fc5 100644 --- a/base/facadeclient/target/maven-archiver/pom.properties +++ b/base/facadeclient/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:53:22 ECT 2022 +#Mon Oct 31 16:00:44 ECT 2022 version=2.1 groupId=com.fp.base artifactId=facadeclient diff --git a/base/persistence/commondb/target/commondb-2.1.jar b/base/persistence/commondb/target/commondb-2.1.jar index 3c1e867..8c8d15f 100644 Binary files a/base/persistence/commondb/target/commondb-2.1.jar and b/base/persistence/commondb/target/commondb-2.1.jar differ diff --git a/base/persistence/commondb/target/maven-archiver/pom.properties b/base/persistence/commondb/target/maven-archiver/pom.properties index 2d9261e..6aeacb2 100644 --- a/base/persistence/commondb/target/maven-archiver/pom.properties +++ b/base/persistence/commondb/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:52:49 ECT 2022 +#Mon Oct 31 16:00:04 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=commondb diff --git a/base/persistence/parmas/target/maven-archiver/pom.properties b/base/persistence/parmas/target/maven-archiver/pom.properties index 1a0911d..a7169cf 100644 --- a/base/persistence/parmas/target/maven-archiver/pom.properties +++ b/base/persistence/parmas/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:53:06 ECT 2022 +#Mon Oct 31 16:00:23 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=parmas diff --git a/base/persistence/parmas/target/parmas-2.1.jar b/base/persistence/parmas/target/parmas-2.1.jar index f7a90ce..3400e2c 100644 Binary files a/base/persistence/parmas/target/parmas-2.1.jar and b/base/persistence/parmas/target/parmas-2.1.jar differ diff --git a/base/persistence/pbpm/target/maven-archiver/pom.properties b/base/persistence/pbpm/target/maven-archiver/pom.properties index b9bb411..9972004 100644 --- a/base/persistence/pbpm/target/maven-archiver/pom.properties +++ b/base/persistence/pbpm/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:52:41 ECT 2022 +#Mon Oct 31 15:59:56 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=pbpm diff --git a/base/persistence/pbpm/target/pbpm-2.1.jar b/base/persistence/pbpm/target/pbpm-2.1.jar index b00bf0a..fb2956a 100644 Binary files a/base/persistence/pbpm/target/pbpm-2.1.jar and b/base/persistence/pbpm/target/pbpm-2.1.jar differ diff --git a/base/persistence/pcustomer/target/maven-archiver/pom.properties b/base/persistence/pcustomer/target/maven-archiver/pom.properties index 53d24eb..82be962 100644 --- a/base/persistence/pcustomer/target/maven-archiver/pom.properties +++ b/base/persistence/pcustomer/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:52:52 ECT 2022 +#Mon Oct 31 16:00:07 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=pcustomer diff --git a/base/persistence/pcustomer/target/pcustomer-2.1.jar b/base/persistence/pcustomer/target/pcustomer-2.1.jar index 11f3dcc..6df6ab7 100644 Binary files a/base/persistence/pcustomer/target/pcustomer-2.1.jar and b/base/persistence/pcustomer/target/pcustomer-2.1.jar differ diff --git a/base/persistence/pfirmas/target/maven-archiver/pom.properties b/base/persistence/pfirmas/target/maven-archiver/pom.properties index 8e31171..1d7a969 100644 --- a/base/persistence/pfirmas/target/maven-archiver/pom.properties +++ b/base/persistence/pfirmas/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:53:03 ECT 2022 +#Mon Oct 31 16:00:20 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=pfirmas diff --git a/base/persistence/pfirmas/target/pfirmas-2.1.jar b/base/persistence/pfirmas/target/pfirmas-2.1.jar index 2a69293..e4ff99c 100644 Binary files a/base/persistence/pfirmas/target/pfirmas-2.1.jar and b/base/persistence/pfirmas/target/pfirmas-2.1.jar differ diff --git a/base/persistence/pgeneral/target/maven-archiver/pom.properties b/base/persistence/pgeneral/target/maven-archiver/pom.properties index edf0d9d..1b00497 100644 --- a/base/persistence/pgeneral/target/maven-archiver/pom.properties +++ b/base/persistence/pgeneral/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:52:47 ECT 2022 +#Mon Oct 31 16:00:02 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=pgeneral diff --git a/base/persistence/pgeneral/target/pgeneral-2.1.jar b/base/persistence/pgeneral/target/pgeneral-2.1.jar index f762477..cd9887d 100644 Binary files a/base/persistence/pgeneral/target/pgeneral-2.1.jar and b/base/persistence/pgeneral/target/pgeneral-2.1.jar differ diff --git a/base/persistence/plog/target/maven-archiver/pom.properties b/base/persistence/plog/target/maven-archiver/pom.properties index 44e70e5..436e99c 100644 --- a/base/persistence/plog/target/maven-archiver/pom.properties +++ b/base/persistence/plog/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:53:01 ECT 2022 +#Mon Oct 31 16:00:17 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=plog diff --git a/base/persistence/plog/target/plog-2.1.jar b/base/persistence/plog/target/plog-2.1.jar index 7bc404f..36292fb 100644 Binary files a/base/persistence/plog/target/plog-2.1.jar and b/base/persistence/plog/target/plog-2.1.jar differ diff --git a/base/persistence/pviaticos/target/maven-archiver/pom.properties b/base/persistence/pviaticos/target/maven-archiver/pom.properties index 690cdb5..228751c 100644 --- a/base/persistence/pviaticos/target/maven-archiver/pom.properties +++ b/base/persistence/pviaticos/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:53:03 ECT 2022 +#Mon Oct 31 16:00:19 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=pviaticos diff --git a/base/persistence/pviaticos/target/pviaticos-2.1.jar b/base/persistence/pviaticos/target/pviaticos-2.1.jar index ea2bd11..83bcd4a 100644 Binary files a/base/persistence/pviaticos/target/pviaticos-2.1.jar and b/base/persistence/pviaticos/target/pviaticos-2.1.jar differ diff --git a/base/persistence/util/target/maven-archiver/pom.properties b/base/persistence/util/target/maven-archiver/pom.properties index 6fbfc04..52afb96 100644 --- a/base/persistence/util/target/maven-archiver/pom.properties +++ b/base/persistence/util/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:52:53 ECT 2022 +#Mon Oct 31 16:00:09 ECT 2022 version=2.1 groupId=com.fp.base.persistence artifactId=util diff --git a/base/persistence/util/target/util-2.1.jar b/base/persistence/util/target/util-2.1.jar index 0f16c2a..eb65329 100644 Binary files a/base/persistence/util/target/util-2.1.jar and b/base/persistence/util/target/util-2.1.jar differ diff --git a/base/sessionbeans/target/maven-archiver/pom.properties b/base/sessionbeans/target/maven-archiver/pom.properties index 462b030..b923b74 100644 --- a/base/sessionbeans/target/maven-archiver/pom.properties +++ b/base/sessionbeans/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:53:10 ECT 2022 +#Mon Oct 31 16:00:28 ECT 2022 version=2.1 groupId=com.fp.base artifactId=sessionbeans diff --git a/base/sessionbeans/target/sessionbeans-2.1.jar b/base/sessionbeans/target/sessionbeans-2.1.jar index 985aac9..e0bb519 100644 Binary files a/base/sessionbeans/target/sessionbeans-2.1.jar and b/base/sessionbeans/target/sessionbeans-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1.ear b/clients/comaco/ear/target/maiaear-2.1.ear index f671fa7..908a0b0 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1.ear and b/clients/comaco/ear/target/maiaear-2.1.ear differ diff --git a/clients/comaco/ear/target/maiaear-2.1/armas-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/armas-2.1.jar index 259f704..ffc5afe 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/armas-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/armas-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/bpm-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/bpm-2.1.jar index aecd23a..4c3aeb4 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/bpm-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/bpm-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/bpmlib.jar b/clients/comaco/ear/target/maiaear-2.1/bpmlib.jar index c8fe5b0..a693557 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/bpmlib.jar and b/clients/comaco/ear/target/maiaear-2.1/bpmlib.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/common-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/common-2.1.jar index 67ada14..2e459dc 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/common-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/common-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/commondb-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/commondb-2.1.jar index 3c1e867..8c8d15f 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/commondb-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/commondb-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/dto-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/dto-2.1.jar index 4e008b1..8ca2369 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/dto-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/dto-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/environment-eap6-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/environment-eap6-2.1.jar index 94840fc..a6272a1 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/environment-eap6-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/environment-eap6-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/facade.jar b/clients/comaco/ear/target/maiaear-2.1/facade.jar index 7d69701..e15ce90 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/facade.jar and b/clients/comaco/ear/target/maiaear-2.1/facade.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/facadeclient.jar b/clients/comaco/ear/target/maiaear-2.1/facadeclient.jar index 594366f..b43b245 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/facadeclient.jar and b/clients/comaco/ear/target/maiaear-2.1/facadeclient.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/firmas-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/firmas-2.1.jar index aaf8b3c..3ff39ae 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/firmas-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/firmas-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/general-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/general-2.1.jar index 253fd90..d6915a8 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/general-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/general-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/log-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/log-2.1.jar index d340d38..b01fd78 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/log-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/log-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/parmas-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/parmas-2.1.jar index f7a90ce..3400e2c 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/parmas-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/parmas-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/pbpm-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/pbpm-2.1.jar index b00bf0a..fb2956a 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/pbpm-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/pbpm-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/pcustomer-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/pcustomer-2.1.jar index 11f3dcc..6df6ab7 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/pcustomer-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/pcustomer-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/person-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/person-2.1.jar index bfb1e31..249df1d 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/person-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/person-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/pfirmas-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/pfirmas-2.1.jar index 2a69293..e4ff99c 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/pfirmas-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/pfirmas-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/pgeneral-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/pgeneral-2.1.jar index f762477..cd9887d 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/pgeneral-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/pgeneral-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/plog-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/plog-2.1.jar index 7bc404f..36292fb 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/plog-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/plog-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/report-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/report-2.1.jar index 9c79325..4949a14 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/report-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/report-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/sessionbeans.jar b/clients/comaco/ear/target/maiaear-2.1/sessionbeans.jar index 985aac9..e0bb519 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/sessionbeans.jar and b/clients/comaco/ear/target/maiaear-2.1/sessionbeans.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/simple-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/simple-2.1.jar index adaee9f..aab544c 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/simple-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/simple-2.1.jar differ diff --git a/clients/comaco/ear/target/maiaear-2.1/util-2.1.jar b/clients/comaco/ear/target/maiaear-2.1/util-2.1.jar index 0f16c2a..eb65329 100644 Binary files a/clients/comaco/ear/target/maiaear-2.1/util-2.1.jar and b/clients/comaco/ear/target/maiaear-2.1/util-2.1.jar differ diff --git a/clients/comaco/ear/target/maven-archiver/pom.properties b/clients/comaco/ear/target/maven-archiver/pom.properties index c34dc36..f84d54a 100644 --- a/clients/comaco/ear/target/maven-archiver/pom.properties +++ b/clients/comaco/ear/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:53:23 ECT 2022 +#Mon Oct 31 16:00:46 ECT 2022 version=2.1 groupId=com.fp.clients.maia artifactId=maiaear diff --git a/clients/comaco/environment-eap6/src/main/resources/META-INF/Taskorm.xml b/clients/comaco/environment-eap6/src/main/resources/META-INF/Taskorm.xml index ac0ebca..1622f73 100644 --- a/clients/comaco/environment-eap6/src/main/resources/META-INF/Taskorm.xml +++ b/clients/comaco/environment-eap6/src/main/resources/META-INF/Taskorm.xml @@ -58,10 +58,8 @@ where t.archived = 0 and excludedOwners.id = :userId and - excludedOwners in elements ( t.peopleAssignments.excludedOwners ) - - - order by t.id DESC + excludedOwners in elements ( t.peopleAssignments.excludedOwners ) + order by t.id DESC diff --git a/clients/comaco/environment-eap6/target/classes/META-INF/Taskorm.xml b/clients/comaco/environment-eap6/target/classes/META-INF/Taskorm.xml index ac0ebca..1622f73 100644 --- a/clients/comaco/environment-eap6/target/classes/META-INF/Taskorm.xml +++ b/clients/comaco/environment-eap6/target/classes/META-INF/Taskorm.xml @@ -58,10 +58,8 @@ where t.archived = 0 and excludedOwners.id = :userId and - excludedOwners in elements ( t.peopleAssignments.excludedOwners ) - - - order by t.id DESC + excludedOwners in elements ( t.peopleAssignments.excludedOwners ) + order by t.id DESC diff --git a/clients/comaco/environment-eap6/target/environment-eap6-2.1.jar b/clients/comaco/environment-eap6/target/environment-eap6-2.1.jar index 94840fc..a6272a1 100644 Binary files a/clients/comaco/environment-eap6/target/environment-eap6-2.1.jar and b/clients/comaco/environment-eap6/target/environment-eap6-2.1.jar differ diff --git a/clients/comaco/environment-eap6/target/maven-archiver/pom.properties b/clients/comaco/environment-eap6/target/maven-archiver/pom.properties index 3c85caa..0745acd 100644 --- a/clients/comaco/environment-eap6/target/maven-archiver/pom.properties +++ b/clients/comaco/environment-eap6/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:53:23 ECT 2022 +#Mon Oct 31 16:00:45 ECT 2022 version=2.1 groupId=com.fp.clients.maia artifactId=environment-eap6 diff --git a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.java b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.java index dd7280b..275baa8 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.java @@ -7,6 +7,7 @@ package com.fp.frontend.controller.armas.solicitud; import com.fp.dto.Request; import com.fp.dto.Response; import com.fp.dto.query.DtoQuery; +import com.fp.dto.save.DtoSave; import com.fp.frontend.controller.AbstractController; import com.fp.frontend.helper.MessageHelper; import com.fp.persistence.parmas.soli.TarmInvoiceHistory; @@ -42,7 +43,7 @@ public class InvoiceHistoryController extends AbstractController(); - this.beanalias = "INVOICEHISTORYS"; + this.beanalias = "TARMINVOICEHISTORY"; } catch (Exception e) { MessageHelper.setMessageError(e); } @@ -58,6 +59,37 @@ public class InvoiceHistoryController extends AbstractController msave = new HashMap(); + msave.put(this.beanalias, dtosave); + + request.setSaveTables(msave); + Response resp = this.callerhelper.executeSave(request); + if (resp.getResponseCode().compareTo(Response.RESPONSE_OK) == 0) { + this.postCommit(resp); + //MessageHelper.setMessageInfo(resp); + } else { + System.out.println("Error al guardar"); + // MessageHelper.setMessageError(resp); + } + + } catch (Throwable e) { + MessageHelper.setMessageError(e); + } + } + @Override + public void postCommit(Response response) throws Exception { + super.postCommitGeneric(response, this.beanalias); + } + @Override protected void querydatabase() { try { diff --git a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.java b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.java index 43b2e9c..07d52f5 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.java @@ -355,6 +355,10 @@ public class ReporteConsultaSolicitudController extends MessageHelper.setMessageError(e); } } + /** + *Accion para generar xml desde el boton + */ + public void crearXML(){ try { this.parametersController.generarFacturas(this.solicitud.getRecord().getPk()); diff --git a/frontend/src/main/java/com/fp/frontend/controller/pgeneral/gene/ParametersController.java b/frontend/src/main/java/com/fp/frontend/controller/pgeneral/gene/ParametersController.java index b4d10bf..63ff868 100644 --- a/frontend/src/main/java/com/fp/frontend/controller/pgeneral/gene/ParametersController.java +++ b/frontend/src/main/java/com/fp/frontend/controller/pgeneral/gene/ParametersController.java @@ -251,22 +251,16 @@ public class ParametersController extends AbstractController { public File sacarFactura(String codigoSolicitud, File carpetaBase, TsafeUserDetail tsafeUserDetail) throws Exception { CentroControlArmasController cac = new CentroControlArmasController(); - /** - * ============================ NO ESTATICAS ===============0 - */ TgeneParameters tCustodio = find("CUSTODIOSFACTURA", "1"); - String noDisponible = ""; + String noDisponible = ""; /**SE SUELE UTILIZAR SI ES QUE SE REQUIERE UN MENSAJE EN DATOS VACIOS*/ DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance(); DocumentBuilder docBuilder = docFactory.newDocumentBuilder(); - //Elemento raíz Document doc = docBuilder.newDocument(); Element factura = doc.createElement("factura"); doc.appendChild(factura); - PersonAddressController pac = new PersonAddressController(); - TarmSolicitudTramite solicitudTramite = SolicitudTramiteController.findByCSolicitud(codigoSolicitud); TarmSolicitud solicitud = SolicitudController.findSolicitudxcodsolicitud(codigoSolicitud); Integer personCode = solicitud.getPersoncode(); @@ -274,9 +268,7 @@ public class ParametersController extends AbstractController { TgeneParameters parametroRUC = find("RUCCOMACO", "1"); TarmTramite tTramite = TarmTramiteController.findSimple(solicitud.getCtramite().toString()); String rucComaco = parametroRUC.getTextvalue(); - crearAgregarHijo(doc, factura, "ruc", rucComaco); - String ccentro = solicitud.getCcentrocontrol(); TarmCentroControl centroControl = CentroControlArmasController.findPorCodigo(ccentro); @@ -284,9 +276,9 @@ public class ParametersController extends AbstractController { centroControl.getPuntofacturacion().replace("-", "") : ""; crearAgregarHijo(doc, factura, "secuencia",String.format("%09d", centroControl.getSecuenciafacturacion())); - - //String claveNombreInstitucion = centroControl.getNombreinstitucion(); - //String puntoFact= tciudad != null ? tciudad.getPuntofacturacion() : null; + /** + * ACTUALIZAR LA SECUENCIA DEL CENTRO DE CONTROL + */ centroControl.setSecuenciafacturacion(centroControl.getSecuenciafacturacion()+1); cac.update(centroControl); cac.save(); @@ -364,7 +356,6 @@ public class ParametersController extends AbstractController { String impuesto = "IVA"; int porcentajeDescuento = 0; - Double descuento = 0.00; Element impuestoTotal = crearElementoSinTexto(doc, "impuestoTotal"); Element totalImpuesto1 = crearElementoSinTexto(doc, "totalImpuesto"); Element totalImpuesto2 = crearElementoSinTexto(doc, "totalImpuesto"); @@ -385,14 +376,11 @@ public class ParametersController extends AbstractController { * ========================= Detalles ================================ */ - // aun no estoy seguro de esos datos - TgeneCatalogDetail tTipoAutorizacion = CatalogDetailController.findCatalogo(tTramite.getTipoautorizacion(), tTramite.getTipoautorizacioncodigo()); String []servicios = tTramite.getServicio() != null ? tTramite.getServicio().split("-"):null; String codigoPrincipal = servicios != null ? servicios[0]: ""; /**IMPORTANTE REVISAR*/ String descripcion = servicios != null ? servicios[1]: ""; - //tTipoAutorizacion != null ? tTipoAutorizacion.getDescription() : ""; - int cantidad = 1; + int cantidad = 1; /**Cantidad de productos en solicitud*/ Double precioUnitario = solicitudTramite.getValortramitearmas().doubleValue(); Double precioTotalSinImpuestos = precioUnitario * cantidad; Element detalles = crearElementoSinTexto(doc, "detalles"); @@ -413,8 +401,7 @@ public class ParametersController extends AbstractController { agregarHijoPadre(doc, impuestoItem, impueste); agregarHijoPadre(doc, detalle1, impuestoItem); agregarHijoPadre(doc, detalles, detalle1); - String porcentaje = "0"; - Double baseImponible = precioTotalSinImpuestos; + /** * **** custodios */ @@ -423,9 +410,7 @@ public class ParametersController extends AbstractController { String codigoPrincipal2 = tCustodio.getNumbervalue().toString().contains(".") ? tCustodio.getNumbervalue().toString().split("\\.")[0] : tCustodio.getNumbervalue().toString() ; int numeroDias = solicitud != null && solicitud.getNumerodiascustodios() != null ? solicitud.getNumerodiascustodios() : null; int numeroCustodios=solicitud != null ? solicitud.getNumerocustodios() : null; - /** - * ======================= no tengo la menor idea - */ + String descripcion2 = String.format(tCustodio.getTextvalue(), numeroDias); Double precioUnitario2 = solicitudTramite.getValorcustodios().doubleValue()/ numeroCustodios; Double precioTotalSinImpuestos2 = solicitudTramite.getValorcustodios().doubleValue() ; @@ -456,10 +441,11 @@ public class ParametersController extends AbstractController { Element pagos = crearElementoSinTexto(doc, "pagos"); Element pago = crearElementoSinTexto(doc, "pago"); - String formaPago = "EF"; /** - * de momento, tocaria ver los nemonicos a futuro para pago con tarjeta + * formaPago: de momento, tocaria ver los nemonicos a futuro para pago con tarjeta */ + String formaPago = "EF"; + Double totalPagar = valorAPagar; crearAgregarHijo(doc, pago, "formaPago", formaPago); crearAgregarHijo(doc, pago, "total", totalPagar.toString()); @@ -491,24 +477,18 @@ public class ParametersController extends AbstractController { TransformerFactory transformerFactory = TransformerFactory.newInstance(); Transformer transformer = transformerFactory.newTransformer(); DOMSource source = new DOMSource(doc); - /** - * String path = carpetaBase.getAbsolutePath(); if(!path.endsWith("/")){ - * path = path.concat("/"); - } - */ - //path=path.concat(String.format("Factura-%s.xml", solicitud.getNumerosolicitud())); + File archivo = new File(carpetaBase, String.format("%s.xml", solicitud.getNumerosolicitud())); StreamResult result = new StreamResult(archivo); transformer.transform(source, result); try { - crearAuditoria(1201, solicitud.getPk(), tsafeUserDetail.getPk().getUsercode(), + crearAuditoria(solicitud.getPk(), tsafeUserDetail.getPk().getUsercode(), solicitud.getNumerosolicitud(), solicitudTramite.getNumerotramite(), archivo.getAbsolutePath()); } catch (Exception e) { System.out.println("Error al generar auditoria desde el front>>< "+ e.toString()); - e.printStackTrace(); } return archivo; } @@ -523,10 +503,9 @@ public class ParametersController extends AbstractController { b.close(); return sb.toString(); } - public void crearAuditoria(Integer id, String csoli,String user, String solicitudNumber, String tramiteNumber,String path) throws Exception{ + public void crearAuditoria( String csoli,String user, String solicitudNumber, String tramiteNumber,String path) throws Exception{ InvoiceHistoryController iv = new InvoiceHistoryController(); /**========> NO OPTIMO, USADO PARA PRUEBAS*/ TarmInvoiceHistory tih = new TarmInvoiceHistory(); - tih.setPk(id); tih.setCsolicitud(csoli); tih.setUsercode(user); tih.setRegistrationdate(new java.sql.Timestamp(Calendar.getInstance().getTimeInMillis())); @@ -534,7 +513,7 @@ public class ParametersController extends AbstractController { tih.setTramitenumber(tramiteNumber); tih.setPathfile(path); tih.setContentfile(obtenerContenidoArchivo(path)); - iv.update(tih); + iv.setRecord(tih); iv.save(); } @@ -543,33 +522,13 @@ public class ParametersController extends AbstractController { TsafeUserDetail tsafeUserDetail = (TsafeUserDetail) FacesContext.getCurrentInstance().getExternalContext().getSessionMap().get("TSAFEUSERDETAIL"); String folderPath = find("PATHFACTURASXML", "1").getTextvalue(); - //String fechaActual = new Date().toString().replace("/", "-").replace(" ", "_").replace(":", ""); folderPath = folderPath.concat("FRONTEND").concat("/"); File carpetaBase = new File(folderPath); carpetaBase.mkdirs(); - File arch = sacarFactura(csolicitud, carpetaBase, tsafeUserDetail ); - //factSq = factSq + acum; - - - byte[] fileContent = Files.readAllBytes(Paths.get(arch.getAbsolutePath())); - downloadFile(fileContent, "application/xml", arch.getName()); - /** ================== DEBERIA HABERSE ECHO POR CONTROLLER PERO POR ERRORES SE MANTIENE CON QUERY */ -// Query qu = entityManager.createNativeQuery(sUpdate.toString()) -// .setParameter("numero", factSq); - // qu.executeUpdate(); - //sequence.setNumbervalue(new BigDecimal(factSq)); - //TgeneCatalogDetail sequencia = CatalogDetailController.findCatalogo( "QUERY", "SEQ"); - //sequencia.setRecordversion(factSq); - //CatalogDetailController dc = new CatalogDetailController(); - ///dc.setRecord(sequencia); - //dc.update(); - //dc.save(); - - //sequence.setIsnew(false); - //setRecord(sequence); - //update(); - //save(); - //updateParametro(sequence); + File arch = sacarFactura(csolicitud, carpetaBase, tsafeUserDetail ); + byte[] fileContent = Files.readAllBytes(Paths.get(arch.getAbsolutePath())); + downloadFile(fileContent, "application/xml", arch.getName()); + } catch (Exception ex) { diff --git a/frontend/src/main/webapp/pages/armas/20/solicitud.xhtml b/frontend/src/main/webapp/pages/armas/20/solicitud.xhtml index ce2cda7..f973dfc 100644 --- a/frontend/src/main/webapp/pages/armas/20/solicitud.xhtml +++ b/frontend/src/main/webapp/pages/armas/20/solicitud.xhtml @@ -109,10 +109,11 @@ + diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.class b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.class index 9caba79..71153cc 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.class differ diff --git a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.class b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.class index cc5342d..4993f18 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.class and b/frontend/target/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.class differ diff --git a/frontend/target/classes/com/fp/frontend/controller/pgeneral/gene/ParametersController.class b/frontend/target/classes/com/fp/frontend/controller/pgeneral/gene/ParametersController.class index 872714c..6a64004 100644 Binary files a/frontend/target/classes/com/fp/frontend/controller/pgeneral/gene/ParametersController.class and b/frontend/target/classes/com/fp/frontend/controller/pgeneral/gene/ParametersController.class differ diff --git a/frontend/target/frontend.war b/frontend/target/maia.war similarity index 96% rename from frontend/target/frontend.war rename to frontend/target/maia.war index 7bd3c6e..67f165b 100644 Binary files a/frontend/target/frontend.war and b/frontend/target/maia.war differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.class index 9caba79..71153cc 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/InvoiceHistoryController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.class index cc5342d..4993f18 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/armas/solicitud/ReporteConsultaSolicitudController.class differ diff --git a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/pgeneral/gene/ParametersController.class b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/pgeneral/gene/ParametersController.class index 872714c..6a64004 100644 Binary files a/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/pgeneral/gene/ParametersController.class and b/frontend/target/maia/WEB-INF/classes/com/fp/frontend/controller/pgeneral/gene/ParametersController.class differ diff --git a/frontend/target/maia/WEB-INF/lib/bpm-2.1.jar b/frontend/target/maia/WEB-INF/lib/bpm-2.1.jar index aecd23a..4c3aeb4 100644 Binary files a/frontend/target/maia/WEB-INF/lib/bpm-2.1.jar and b/frontend/target/maia/WEB-INF/lib/bpm-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/common-2.1.jar b/frontend/target/maia/WEB-INF/lib/common-2.1.jar index 67ada14..2e459dc 100644 Binary files a/frontend/target/maia/WEB-INF/lib/common-2.1.jar and b/frontend/target/maia/WEB-INF/lib/common-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/commondb-2.1.jar b/frontend/target/maia/WEB-INF/lib/commondb-2.1.jar index 3c1e867..8c8d15f 100644 Binary files a/frontend/target/maia/WEB-INF/lib/commondb-2.1.jar and b/frontend/target/maia/WEB-INF/lib/commondb-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/dto-2.1.jar b/frontend/target/maia/WEB-INF/lib/dto-2.1.jar index 4e008b1..8ca2369 100644 Binary files a/frontend/target/maia/WEB-INF/lib/dto-2.1.jar and b/frontend/target/maia/WEB-INF/lib/dto-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/facadeclient-2.1.jar b/frontend/target/maia/WEB-INF/lib/facadeclient-2.1.jar index 594366f..b43b245 100644 Binary files a/frontend/target/maia/WEB-INF/lib/facadeclient-2.1.jar and b/frontend/target/maia/WEB-INF/lib/facadeclient-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/firmas-2.1.jar b/frontend/target/maia/WEB-INF/lib/firmas-2.1.jar index aaf8b3c..3ff39ae 100644 Binary files a/frontend/target/maia/WEB-INF/lib/firmas-2.1.jar and b/frontend/target/maia/WEB-INF/lib/firmas-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/parmas-2.1.jar b/frontend/target/maia/WEB-INF/lib/parmas-2.1.jar index f7a90ce..3400e2c 100644 Binary files a/frontend/target/maia/WEB-INF/lib/parmas-2.1.jar and b/frontend/target/maia/WEB-INF/lib/parmas-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/pbpm-2.1.jar b/frontend/target/maia/WEB-INF/lib/pbpm-2.1.jar index b00bf0a..fb2956a 100644 Binary files a/frontend/target/maia/WEB-INF/lib/pbpm-2.1.jar and b/frontend/target/maia/WEB-INF/lib/pbpm-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/pcustomer-2.1.jar b/frontend/target/maia/WEB-INF/lib/pcustomer-2.1.jar index 11f3dcc..6df6ab7 100644 Binary files a/frontend/target/maia/WEB-INF/lib/pcustomer-2.1.jar and b/frontend/target/maia/WEB-INF/lib/pcustomer-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/pfirmas-2.1.jar b/frontend/target/maia/WEB-INF/lib/pfirmas-2.1.jar index 2a69293..e4ff99c 100644 Binary files a/frontend/target/maia/WEB-INF/lib/pfirmas-2.1.jar and b/frontend/target/maia/WEB-INF/lib/pfirmas-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/pgeneral-2.1.jar b/frontend/target/maia/WEB-INF/lib/pgeneral-2.1.jar index f762477..cd9887d 100644 Binary files a/frontend/target/maia/WEB-INF/lib/pgeneral-2.1.jar and b/frontend/target/maia/WEB-INF/lib/pgeneral-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/simple-2.1.jar b/frontend/target/maia/WEB-INF/lib/simple-2.1.jar index adaee9f..aab544c 100644 Binary files a/frontend/target/maia/WEB-INF/lib/simple-2.1.jar and b/frontend/target/maia/WEB-INF/lib/simple-2.1.jar differ diff --git a/frontend/target/maia/WEB-INF/lib/util-2.1.jar b/frontend/target/maia/WEB-INF/lib/util-2.1.jar index 0f16c2a..eb65329 100644 Binary files a/frontend/target/maia/WEB-INF/lib/util-2.1.jar and b/frontend/target/maia/WEB-INF/lib/util-2.1.jar differ diff --git a/frontend/target/maia/pages/armas/20/solicitud.xhtml b/frontend/target/maia/pages/armas/20/solicitud.xhtml index ce2cda7..f973dfc 100644 --- a/frontend/target/maia/pages/armas/20/solicitud.xhtml +++ b/frontend/target/maia/pages/armas/20/solicitud.xhtml @@ -109,10 +109,11 @@ + diff --git a/frontend/target/maven-archiver/pom.properties b/frontend/target/maven-archiver/pom.properties index 713cbcb..3c223a8 100644 --- a/frontend/target/maven-archiver/pom.properties +++ b/frontend/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 27 16:53:37 ECT 2022 +#Mon Oct 31 16:01:10 ECT 2022 version=2.1 groupId=com.fp artifactId=frontend