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

Correçao de cadastro de subserie AIDF fixes bug #AL-3865' (!406) from AL-3865 into master 

Reviewed-on: adm/VentaBoletosAdm#406
Reviewed-by: wallace <wallace@rjconsultores.com.br>
master 1.53.5
fabio 2024-02-26 22:36:32 +00:00
parent 7614f56398 01f974b9ae
commit be1328f589
5 changed files with 40 additions and 15 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

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.53.4</version>
<version>1.53.5</version>
<packaging>war</packaging>
<properties>

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,15 +325,15 @@ 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"),
Labels.getLabel(TITULO),
@ -407,6 +406,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);