Skip to content

D
DDA_CRN_Exhibicion
Commit 494728cd authored by Jose Francisco Montiel Jimenez's avatar Jose Francisco Montiel Jimenez
Browse files
Options

correccion de costos

parent 982891b0
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 14 deletions
build/web/WEB-INF/classes/ApplicationContext.xml
View file @ 494728cd
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<bean id="triggerExhibicion_DDA" class="org.springframework.scheduling.quartz.CronTriggerBean" <bean id="triggerExhibicion_DDA" class="org.springframework.scheduling.quartz.CronTriggerBean"
p:jobDetail-ref="cronExhibicion_DDA" p:jobDetail-ref="cronExhibicion_DDA"
p:startDelay="1000" p:startDelay="1000"
p:cronExpression="0 5 13 * * ? *"> p:cronExpression="0 0 4,5,6,7 * * ? *">
<!-- p:cronExpression="0 0 4,5,6,7 * * ? *" --> <!-- p:cronExpression="0 0 4,5,6,7 * * ? *" -->
<!-- Seconds Minutes Hours Day-Month Month Day-Week Year --> <!-- Seconds Minutes Hours Day-Month Month Day-Week Year -->
......
build/web/WEB-INF/classes/general.properties
View file @ 494728cd
#----------------------------------------------- #-----------------------------------------------
# Ambiente local/desarrollo/preprod/produccion # Ambiente local/desarrollo/preprod/produccion
#----------------------------------------------- #-----------------------------------------------
ambiente=preprod ambiente=produccion
#----------------------------------------------- #-----------------------------------------------
# Variables Generales # Variables Generales
...@@ -18,8 +18,8 @@ sap.services.credenciales=${${ambiente}.sap.services.credenciales} ...@@ -18,8 +18,8 @@ sap.services.credenciales=${${ambiente}.sap.services.credenciales}
produccion.database.jndi=jdbc/DBDLA produccion.database.jndi=jdbc/DBDLA
produccion.log4j.properties.location=classpath:log4j.prod.properties produccion.log4j.properties.location=classpath:log4j.prod.properties
#produccion.servidor.sap.ws=10.94.182.93 #produccion.servidor.sap.ws=10.94.182.93
produccion.servidor.sap.ws =amcoPOCIPR-1.amxcontenido.local produccion.servidor.sap.ws =amcopocipr-1.amxcontenido.local
produccion.puerto.sap.ws=50200 produccion.puerto.sap.ws=50000
#produccion.sap.services.credenciales=EXDDA001:4Mxdd4&P1 #produccion.sap.services.credenciales=EXDDA001:4Mxdd4&P1
produccion.sap.services.credenciales=ZAMC_DDA:FJ12y$.43 produccion.sap.services.credenciales=ZAMC_DDA:FJ12y$.43
produccion.clientws.interface.i10=http://%servidor%:%puerto%/XISOAPAdapter/MessageServlet?senderParty=&senderService=SYS_AM_1_DDA_PRD&receiverParty=&receiverService=&interface=SI_ActivoFijo_Out&interfaceNamespace=http://americamovil.com/DDA/1/F/EnviaActivoFijo produccion.clientws.interface.i10=http://%servidor%:%puerto%/XISOAPAdapter/MessageServlet?senderParty=&senderService=SYS_AM_1_DDA_PRD&receiverParty=&receiverService=&interface=SI_ActivoFijo_Out&interfaceNamespace=http://americamovil.com/DDA/1/F/EnviaActivoFijo
......
build/web/WEB-INF/classes/log4j.prod.properties
View file @ 494728cd
log4j.rootCategory=INFO, LOGFILE log4j.rootCategory=ALL, LOGFILE
log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender
log4j.appender.LOGFILE.File=logs/mx/dda/ws/DDA_WS_CRN_E.log log4j.appender.LOGFILE.File=logs/mx/dda/ws/DDA_WS_CRN_E.log
......
catalog.xml
View file @ 494728cd
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system"> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
<nextCatalog catalog="nbproject/private/retriever/catalog.xml"/>
<system systemId="file:/C:/Users/jfmj_/Downloads/TerminosComerciales.wsdl" uri="conf/xml-resources/web-service-references/TerminosComerciales/wsdl/TerminosComerciales.wsdl"/> <system systemId="file:/C:/Users/jfmj_/Downloads/TerminosComerciales.wsdl" uri="conf/xml-resources/web-service-references/TerminosComerciales/wsdl/TerminosComerciales.wsdl"/>
<system systemId="file:/C:/Users/jfmj_/Downloads/ActivoFijo.wsdl" uri="conf/xml-resources/web-service-references/ActivoFijo/wsdl/ActivoFijo.wsdl"/> <system systemId="file:/C:/Users/jfmj_/Downloads/ActivoFijo.wsdl" uri="conf/xml-resources/web-service-references/ActivoFijo/wsdl/ActivoFijo.wsdl"/>
<system systemId="http://amcopodev-6.amxcontenido.local:50000/dir/wsdl?p=ic/e8741d1472fb3ae6b4346a460e752d78" uri="conf/xml-resources/web-service-references/e8741d1472fb3ae6b4346a460e752d78/wsdl/amcopodev-6.amxcontenido.local_50000/dir/wsdl.p_ic/e8741d1472fb3ae6b4346a460e752d78.wsdl"/> <system systemId="http://amcopodev-6.amxcontenido.local:50000/dir/wsdl?p=ic/e8741d1472fb3ae6b4346a460e752d78" uri="conf/xml-resources/web-service-references/e8741d1472fb3ae6b4346a460e752d78/wsdl/amcopodev-6.amxcontenido.local_50000/dir/wsdl.p_ic/e8741d1472fb3ae6b4346a460e752d78.wsdl"/>
<system systemId="http://amcopodev-6.amxcontenido.local:50000/dir/wsdl?p=ic/e65df73e5d043133977122667ba3fb47" uri="conf/xml-resources/web-service-references/e65df73e5d043133977122667ba3fb47/wsdl/amcopodev-6.amxcontenido.local_50000/dir/wsdl.p_ic/e65df73e5d043133977122667ba3fb47.wsdl"/> <system systemId="http://amcopodev-6.amxcontenido.local:50000/dir/wsdl?p=ic/e65df73e5d043133977122667ba3fb47" uri="conf/xml-resources/web-service-references/e65df73e5d043133977122667ba3fb47/wsdl/amcopodev-6.amxcontenido.local_50000/dir/wsdl.p_ic/e65df73e5d043133977122667ba3fb47.wsdl"/>
<nextCatalog catalog="nbproject/private/retriever/catalog.xml"/>
</catalog> </catalog>
\ No newline at end of file
nbproject/private/private.xml
View file @ 494728cd
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
<project-private xmlns="http://www.netbeans.org/ns/project-private/1"> <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/> <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2"> <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group/> <group>
<file>file:/C:/Users/jfmj_/Documents/DDA/Githg/DDA_CRN_Exhibicion/resources/general.properties</file>
<file>file:/C:/Users/jfmj_/Documents/DDA/Githg/DDA_CRN_Exhibicion/src/mx/com/amx/mx/dda/crn/bo/DDAExhibicionBO.java</file>
</group>
</open-files> </open-files>
</project-private> </project-private>
nbproject/private/retriever/catalog.xml
View file @ 494728cd
...@@ -10,4 +10,6 @@ ...@@ -10,4 +10,6 @@
<system systemId="http://www.springframework.org/schema/context/spring-context-3.0.xsd" uri="www.springframework.org/schema/context/spring-context-3.0.xsd"/> <system systemId="http://www.springframework.org/schema/context/spring-context-3.0.xsd" uri="www.springframework.org/schema/context/spring-context-3.0.xsd"/>
<system systemId="http://www.springframework.org/schema/beans/spring-beans-3.1.xsd" uri="www.springframework.org/schema/beans/spring-beans-3.1.xsd"/> <system systemId="http://www.springframework.org/schema/beans/spring-beans-3.1.xsd" uri="www.springframework.org/schema/beans/spring-beans-3.1.xsd"/>
<system systemId="http://www.springframework.org/schema/tool/spring-tool-3.1.xsd" uri="www.springframework.org/schema/tool/spring-tool-3.1.xsd"/> <system systemId="http://www.springframework.org/schema/tool/spring-tool-3.1.xsd" uri="www.springframework.org/schema/tool/spring-tool-3.1.xsd"/>
<system systemId="https://www.springframework.org/schema/beans/spring-beans-3.0.xsd" uri="www.springframework.org/schema/beans/spring-beans-3.0.xsd"/>
<system systemId="https://www.springframework.org/schema/tool/spring-tool-3.0.xsd" uri="www.springframework.org/schema/tool/spring-tool-3.0.xsd"/>
</catalog> </catalog>
\ No newline at end of file
resources/ApplicationContext.xml
View file @ 494728cd
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<bean id="triggerExhibicion_DDA" class="org.springframework.scheduling.quartz.CronTriggerBean" <bean id="triggerExhibicion_DDA" class="org.springframework.scheduling.quartz.CronTriggerBean"
p:jobDetail-ref="cronExhibicion_DDA" p:jobDetail-ref="cronExhibicion_DDA"
p:startDelay="1000" p:startDelay="1000"
p:cronExpression="0 5 13 * * ? *"> p:cronExpression="0 0 4,5,6,7 * * ? *">
<!-- p:cronExpression="0 0 4,5,6,7 * * ? *" --> <!-- p:cronExpression="0 0 4,5,6,7 * * ? *" -->
<!-- Seconds Minutes Hours Day-Month Month Day-Week Year --> <!-- Seconds Minutes Hours Day-Month Month Day-Week Year -->
......
resources/general.properties
View file @ 494728cd
#----------------------------------------------- #-----------------------------------------------
# Ambiente local/desarrollo/preprod/produccion # Ambiente local/desarrollo/preprod/produccion
#----------------------------------------------- #-----------------------------------------------
ambiente=preprod ambiente=produccion
#----------------------------------------------- #-----------------------------------------------
# Variables Generales # Variables Generales
...@@ -18,8 +18,8 @@ sap.services.credenciales=${${ambiente}.sap.services.credenciales} ...@@ -18,8 +18,8 @@ sap.services.credenciales=${${ambiente}.sap.services.credenciales}
produccion.database.jndi=jdbc/DBDLA produccion.database.jndi=jdbc/DBDLA
produccion.log4j.properties.location=classpath:log4j.prod.properties produccion.log4j.properties.location=classpath:log4j.prod.properties
#produccion.servidor.sap.ws=10.94.182.93 #produccion.servidor.sap.ws=10.94.182.93
produccion.servidor.sap.ws =amcoPOCIPR-1.amxcontenido.local produccion.servidor.sap.ws =amcopocipr-1.amxcontenido.local
produccion.puerto.sap.ws=50200 produccion.puerto.sap.ws=50000
#produccion.sap.services.credenciales=EXDDA001:4Mxdd4&P1 #produccion.sap.services.credenciales=EXDDA001:4Mxdd4&P1
produccion.sap.services.credenciales=ZAMC_DDA:FJ12y$.43 produccion.sap.services.credenciales=ZAMC_DDA:FJ12y$.43
produccion.clientws.interface.i10=http://%servidor%:%puerto%/XISOAPAdapter/MessageServlet?senderParty=&senderService=SYS_AM_1_DDA_PRD&receiverParty=&receiverService=&interface=SI_ActivoFijo_Out&interfaceNamespace=http://americamovil.com/DDA/1/F/EnviaActivoFijo produccion.clientws.interface.i10=http://%servidor%:%puerto%/XISOAPAdapter/MessageServlet?senderParty=&senderService=SYS_AM_1_DDA_PRD&receiverParty=&receiverService=&interface=SI_ActivoFijo_Out&interfaceNamespace=http://americamovil.com/DDA/1/F/EnviaActivoFijo
......
resources/log4j.prod.properties
View file @ 494728cd
log4j.rootCategory=INFO, LOGFILE log4j.rootCategory=ALL, LOGFILE
log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender
log4j.appender.LOGFILE.File=logs/mx/dda/ws/DDA_WS_CRN_E.log log4j.appender.LOGFILE.File=logs/mx/dda/ws/DDA_WS_CRN_E.log
......
src/mx/com/amx/mx/dda/crn/bo/DDAExhibicionBO.java
View file @ 494728cd
...@@ -408,10 +408,19 @@ public class DDAExhibicionBO { ...@@ -408,10 +408,19 @@ public class DDAExhibicionBO {
LOG.info(" Entrando try: " ); LOG.info(" Entrando try: " );
for(DatosCntTituloExhibicionDTO titulo : titulos){ for(DatosCntTituloExhibicionDTO titulo : titulos){
if (Objects.isNull(map.get(titulo.getNUMERO_CONTRATO()))){ if (Objects.isNull(map.get(titulo.getNUMERO_CONTRATO()))){
LOG.info(" Entrando if: paco" );
map.put(titulo.getNUMERO_CONTRATO(), new DatosCntTituloExhibicionDTO()); map.put(titulo.getNUMERO_CONTRATO(), new DatosCntTituloExhibicionDTO());
map.get(titulo.getNUMERO_CONTRATO()).setCOSTO(titulo.getCOSTO()); map.get(titulo.getNUMERO_CONTRATO()).setCOSTO(titulo.getCOSTO());
LOG.info(" Saliendo if: paco" );
} else { } else {
Long suma = Long.parseLong(map.get(titulo.getNUMERO_CONTRATO()).getCOSTO()) + Long.parseLong(titulo.getCOSTO()); LOG.info(" Letras One:" + map.get(titulo.getNUMERO_CONTRATO()).getCOSTO() + "aquitermina" );
Double one = Double.parseDouble(map.get(titulo.getNUMERO_CONTRATO()).getCOSTO());
LOG.info(" One: " + one );
LOG.info(" Letras Two:" + titulo.getCOSTO() + "aquitermina" );
Double two = Double.parseDouble(titulo.getCOSTO());
LOG.info(" Two: " + two );
Double suma = one + two;
LOG.info(" Entrando else: " + suma );
map.get(titulo.getNUMERO_CONTRATO()).setCOSTO(suma.toString()); map.get(titulo.getNUMERO_CONTRATO()).setCOSTO(suma.toString());
} }
} }
...@@ -570,7 +579,7 @@ public class DDAExhibicionBO { ...@@ -570,7 +579,7 @@ public class DDAExhibicionBO {
} }
else { else {
LOG.error("DDA-NOT-012: Falla en terminos comerciales."); LOG.error("DDA-NOT-012: Falla en terminos comerciales.");
dao.actualizarEstatusSapTitulosByTitulo(respuestaTC.get(dtoEx.getNUMERO_CONTRATO()), dtoEx.getID_TITULO_CNTORIG()); //dao.actualizarEstatusSapTitulosByTitulo(respuestaTC.get(dtoEx.getNUMERO_CONTRATO()), dtoEx.getID_TITULO_CNTORIG());
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment