From 952e1b22f2f36892637aad279185c796ed9b2379 Mon Sep 17 00:00:00 2001 From: MinaR Date: Tue, 28 Oct 2025 11:56:16 +0100 Subject: [PATCH] sistemata recupero scontrini --- .../retail/Scontrini/service/MmposServices.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ems-engine/src/main/java/it/integry/ems/retail/Scontrini/service/MmposServices.java b/ems-engine/src/main/java/it/integry/ems/retail/Scontrini/service/MmposServices.java index 64ce96b5aa..780f2acd45 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/Scontrini/service/MmposServices.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/Scontrini/service/MmposServices.java @@ -263,9 +263,7 @@ public class MmposServices { multiDBTransactionManager.commitAll(); entityReturn.add(ntbDoct); } catch (Exception e) { - if (!(e instanceof EntityException && ((EntityException) e).getSqlErrorCode() == 2627)) { - anomalie.add(ScontriniImporterUtilities.setAnomalia(e)); - } + anomalie.add(ScontriniImporterUtilities.setAnomalia(e)); multiDBTransactionManager.rollbackAll(); } } @@ -387,10 +385,10 @@ public class MmposServices { NtbDocr ntbDocr = new NtbDocr(); righe.add(ntbDocr); ntbDocr - .setBarCode(row.getCodice() != null? row.getCodice().trim(): null) - .setCodMart(row.getCodInter() != null? row.getCodInter().trim():null) - .setReparto(row.getCodRep() !=null ? row.getCodRep().trim():null) - .setDescrizione(row.getDesRidot() != null? row.getDesRidot().trim():null); + .setBarCode(row.getCodice() != null ? row.getCodice().trim() : null) + .setCodMart(row.getCodInter() != null ? row.getCodInter().trim() : null) + .setReparto(row.getCodRep() != null ? row.getCodRep().trim() : null) + .setDescrizione(row.getDesRidot() != null ? row.getDesRidot().trim() : null); String promozione = row.getKeysRef(); @@ -524,7 +522,9 @@ public class MmposServices { } String opTrans = row.getOpTrans(); - if (!UtilityString.isNullOrEmpty(opTrans) && !opTrans.toUpperCase().startsWith("ORD")) { + if (!UtilityString.isNullOrEmpty(opTrans) && + !opTrans.toUpperCase().startsWith("ORD") && + !opTrans.toUpperCase().startsWith("RS")) { ntbDocr.setCausaleReso(opTrans); }