Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Mina Ruggiero
2025-01-17 12:41:22 +01:00
parent ddb20bba3e 0f62c5e31f
commit b2335be17f
1 changed files with 230 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ems-engine/src/main/java/it/integry/ems/order/puddy/service/PuddyService.java
View File

@@ -618,6 +618,7 @@ public class PuddyService {
setLog(logList, dataOrdProv, numOrdProv, "ORDINE GIA' IMPORTATO", "ORDINE AGENTE " + codVage); setLog(logList, dataOrdProv, numOrdProv, "ORDINE GIA' IMPORTATO", "ORDINE AGENTE " + codVage);
} }
try {
/*ArrayNode arrayNode = objectMapper.createArrayNode();*/ /*ArrayNode arrayNode = objectMapper.createArrayNode();*/
/*ArrayNode arrayNodeVG = objectMapper.createArrayNode();*/ /*ArrayNode arrayNodeVG = objectMapper.createArrayNode();*/
if ("S".equals(flagTD)) { if ("S".equals(flagTD)) {
@@ -727,7 +728,6 @@ public class PuddyService {
codVdesVG = (String) getSingleValue(conn, "select cod_vdes from vtb_dest where cod_anag = " + UtilityDB.valueToString(codAnagVG)); codVdesVG = (String) getSingleValue(conn, "select cod_vdes from vtb_dest where cod_anag = " + UtilityDB.valueToString(codAnagVG));
} }
String codVageAss = codVage; String codVageAss = codVage;
String codAnagAss = codAnag; String codAnagAss = codAnag;
String codVdesAss = codVdes; String codVdesAss = codVdes;
@@ -752,6 +752,9 @@ public class PuddyService {
ordT.setCodVage(codVageAss); ordT.setCodVage(codVageAss);
ordT.setCodMdep(codMdep); ordT.setCodMdep(codMdep);
ordT.setSerie(serieAss); ordT.setSerie(serieAss);
if (azienda.equalsIgnoreCase("VG")){
ordT.setNote("INTERCODE=" + codAnag + "|" + codVdes);
}
if ("S".equals(flagTD)) { if ("S".equals(flagTD)) {
ordT.setCodFornTd(codFornTD); ordT.setCodFornTd(codFornTD);
} }
@@ -825,6 +828,7 @@ public class PuddyService {
if (i < rows) { if (i < rows) {
res.next(); res.next();
codFornTD = res.getString(2); codFornTD = res.getString(2);
azienda = res.getString(22);
res.previous(); res.previous();
} }
@@ -855,6 +859,15 @@ public class PuddyService {
res.close(); res.close();
info.close(); info.close();
multiDBTransactionManager.commitAll();
multiDBTransactionManagerVG.commitAll();
} catch (Exception e){
multiDBTransactionManager.rollbackAll();
multiDBTransactionManagerVG.rollbackAll();
throw e;
}
return List; return List;
} }