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

Merge tag 'Hotfix-76' into develop

Browse Source 
Finish Hotfix-76
This commit is contained in:
Marco Elefante
2024-09-11 16:21:38 +02:00
parent 08d75b06cb 6177cfb56b
commit c396715e83
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ems-engine/src/main/java/it/integry/ems/order/Import/service/OrdiniImportService.java
View File

@@ -195,14 +195,15 @@ public class OrdiniImportService {
HashMap<String, Object> vtbDest = UtilityDB.executeSimpleQueryOnlyFirstRow(conn, sql); HashMap<String, Object> vtbDest = UtilityDB.executeSimpleQueryOnlyFirstRow(conn, sql);
String tipoCliente = vtbDest.get("tipo_cliente").toString(); String codAnagTd = vtbDest.get("cod_anag_td") == null ? null : vtbDest.get("cod_anag_td").toString();
String key = codAnagTd == null ? "NT" : codAnagTd;
String codVage = null; String codVage = null;
if (!UtilityString.isNullOrEmpty(setup.get("AGENTE_ORDINE"))) { if (!UtilityString.isNullOrEmpty(setup.get("AGENTE_ORDINE"))) {
codVage = setup.get("AGENTE_ORDINE"); codVage = setup.get("AGENTE_ORDINE");
} }
if (dtbOrdtMap.isEmpty() || !dtbOrdtMap.containsKey(tipoCliente)) { if (dtbOrdtMap.isEmpty() || !dtbOrdtMap.containsKey(key)) {
destinatario = vtbDest.get("destinatario").toString(); destinatario = vtbDest.get("destinatario").toString();
citta = vtbDest.get("citta").toString(); citta = vtbDest.get("citta").toString();
@@ -218,7 +219,11 @@ public class OrdiniImportService {
.setDtbOrdr(new ArrayList<>()) .setDtbOrdr(new ArrayList<>())
.setOperation(OperationType.INSERT); .setOperation(OperationType.INSERT);
dtbOrdtMap.put(tipoCliente, dtbOrdt); if(codAnagTd != null){
dtbOrdt.setCodFornTd(codAnagTd);
}
dtbOrdtMap.put(key, dtbOrdt);
} }
DtbOrdr dtbOrdr = new DtbOrdr(); DtbOrdr dtbOrdr = new DtbOrdr();
@@ -227,7 +232,7 @@ public class OrdiniImportService {
.setQta(new BigDecimal(record.get(4))) .setQta(new BigDecimal(record.get(4)))
.setOperation(OperationType.INSERT); .setOperation(OperationType.INSERT);
dtbOrdtMap.get(tipoCliente).getDtbOrdr().add(dtbOrdr); dtbOrdtMap.get(key).getDtbOrdr().add(dtbOrdr);
} }
List<DtbOrdt> dtbOrdtList = new ArrayList<>(dtbOrdtMap.values()); List<DtbOrdt> dtbOrdtList = new ArrayList<>(dtbOrdtMap.values());