From f62dee068ae6d3fee4ef1b9be4818e20abc5d10d Mon Sep 17 00:00:00 2001 From: MinaR Date: Thu, 7 Nov 2024 10:49:45 +0100 Subject: [PATCH 1/6] aggiunta regola che riporta il vettore sull'ordine quando viene agganciato un viaggio --- .../ems/rules/completing/OrderRules.java | 20 +++++++++++++++++++ .../src/main/resources/rules/post_calc.drl | 3 +++ 2 files changed, 23 insertions(+) diff --git a/ems-core/src/main/java/it/integry/ems/rules/completing/OrderRules.java b/ems-core/src/main/java/it/integry/ems/rules/completing/OrderRules.java index c620b0d3b6..f4381a086c 100644 --- a/ems-core/src/main/java/it/integry/ems/rules/completing/OrderRules.java +++ b/ems-core/src/main/java/it/integry/ems/rules/completing/OrderRules.java @@ -477,4 +477,24 @@ public class OrderRules extends QueryRules { return true; } + + public static void setCodVvetIdViaggio(Connection conn, DtbOrdt dtbOrdt) throws SQLException { + if ( dtbOrdt.getDtbOrdr() != null && dtbOrdt.getDtbOrdr().size() > 0 ){ + List listaIdViaggio = dtbOrdt.getDtbOrdr().stream() + .filter(x->x.getIdViaggio() != null) + .map( + DtbOrdr::getIdViaggio + ).distinct().collect(Collectors.toList()); + + String sql = + String.format( + "SELECT TOP 1 cod_vvet FROM vtb_viaggi WHERE id_viaggio in (%s) ORDER BY data_ora_iniz_trasp DESC", + UtilityDB.listValueToString(listaIdViaggio)); + + String codVvet = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql); + if ( !UtilityString.isNullOrEmpty(codVvet)){ + dtbOrdt.setCodVvet(codVvet); + } + } + } } \ No newline at end of file diff --git a/ems-core/src/main/resources/rules/post_calc.drl b/ems-core/src/main/resources/rules/post_calc.drl index 33132fe45e..a17abb0a14 100644 --- a/ems-core/src/main/resources/rules/post_calc.drl +++ b/ems-core/src/main/resources/rules/post_calc.drl @@ -57,6 +57,9 @@ then } CommonRules.completePosRigaEntity(conn, $testata); OrdWebRules.completeIdArtOrd(conn, $testata); + if ($testata.getGestione().equalsIgnoreCase("V")) { + OrderRules.setCodVvetIdViaggio(conn, $testata); + } if ($testata.getExecuteRecalc() ) { DocOrdCalTotaliRules.calcTotali(conn, $testata); OrderRules.sospendiOrdine(conn, $testata); From 1750bcf890ad6ac254149c443a6b16ce0053fdf6 Mon Sep 17 00:00:00 2001 From: MinaR Date: Thu, 7 Nov 2024 10:50:00 +0100 Subject: [PATCH 2/6] esclusi articoli null --- .../wms/accettazione/service/WMSAccettazioneBollaService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneBollaService.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneBollaService.java index 1894c482ea..9b66705f28 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneBollaService.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/accettazione/service/WMSAccettazioneBollaService.java @@ -114,6 +114,7 @@ public class WMSAccettazioneBollaService { " FROM Wdtb_docr left outer join mtb_aart on Wdtb_docr.cod_mart = mtb_aart.cod_mart \n" + " left outer join mtb_grup on mtb_aart.cod_mgrp = mtb_grup.cod_mgrp \n" + " WHERE wdtb_docr.cod_art_for is not null AND \n" + + " wdtb_docr.cod_mart is not null AND \n" + " ( mtb_grup.tipo_mgrp is null or mtb_grup.tipo_mgrp <> 'FTT') \n" + " group by Wdtb_docr.num_doc,\n" + " Wdtb_docr.data_doc,\n" + From b95c4a1caa94ccb33bf6851118ac5affd9b5ac5d Mon Sep 17 00:00:00 2001 From: FabioN Date: Thu, 7 Nov 2024 11:45:55 +0100 Subject: [PATCH 3/6] Personalizzazione stampa prezzi bolla per VG --- .../model/Migration_20241105102316.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241105102316.java diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241105102316.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241105102316.java new file mode 100644 index 0000000000..1a30db640f --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241105102316.java @@ -0,0 +1,17 @@ +package it.integry.ems.migration.model;import it.integry.ems.migration._base.BaseMigration; +import it.integry.ems.migration._base.MigrationModelInterface; + +public class Migration_20241105102316 extends BaseMigration implements MigrationModelInterface{ + + @Override + public void up()throws Exception { + if(isHistoryDB()) + return; + } + + @Override + public void down()throws Exception{ + + } + +} \ No newline at end of file From 56ac903f9ec8fe318ce0a4aa763bb1ee972fc982 Mon Sep 17 00:00:00 2001 From: FabioN Date: Thu, 7 Nov 2024 11:46:11 +0100 Subject: [PATCH 4/6] Personalizzazione stampa prezzi bolla per VG --- .../model/Migration_20241105102316.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241105102316.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241105102316.java index 1a30db640f..309d180deb 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241105102316.java +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241105102316.java @@ -1,16 +1,25 @@ -package it.integry.ems.migration.model;import it.integry.ems.migration._base.BaseMigration; +package it.integry.ems.migration.model; + +import it.integry.ems.migration._base.BaseMigration; +import it.integry.ems.migration._base.IntegryCustomerDB; import it.integry.ems.migration._base.MigrationModelInterface; -public class Migration_20241105102316 extends BaseMigration implements MigrationModelInterface{ +public class Migration_20241105102316 extends BaseMigration implements MigrationModelInterface { @Override - public void up()throws Exception { - if(isHistoryDB()) + public void up() throws Exception { + if (isHistoryDB()) return; + + if (!isCustomerDb(IntegryCustomerDB.Salpar_VgAlimenti)) + return; + + executeStatement("update vtb_dest set flag_stampa_prezzi = 'S' where flag_stampa_prezzi = 'N'"); + executeStatement("update vtb_clie set flag_stampa_prezzi = 'S' where flag_stampa_prezzi = 'N'"); } @Override - public void down()throws Exception{ + public void down() throws Exception { } From 8833d7dffcc6027ab290705adf1254e61b188a97 Mon Sep 17 00:00:00 2001 From: MinaR Date: Thu, 7 Nov 2024 15:03:50 +0100 Subject: [PATCH 5/6] corretto errore su esportazione reparti --- .../ems/activity/service/SteUPService.java | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/ems-engine/src/main/java/it/integry/ems/activity/service/SteUPService.java b/ems-engine/src/main/java/it/integry/ems/activity/service/SteUPService.java index 07a63e5551..35bd15551b 100644 --- a/ems-engine/src/main/java/it/integry/ems/activity/service/SteUPService.java +++ b/ems-engine/src/main/java/it/integry/ems/activity/service/SteUPService.java @@ -694,24 +694,28 @@ public class SteUPService { } else if (activityTypeId.equalsIgnoreCase(tipoAttivitaRotturaStock)) { List> pluRepo = getGrigliaPluRepo(codMdep, codJfas, activityTypeId, null, dataCreation, true, barcodes); if (repartiFreschi != null && repartiFreschi.contains(codJfas)) { - List finalBarcodes = barcodes; - barcodes = new ArrayList<>(); + if ( barcodes != null && barcodes.size() > 0 ) { + List finalBarcodes = barcodes; + barcodes = new ArrayList<>(); - Map>> pluByCodMarts = pluRepo.stream() - .collect(groupingBy(x -> x.get("cod_mart").toString())); + Map>> pluByCodMarts = pluRepo.stream() + .collect(groupingBy(x -> x.get("cod_mart").toString())); - for (Map.Entry>> entry : pluByCodMarts.entrySet()) { - List> hashMapList = entry.getValue(); - String codMart = entry.getKey(); - System.out.println(codMart); + for (Map.Entry>> entry : pluByCodMarts.entrySet()) { + List> hashMapList = entry.getValue(); + String codMart = entry.getKey(); + logger.info("Articolo: " + codMart); - boolean containBarcode = hashMapList.stream().anyMatch(x -> finalBarcodes.contains(((String) x.get("barcode")))); + boolean containBarcode = hashMapList.stream().anyMatch(x -> finalBarcodes.contains(((String) x.get("barcode")))); - if (!containBarcode) { - java.util.stream.Stream> barcode = hashMapList.stream().filter(x -> x.get("barcode") != null); - if (barcode.count() > 0) - barcodes.add(barcode.findFirst().map(x -> x.get("barcode").toString()).get()); + if (containBarcode) { + java.util.stream.Stream> barcode = hashMapList.stream().filter(x -> x.get("barcode") != null); + if (barcode.count() > 0) + barcodes.add(barcode.findFirst().map(x -> x.get("barcode").toString()).get()); + } } + } else { + barcodes.addAll(pluRepo.stream().filter(x -> x.get("barcode") != null).map(x->x.get("barcode").toString()).collect(Collectors.toList())); } // barcodes = pluRepo.stream().filter(a-> !finalBarcodes.contains(((String) a.get("barcode")))).map(a->(String) a.get("barcode")).collect(Collectors.toList()); } else { From 0530b4132ebe612f47838e222d2a1ab975ee7dde Mon Sep 17 00:00:00 2001 From: MinaR Date: Thu, 7 Nov 2024 15:05:26 +0100 Subject: [PATCH 6/6] corretto errore su esportazione reparti --- .../main/java/it/integry/ems/activity/service/SteUPService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ems-engine/src/main/java/it/integry/ems/activity/service/SteUPService.java b/ems-engine/src/main/java/it/integry/ems/activity/service/SteUPService.java index 35bd15551b..03270542ff 100644 --- a/ems-engine/src/main/java/it/integry/ems/activity/service/SteUPService.java +++ b/ems-engine/src/main/java/it/integry/ems/activity/service/SteUPService.java @@ -708,7 +708,7 @@ public class SteUPService { boolean containBarcode = hashMapList.stream().anyMatch(x -> finalBarcodes.contains(((String) x.get("barcode")))); - if (containBarcode) { + if (!containBarcode) { java.util.stream.Stream> barcode = hashMapList.stream().filter(x -> x.get("barcode") != null); if (barcode.count() > 0) barcodes.add(barcode.findFirst().map(x -> x.get("barcode").toString()).get());