From a401490d4b10b84078b4ad067286794aea2f2381 Mon Sep 17 00:00:00 2001 From: MinaR Date: Tue, 24 Sep 2024 16:59:05 +0200 Subject: [PATCH 1/3] controllo sul null --- .../DocumentiAcquistoImportService.java | 69 +++++++------------ 1 file changed, 24 insertions(+), 45 deletions(-) diff --git a/ems-engine/src/main/java/it/integry/ems/document/Import/service/DocumentiAcquistoImportService.java b/ems-engine/src/main/java/it/integry/ems/document/Import/service/DocumentiAcquistoImportService.java index e547ff56d2..c83f7a75cf 100644 --- a/ems-engine/src/main/java/it/integry/ems/document/Import/service/DocumentiAcquistoImportService.java +++ b/ems-engine/src/main/java/it/integry/ems/document/Import/service/DocumentiAcquistoImportService.java @@ -981,7 +981,7 @@ public class DocumentiAcquistoImportService { if (codClie == null) { anomalie.add( AnomalieDTO.info( - "Codice cliente non trovato: " + + "Codice fornitore non trovato: " + CommonConstants.A_CAPO + CommonConstants.TAB + CommonConstants.TAB + @@ -1012,13 +1012,11 @@ public class DocumentiAcquistoImportService { HashMap result = UtilityDB.executeSimpleQueryOnlyFirstRow(connection, sql); if (result == null){ - anomalie.add( - AnomalieDTO.error(String.format("Nessun deposito agganciato all'intercode %s", rifOrdApulia.getCodicePv() )) - ); + continue; } - String codMdep = result.get("cod_mdep").toString(); - String codForn = result.get("cod_forn").toString(); + String codMdep = (String) result.get("cod_mdep"); + String codForn = (String) result.get("cod_forn"); sql = "select dtb_ordt.data_ord, dtb_ordt.num_ord, dtb_ordr.riga_ord, dtb_ordr.cod_mart, dtb_ordr.cod_art_for\n" + "from dtb_ordt \n" + @@ -1068,13 +1066,9 @@ public class DocumentiAcquistoImportService { ", Codice deposito: " + codMdep ) ); - } else if (!listDocumentDtb.isEmpty() && listDocumentWdtb.isEmpty()) { - entityReturn.addAll(processRifOrdApuliaList(listDocumentDtb, selectOrdine, anomalie, tipiDoc, ds, pIva, false)); - } else if (listDocumentDtb.isEmpty()) { - entityReturn.addAll(processRifOrdApuliaList(listDocumentWdtb, selectOrdine, anomalie, tipiDoc, ds, pIva, true)); } else { - entityReturn.addAll(processRifOrdApuliaList(listDocumentDtb, selectOrdine, anomalie, tipiDoc, ds, pIva, false)); - entityReturn.addAll(processRifOrdApuliaList(listDocumentWdtb, selectOrdine, anomalie, tipiDoc, ds, pIva, true)); + if( !listDocumentDtb.isEmpty()) entityReturn.add(processRifOrdApuliaList(listDocumentDtb, selectOrdine, anomalie, tipiDoc, ds, pIva, false)); + if( !listDocumentWdtb.isEmpty()) entityReturn.add(processRifOrdApuliaList(listDocumentWdtb, selectOrdine, anomalie, tipiDoc, ds, pIva, true)); } } } @@ -1097,8 +1091,7 @@ public class DocumentiAcquistoImportService { storedProcedure.close(); } - private List processRifOrdApuliaList(List> listDocument, List> selectOrdine, List anomalie, String tipiDoc, AdvancedDataSource ds, String pIva, boolean isWdtb) throws Exception { - List entityList = new ArrayList<>(); + private DtbBaseDocT processRifOrdApuliaList(List> listDocument, List> selectOrdine, List anomalie, String tipiDoc, AdvancedDataSource ds, String pIva, boolean isWdtb) throws Exception { DtbBaseDocT dtbBaseDoct; if (isWdtb) { @@ -1114,6 +1107,11 @@ public class DocumentiAcquistoImportService { .setSerDoc(listDocument.get(0).get("ser_doc").toString()) .setCodAnag(listDocument.get(0).get("cod_anag").toString()); + if (isWdtb) + ((WdtbDoct) dtbBaseDoct).setWdtbDocr(new ArrayList<>()); + else + ((DtbDoct) dtbBaseDoct).setDtbDocr(new ArrayList<>()); + List baseDtbDocrList = new ArrayList<>(); for (HashMap document : listDocument) { @@ -1162,56 +1160,37 @@ public class DocumentiAcquistoImportService { existingObject.getSerDoc().equals(dtbBaseDocr.getSerDoc())); if (!existsInList) { + if (isWdtb) + ((WdtbDoct) dtbBaseDoct).getWdtbDocr().add((WdtbDocr) dtbBaseDocr); + else + ((DtbDoct) dtbBaseDoct).getDtbDocr().add((DtbDocr) dtbBaseDocr); baseDtbDocrList.add(dtbBaseDocr); } } } - - if (isWdtb) { - WdtbDoct wdtbDoct = (WdtbDoct) dtbBaseDoct; - List wdtbDocrList = new ArrayList<>(); - for (DtbBaseDocR dtbBaseDocr : baseDtbDocrList) { - wdtbDocrList.add((WdtbDocr) dtbBaseDocr); - } - - wdtbDoct.setWdtbDocr(wdtbDocrList); - entityList.add(wdtbDoct); - } else { - DtbDoct dtbDoct = (DtbDoct) dtbBaseDoct; - List dtbDocrList = new ArrayList<>(); - for (DtbBaseDocR dtbBaseDocr : baseDtbDocrList) { - dtbDocrList.add((DtbDocr) dtbBaseDocr); - } - - dtbDoct.setDtbDocr(dtbDocrList); - entityList.add(dtbDoct); - } } - List entityReturn = new ArrayList<>(); MultiDBTransactionManager m = new MultiDBTransactionManager(); try { m.addConnection(ds.getProfileName(), ds.getDataSource()); m.setPrimaryDs(ds.getProfileName()); - for (EntityBase e : entityList) { - if (!isWdtb) { - UpdProgOrdini(m, (DtbDoct) e, -1); - } + if (!isWdtb) { + UpdProgOrdini(m, (DtbDoct) dtbBaseDoct, -1); + } - entityProcessor.processEntity(e, true, false, requestData.getUsername(), m, false); - entityReturn.add(e); + entityProcessor.processEntity(dtbBaseDoct, true, false, requestData.getUsername(), m, false); - if (!isWdtb) { - UpdProgOrdini(m, (DtbDoct) e, 1); - } + + if (!isWdtb) { + UpdProgOrdini(m, (DtbDoct) dtbBaseDoct, 1); } } catch (Exception e) { m.rollbackAll(); } m.closeAll(); - return entityReturn; + return dtbBaseDoct; } } \ No newline at end of file From dbe0563dad7e8d0508cdb13d8aa57bf79bfd1edb Mon Sep 17 00:00:00 2001 From: MinaR Date: Tue, 24 Sep 2024 17:05:51 +0200 Subject: [PATCH 2/3] controllo sul null --- .../Import/service/DocumentiAcquistoImportService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ems-engine/src/main/java/it/integry/ems/document/Import/service/DocumentiAcquistoImportService.java b/ems-engine/src/main/java/it/integry/ems/document/Import/service/DocumentiAcquistoImportService.java index c83f7a75cf..db3ed23a06 100644 --- a/ems-engine/src/main/java/it/integry/ems/document/Import/service/DocumentiAcquistoImportService.java +++ b/ems-engine/src/main/java/it/integry/ems/document/Import/service/DocumentiAcquistoImportService.java @@ -981,7 +981,7 @@ public class DocumentiAcquistoImportService { if (codClie == null) { anomalie.add( AnomalieDTO.info( - "Codice fornitore non trovato: " + + "Codice cliente non trovato: " + CommonConstants.A_CAPO + CommonConstants.TAB + CommonConstants.TAB + @@ -1012,6 +1012,9 @@ public class DocumentiAcquistoImportService { HashMap result = UtilityDB.executeSimpleQueryOnlyFirstRow(connection, sql); if (result == null){ + anomalie.add( + AnomalieDTO.error(String.format("Nessun deposito agganciato all'intercode %s", rifOrdApulia.getCodicePv() )) + ); continue; } From 676d41119168e3beb26b5b0beb53a4fc1ba9a652 Mon Sep 17 00:00:00 2001 From: CarlaD Date: Tue, 24 Sep 2024 18:11:20 +0200 Subject: [PATCH 3/3] modificata entity jtb_flav --- .../java/it/integry/ems_model/entity/JtbFlav.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/JtbFlav.java b/ems-core/src/main/java/it/integry/ems_model/entity/JtbFlav.java index cb1eb26502..0b8c0b9aa1 100644 --- a/ems-core/src/main/java/it/integry/ems_model/entity/JtbFlav.java +++ b/ems-core/src/main/java/it/integry/ems_model/entity/JtbFlav.java @@ -158,7 +158,7 @@ public class JtbFlav extends EntityBase { private String iban; @SqlField(value = "altre_mansioni", maxLength = 8000) - private String altre_mansioni; + private String altreMansioni; private String precode; @@ -522,6 +522,10 @@ public class JtbFlav extends EntityBase { this.iban = iban; } + public String getAltreMansioni() { return altreMansioni; } + + public void setAltreMansioni(String altreMansioni) { this.altreMansioni = altreMansioni; } + public String getPrecode() { return precode; } @@ -539,13 +543,6 @@ public class JtbFlav extends EntityBase { this.jtbFlavEventi = jtbFlavEventi; } - public String getAltre_mansioni() { - return altre_mansioni; - } - - public void setAltre_mansioni(String altre_mansioni) { - this.altre_mansioni = altre_mansioni; - } @Override protected void insertChilds() throws Exception {