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

Merge remote-tracking branch 'origin/master' into AL-3881

master
Lucas 2024-02-28 10:35:57 -03:00
parent dce3034e1a 3ab0d78188
commit c916347fbb
7 changed files with 58 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Dockerfile
View File

@ -1,10 +1,13 @@
FROM fabiomagoo/wildflybase:22.0.1.final
USER jboss
USER root
# Define as variáveis de ambiente a partir do arquivo .env
ENV $(cat /tmp/adm/.env | grep -v '#' | xargs)
# ENV $(cat //home/rjconsultores/dist/.env | grep -v '#' | xargs)
ADD target/*.war /opt/jboss/wildfly/standalone/deployments/
#ADD target/*.war /opt/jboss/wildfly/standalone/deployments/
RUN chown -R jboss:jboss /opt/jboss
RUN chown -R jboss:jboss /home/rjconsultores/dist
EXPOSE 8080 9990 8787

11
Dockerfile_base
View File

@ -1,18 +1,23 @@
FROM jboss/wildfly:22.0.1.Final
USER jboss
USER root
#set do diretorio de trabalho
WORKDIR /tmp/adm
WORKDIR /home/rjconsultores/dist
RUN mkdir -p /opt/jboss/wildfly/standalone/data/content/c7/242cb44f0b5fe54b156bffd848347dfa943728/
# adicionando usuario adm
RUN /opt/jboss/wildfly/bin/add-user.sh -u admin -p rjmaster09 --silent
#copy do driver
ADD target/ventaboletosadm/WEB-INF/lib/ojdbc8.jar /opt/jboss/wildfly/standalone/deployments/ojdbc8-21.7.0.0.jar
ADD ./conf/content /opt/jboss/wildfly/standalone/data/content/c7/242cb44f0b5fe54b156bffd848347dfa943728/
ADD ./conf/inicial /opt/jboss/wildfly/standalone/configuration/standalone.xml
EXPOSE 8080 9990 8787
RUN chmod 744 -R /opt/jboss
RUN chown -R jboss:jboss /home/rjconsultores/dist
CMD /opt/jboss/wildfly/bin/standalone.sh ${DEBUG_ENV} -b 0.0.0.0 -bmanagement 0.0.0.0 -c standalone.xml

10
conf/inicial
View File

@ -209,7 +209,8 @@
</datasources>
</subsystem>
<subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
<deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}" auto-deploy-exploded="true" auto-deploy-zipped="true"/>
<deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}" auto-deploy-exploded="false" auto-deploy-zipped="true"/>
<deployment-scanner name="outro" path="/home/rjconsultores/dist" deployment-timeout="450" scan-interval="6000000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}" auto-deploy-exploded="false" auto-deploy-zipped="true"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:discovery:1.0"/>
<subsystem xmlns="urn:jboss:domain:distributable-web:2.0" default-session-management="default" default-single-sign-on-management="default">
@ -526,7 +527,7 @@
</deployment-permissions>
</subsystem>
<subsystem xmlns="urn:jboss:domain:transactions:5.0">
<core-environment node-identifier="${jboss.tx.node.id:1}">
<core-environment node-identifier="${jboss.tx.node.id:101}">
<process-id>
<uuid/>
</process-id>
@ -585,4 +586,9 @@
<remote-destination host="${jboss.mail.server.host:localhost}" port="${jboss.mail.server.port:25}"/>
</outbound-socket-binding>
</socket-binding-group>
<deployments>
<deployment name="ojdbc8-21.7.0.0.jar" runtime-name="ojdbc8-21.7.0.0.jar">
<content sha1="c7242cb44f0b5fe54b156bffd848347dfa943728"/>
</deployment>
</deployments>
</server>

2
pom.xml
View File

@ -8,7 +8,7 @@
<packaging>war</packaging>
<properties>
<modelWeb.version>1.40.3</modelWeb.version>
<modelWeb.version>1.40.4</modelWeb.version>
<flyway.version>1.30.0</flyway.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

37
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstoque.java
View File

@ -47,7 +47,7 @@ public class RelatorioEstoque extends Relatorio {
String formInicio = rset.getString("forminicial");
if (tipoVenta.equals(EnumTipoVenda.TPV_MANUAL.getId().toString())) {
String ultimoFolioCaja = rset.getString("ultimoFolioCaja");
String ultimoFolioCaja = rset.getString("ultimoFolioCaja") != null ? String.valueOf(rset.getInt("ultimoFolioCaja") + 1) : null;
boolean isFormularioMaior = false;
try {
@ -110,33 +110,28 @@ public class RelatorioEstoque extends Relatorio {
sql.append(" coalesce(fp.FOLIOPREIMPRESO,dab.NUMFOLIOINICIAL) ");
sql.append(" end ) AS forminicial,");
sql.append(" dab.NUMFOLIOFINAL AS formfinal, ");
sql.append(" ( SELECT ");
sql.append(" MAX(to_number(c.numfoliopreimpreso)) + 1 AS numfoliopreimpreso");
sql.append(" FROM Caja c");
sql.append(" WHERE ( ( c.numseriepreimpresa = dab.numseriepreimpresa ");
sql.append(" AND c.aidf_id = dab.aidf_id ) ");
sql.append(" OR ( c.numseriepreimpresa IS NULL ");
sql.append(" AND dab.numseriepreimpresa IS NULL ) ) ");
sql.append(" AND to_number(c.numfoliopreimpreso) BETWEEN dab.numfolioinicial AND dab.numfoliofinal ");
sql.append(" AND ( c.indreimpresion = 0 ");
sql.append(" OR ( c.indreimpresion = 1 AND c.indstatusboleto = 'E' ) ) ");
sql.append(" AND c.marca_id = ab.empresa_id ");
sql.append(" ) AS ultimoFolioCaja, ");
sql.append(" CASE WHEN dab.STATUSOPERACION = 1 THEN fp.FOLIOPREIMPRESO ELSE ");
sql.append(" COALESCE((SELECT to_char(MAX(cd.numfoliopreimpreso)) FROM caja_diversos cd where cd.numseriepreimpresa = dab.numseriepreimpresa), ");
sql.append(" (SELECT TO_CHAR(MAX(c.numfoliopreimpreso)) FROM caja c WHERE ( c.numseriepreimpresa = dab.numseriepreimpresa OR ");
sql.append(" ( c.numseriepreimpresa IS NULL AND dab.numseriepreimpresa IS NULL ) ) AND to_number(c.numfoliopreimpreso) ");
sql.append(" BETWEEN dab.numfolioinicial AND dab.numfoliofinal AND ( c.indreimpresion = 0 OR ( c.indreimpresion = 1 AND c.indstatusboleto = 'E' ) ) ");
sql.append(" AND c.marca_id = m.marca_id), dab.NUMFOLIOINICIAL) ");
sql.append(" END as ultimoFolioCaja, ");
sql.append(" ar.articulo_id AS tipoventa,");
sql.append(" ar.descarticulo, ");
sql.append(" est.nombestado ");
sql.append(" FROM abasto_boleto ab ");
sql.append(" INNER JOIN empresa e ON ( e.empresa_id = ab.empresa_id and ab.ACTIVO = 1 )");
sql.append(" INNER JOIN det_abasto_boleto dab ON ( dab.abastoboleto_id = ab.abastoboleto_id and dab.ACTIVO = 1 )");
sql.append(" INNER JOIN punto_venta p ON ( p.puntoventa_id = ab.puntoventa_id and p.ACTIVO = 1 )");
sql.append(" LEFT JOIN TIPO_PTOVTA tp ON ( tp.TIPOPTOVTA_ID = p.TIPOPTOVTA_ID and tp.ACTIVO = 1 )");
sql.append(" LEFT JOIN estacion es ON ( es.ESTACION_ID = ab.ESTACION_ID )");
sql.append(" INNER JOIN ARTICULO ar ON ( ar.ARTICULO_ID = ab.ARTICULO_ID )");
sql.append(" LEFT JOIN FOLIO_PREIMPRESO fp ON ( fp.AIDF_ID = dab.AIDF_ID and fp.EMPRESA_ID = e.EMPRESA_ID and fp.ESTACION_ID = ab.ESTACION_ID and fp.activo = 1 )");
sql.append(" INNER JOIN aidf ai ON ( ai.aidf_id =dab.aidf_id )");
sql.append(" INNER JOIN estado est ON ( est.estado_id = ai.ESTADO_ID ) ");
sql.append(" INNER JOIN empresa e ON ( e.empresa_id = ab.empresa_id and ab.ACTIVO = 1 )");
sql.append(" INNER JOIN punto_venta p ON ( p.puntoventa_id = ab.puntoventa_id and p.ACTIVO = 1 )");
sql.append(" INNER JOIN ARTICULO ar ON ( ar.ARTICULO_ID = ab.ARTICULO_ID )");
sql.append(" LEFT JOIN TIPO_PTOVTA tp ON ( tp.TIPOPTOVTA_ID = p.TIPOPTOVTA_ID and tp.ACTIVO = 1 )");
sql.append(" LEFT JOIN estacion es ON ( es.ESTACION_ID = ab.ESTACION_ID )");
sql.append(" LEFT JOIN FOLIO_PREIMPRESO fp ON ( fp.AIDF_ID = dab.AIDF_ID and fp.EMPRESA_ID = e.EMPRESA_ID and fp.ESTACION_ID = ab.ESTACION_ID and fp.activo = 1 )");
sql.append(" LEFT JOIN EMPRESA em ON em.EMPRESA_ID = ab.EMPRESA_ID ");
sql.append(" LEFT JOIN MARCA m ON m.EMPRESA_ID = em.EMPRESA_ID AND m.ACTIVO = 1 ");
sql.append(" WHERE ");
sql.append(" dab.statusoperacion in (0,1) and dab.activo = 1 and ab.activo = 1 ");

4
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaController.java
View File

@ -1083,7 +1083,7 @@ public class EditarCorridaController extends MyGenericForwardComposer {
// Gerar corrida novamente.
List<EsquemaCorrida> esquemaCorridaList = new ArrayList<EsquemaCorrida>();
esquemaCorridaList.add(esquemaCorrida);
corridaService.generarCorrida(dataIter, esquemaCorridaList, false, corridaTramoList);
corridaService.generarCorrida(dataIter, esquemaCorridaList, false, corridaTramoList, true);
@ -1211,7 +1211,7 @@ public class EditarCorridaController extends MyGenericForwardComposer {
asientoExclusivoService.borrarByCorrida(corrida);
disponibilidadService.borrarByCorrida(corrida);
integracaoTotvsService.borrarByCorrida(corrida);
corridaService.borrar(corrida);
//corridaService.borrar(corrida);
}
private void salvaNovoEsquemaCorrida(Date dataDeFecInicioVigencia, List<EsquemaCorrida> lsEC)

23
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gr/EditarAidfController.java
View File

@ -169,7 +169,6 @@ public class EditarAidfController extends MyGenericForwardComposer {
if (aidf.getAidfId() == null) {
btnApagar.setVisible(Boolean.FALSE);
}else{
isEstoqueSimplificado = false;
if (temPermissao("ADM.AIDF.EDITARJACRIADA")) {
btnSalvar.setDisabled(Boolean.TRUE);
} else {
@ -326,14 +325,14 @@ public class EditarAidfController extends MyGenericForwardComposer {
if (aidf.getAidfId() == null) {
aidfService.suscribir(aidf);
aidfList.addItemNovo(aidf);
if(isEstoqueSimplificado) {
gravarDetAbastoAutomatico();
}
} else {
aidfService.actualizacion(aidf);
aidfList.updateItem(aidf);
}
if(isEstoqueSimplificado && aidf.getTipoValidaVenta().equals("M")) {
gravarDetAbastoAutomatico();
}
Messagebox.show(
Labels.getLabel("editarMensajeController.MSG.suscribirOK"),
@ -406,6 +405,18 @@ public class EditarAidfController extends MyGenericForwardComposer {
}
}
}
private String obterSerieSubserieFormatada() {
String serieInformada = aidf.getSerie();
String subSerieInformada = aidf.getSubserie();
return serieInformada
.trim()
.concat(
subSerieInformada == null || subSerieInformada.isEmpty()
? ""
: "-".concat(subSerieInformada.trim()));
}
private AbastoBoleto gravarAbastoAutomatico() {
Date now = Calendar.getInstance().getTime();
@ -437,7 +448,7 @@ public class EditarAidfController extends MyGenericForwardComposer {
detAbastoBoleto.setAbastoBoleto(abastoBoleto);
detAbastoBoleto.setAidf(aidf);
detAbastoBoleto.setNummovimiento(nummovimiento);
detAbastoBoleto.setNumseriepreimpresa(aidf.getSerie());
detAbastoBoleto.setNumseriepreimpresa(obterSerieSubserieFormatada());
detAbastoBoleto.setNumfolioinicial(aidf.getForminicial());
detAbastoBoleto.setNumfoliofinal(aidf.getFormfinal());
detAbastoBoleto.setStatusfirma(Boolean.TRUE);