From dfdc57d20a3c707a86ed42e7f107191e9364e719 Mon Sep 17 00:00:00 2001 From: MinaR Date: Tue, 25 Feb 2025 12:52:00 +0100 Subject: [PATCH 1/2] in fase di accettazione modificare la data di registrazione del doucmento --- .../ems/retail/pvmRetail/service/PvmAccettazioneService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmAccettazioneService.java b/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmAccettazioneService.java index 44ff51d7fb..3184b8ee25 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmAccettazioneService.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmAccettazioneService.java @@ -362,7 +362,8 @@ public class PvmAccettazioneService { if (dtbDoct instanceof WdtbDoct) ((WdtbDoct) dtbDoct) .setDataInizTrasp(dataInizTrap) - .setOraInizTrasp(oraInizTrasp); + .setOraInizTrasp(oraInizTrasp) + .setDataReg(dataInizTrap); } private WdtbDocr insertRowBolla(AccettazioneDTO.Articoli articolo, Integer idRiga, String partitaMag, BigDecimal qtaDoc, BigDecimal valUnt) throws Exception { From a64c790330f1a14ead8c7741a0adc3f45ce59b4e Mon Sep 17 00:00:00 2001 From: MinaR Date: Tue, 25 Feb 2025 12:59:52 +0100 Subject: [PATCH 2/2] sistemata procedura di importazione promo apulia e corretto errore su giacenza --- .../importaz/service/ImportApuliaPromoService.java | 8 +++++++- .../it/integry/ems/retail/service/GiacenzaService.java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportApuliaPromoService.java b/ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportApuliaPromoService.java index 7d2a2983c6..d58c481d58 100644 --- a/ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportApuliaPromoService.java +++ b/ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportApuliaPromoService.java @@ -88,7 +88,13 @@ public class ImportApuliaPromoService { " INNER JOIN mtb_lisa art ON mtb_lisa.cod_barre = art.cod_barre AND mtb_lisa.cod_alis = art.cod_alis\n" + "WHERE mtb_lisa.cod_art_for = " + UtilityDB.valueToString(promozione.getCodArtForn()) + "\n" + " AND mtb_lisa.cod_alis = " + UtilityDB.valueToString(codAlis) + "\n" + - " AND mtb_lisa.cod_barre is not null \n"; + " AND mtb_lisa.cod_barre is not null \n" + + "SELECT art.cod_mart, art.cod_art_for\n" + + "FROM mtb_lisa\n" + + " INNER JOIN mtb_lisa art ON mtb_lisa.descr_art_forn = art.descr_art_forn AND mtb_lisa.cod_alis = art.cod_alis\n" + + "WHERE mtb_lisa.cod_art_for = " + UtilityDB.valueToString(promozione.getCodArtForn()) + "\n" + + " AND mtb_lisa.cod_alis = " + UtilityDB.valueToString(codAlis) + "\n" + + " AND mtb_lisa.descr_art_forn is not null \n"; List mtbLisaData = new ResultSetMapper().mapQuerySetToList(multiDBTransactionManager.getPrimaryConnection(), sql, MtbLisaData.class, OperationType.INSERT_OR_UPDATE); diff --git a/ems-engine/src/main/java/it/integry/ems/retail/service/GiacenzaService.java b/ems-engine/src/main/java/it/integry/ems/retail/service/GiacenzaService.java index 157facf408..6232b75d1c 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/service/GiacenzaService.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/service/GiacenzaService.java @@ -739,7 +739,7 @@ public class GiacenzaService { " )\n" + " )\n" + " -- prendiamo i soli ordini del SECCO, sarà da modificare quando inizieranno ad ordinare anche altri (es. APULD)\n" + - " AND t.listino IN (" + UtilityDB.listValueToString(listini) + ")\n" + + ( listini != null && !listini.isEmpty() ?" AND t.listino IN (" + UtilityDB.listValueToString(listini) + ")\n":"") + " -- ordine non ancora evaso\n" + " AND flag_evaso <> 'E'\n" + " -- filtro solamente un Pdv\n" +