From a1b813f051aaff97740b50e80211a9ffc864bea7 Mon Sep 17 00:00:00 2001 From: MinaR Date: Wed, 15 Oct 2025 15:55:59 +0200 Subject: [PATCH 1/3] sistemato storno scontrino totale --- .../integry/ems/retail/Scontrini/service/MmposServices.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 cf64eeea34..be2868be1b 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 @@ -226,7 +226,7 @@ public class MmposServices { } else if (!flagTrans.equalsIgnoreCase("CS") && "C".equals(flagTrans.substring(0, 1)) || "R".equals(flagTrans.substring(0, 1))) { List ntbDocr; - if ( row.getFlTrans().equalsIgnoreCase("CX") && row.getOpTrans().equalsIgnoreCase("ST")) + if (row.getFlTrans().equalsIgnoreCase("CX") && row.getOpTrans().equalsIgnoreCase("ST")) continue; ntbDocr = getRow(row, multiDBTransactionManager.getPrimaryConnection(), impostaDatiOrdine, impostaKit, mmpos.getPrimaryConnection(), elencoPromozioni); @@ -446,7 +446,7 @@ public class MmposServices { } ntbDocr.setPrzUntIva(przUnt); boolean isStorno = false; - if (!UtilityString.isNullOrEmpty(row.getKeysRef()) && row.getParam1() != null) { + if (row.getParam1() != null) { isStorno = true; try { if (Integer.parseInt(row.getParam1()) != 0) { @@ -454,6 +454,7 @@ public class MmposServices { BigDecimal valsco = row.getPrezzo().subtract( row.getPrezzoNetto().divide(param1, 5, RoundingMode.HALF_UP).multiply(row.getQuantita())); ntbDocr.setValSco(valsco); + } else { ntbDocr.setValSco(BigDecimal.ZERO); } From 120d85c1d38af73b707ae3e6387bd55175e700b5 Mon Sep 17 00:00:00 2001 From: MinaR Date: Wed, 15 Oct 2025 17:45:25 +0200 Subject: [PATCH 2/3] sistemato calcolo tempi --- .../it/integry/ems/activity/service/ActivityService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java b/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java index 6eaf739d61..9cb15cbf81 100644 --- a/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java +++ b/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java @@ -494,10 +494,12 @@ public class ActivityService { String activityId = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql); - long seconds = (long) (stbActivity.getOreRapportino().floatValue() * 60L * 60L); + long minuti = (long) (stbActivity.getOreRapportino().floatValue() * 60L); if (stbActivity.getEffectiveTime() != null) { - stbActivity.setEffectiveEndtime(stbActivity.getEffectiveTime().plusSeconds(seconds)); + stbActivity.setEffectiveEndtime(stbActivity.getEffectiveTime().plusMinutes(minuti)); + } else { + stbActivity.setEffectiveTime(stbActivity.getEffectiveEndtime().minusMinutes(minuti)); } if (UtilityString.isNullOrEmpty(activityId)) { From 057e3ac3c10739850e24cd462d3785903a9f391d Mon Sep 17 00:00:00 2001 From: Valerio Castellana Date: Thu, 16 Oct 2025 16:14:07 +0200 Subject: [PATCH 3/3] [SUIT - FARMMES] - aggiunto MArshaller per convertire localDateTime in XML --- .../ems/adapter/XmlLocalDateAdapter.java | 34 ++++++++++++++++++ .../ems/adapter/XmlLocalDateTimeAdapter.java | 36 +++++++++++++++++++ .../document/farm_mes/dto/NoteProduttive.java | 10 +++--- .../service/FarmMesImportService.java | 2 +- 4 files changed, 77 insertions(+), 5 deletions(-) create mode 100644 ems-core/src/main/java/it/integry/ems/adapter/XmlLocalDateAdapter.java create mode 100644 ems-core/src/main/java/it/integry/ems/adapter/XmlLocalDateTimeAdapter.java diff --git a/ems-core/src/main/java/it/integry/ems/adapter/XmlLocalDateAdapter.java b/ems-core/src/main/java/it/integry/ems/adapter/XmlLocalDateAdapter.java new file mode 100644 index 0000000000..041ab962d7 --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/adapter/XmlLocalDateAdapter.java @@ -0,0 +1,34 @@ +package it.integry.ems.adapter; + +import it.integry.ems_model.utility.UtilityString; + +import javax.xml.bind.annotation.adapters.XmlAdapter; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + +public class XmlLocalDateAdapter extends XmlAdapter { + + private DateTimeFormatter sdf; + + public XmlLocalDateAdapter() { + sdf = DateTimeFormatter.ofPattern("dd-MM-yyyy"); + } + + public XmlLocalDateAdapter(String format) { + sdf = DateTimeFormatter.ofPattern(format); + } + + @Override + public String marshal(LocalDate arg0) throws Exception { + return arg0.format(sdf); + } + + @Override + public LocalDate unmarshal(String arg0) throws Exception { + String format = UtilityString.determineDateFormat(arg0); + if (format != null && !"dd-MM-yyyy".equals(format)) + sdf = DateTimeFormatter.ofPattern(format); + return LocalDate.parse(arg0,sdf); + } + +} diff --git a/ems-core/src/main/java/it/integry/ems/adapter/XmlLocalDateTimeAdapter.java b/ems-core/src/main/java/it/integry/ems/adapter/XmlLocalDateTimeAdapter.java new file mode 100644 index 0000000000..02ea959307 --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/adapter/XmlLocalDateTimeAdapter.java @@ -0,0 +1,36 @@ +package it.integry.ems.adapter; + +import it.integry.ems_model.utility.UtilityString; + +import javax.xml.bind.annotation.adapters.XmlAdapter; +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; + +public class XmlLocalDateTimeAdapter extends XmlAdapter { + + private DateTimeFormatter sdf; + + public XmlLocalDateTimeAdapter() { + sdf = DateTimeFormatter.ofPattern("dd-MM-yyyy HH:mm:ss"); + } + + public XmlLocalDateTimeAdapter(String format) { + sdf = DateTimeFormatter.ofPattern(format); + } + + @Override + public String marshal(LocalDateTime arg0) throws Exception { + return arg0.format(sdf); + } + + @Override + public LocalDateTime unmarshal(String arg0) throws Exception { + String format = UtilityString.determineDateFormat(arg0); + if (format != null && !"dd-MM-yyyy HH:mm:ss".equals(format)) + sdf = DateTimeFormatter.ofPattern(format); + return LocalDateTime.parse(arg0,sdf); + } + +} diff --git a/ems-engine/src/main/java/it/integry/ems/document/farm_mes/dto/NoteProduttive.java b/ems-engine/src/main/java/it/integry/ems/document/farm_mes/dto/NoteProduttive.java index 18fee43490..063ef4deaf 100644 --- a/ems-engine/src/main/java/it/integry/ems/document/farm_mes/dto/NoteProduttive.java +++ b/ems-engine/src/main/java/it/integry/ems/document/farm_mes/dto/NoteProduttive.java @@ -1,18 +1,20 @@ package it.integry.ems.document.farm_mes.dto; import it.integry.ems.adapter.XmlDateAdapter; +import it.integry.ems.adapter.XmlLocalDateTimeAdapter; import javax.ejb.Local; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.Date; @XmlRootElement(name = "NOTE_PRODUTTIVE") public class NoteProduttive { private Date dataOrd; - private LocalDate dataNota; + private LocalDateTime dataNota; int numOrd; String gestione, note; @@ -26,13 +28,13 @@ public class NoteProduttive { this.dataOrd = dataOrd; } - public LocalDate getDataNota() { + public LocalDateTime getDataNota() { return dataNota; } @XmlElement(name = "DATA_NOTA") - @XmlJavaTypeAdapter(XmlDateAdapter.class) - public void setDataNota(LocalDate dataNota) { + @XmlJavaTypeAdapter(XmlLocalDateTimeAdapter.class) + public void setDataNota(LocalDateTime dataNota) { this.dataNota = dataNota; } diff --git a/ems-engine/src/main/java/it/integry/ems/document/farm_mes/service/FarmMesImportService.java b/ems-engine/src/main/java/it/integry/ems/document/farm_mes/service/FarmMesImportService.java index 570b8689ad..0799399185 100644 --- a/ems-engine/src/main/java/it/integry/ems/document/farm_mes/service/FarmMesImportService.java +++ b/ems-engine/src/main/java/it/integry/ems/document/farm_mes/service/FarmMesImportService.java @@ -853,7 +853,7 @@ public class FarmMesImportService { ldt_dataOrd = noteProduttive.getDataOrd(); numOrd = noteProduttive.getNumOrd(); noteProd = noteProduttive.getNote(); - dataNota = noteProduttive.getDataNota().atStartOfDay(); + dataNota = noteProduttive.getDataNota(); // ACQUISIZIONE DATI ORDINE sql =