From 44989dea5a6ce6d1c81b4033fa166893f060a28d Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 3 Apr 2024 10:51:32 +0200
Subject: [PATCH] Fix su date mtbcolt

---
 .idea/runConfigurations/Tomcat.xml                              | 1 -
 .../java/it/integry/ems/rules/completing/DocOrdUntMisRules.java | 2 +-
 .../integry/ems/production/service/MesProductionServiceV2.java  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.idea/runConfigurations/Tomcat.xml b/.idea/runConfigurations/Tomcat.xml
index fca6640ec7..e2cd12f560 100644
--- a/.idea/runConfigurations/Tomcat.xml
+++ b/.idea/runConfigurations/Tomcat.xml
@@ -1,7 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Tomcat" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="1.8" nameIsGenerated="true">
     <option name="COMMON_VM_ARGUMENTS" value="-Xms512m -Xmx2048m" />
-    <option name="UPDATING_POLICY" value="restart-server" />
     <deployment>
       <artifact name="ems-engine:war exploded">
         <settings>
diff --git a/ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdUntMisRules.java b/ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdUntMisRules.java
index 3af44805db..ff47402e12 100644
--- a/ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdUntMisRules.java
+++ b/ems-core/src/main/java/it/integry/ems/rules/completing/DocOrdUntMisRules.java
@@ -182,7 +182,7 @@ public class DocOrdUntMisRules extends QueryRules {
             qtaCnf = qta.divide(numCnf, EmsRestConstants.cifreDecMax, RoundingMode.HALF_UP);
         }
 
-        if (UtilityBigDecimal.isNullOrZero(qtaCnf) && gestione.equalsIgnoreCase("A") && !UtilityString.isNullOrEmpty(listino)) {
+        if (UtilityBigDecimal.isNullOrZero(qtaCnf) && UtilityString.equalsIgnoreCase(gestione, "A") && !UtilityString.isNullOrEmpty(listino)) {
             sql =
                     Query.format("SELECT qta_cnf FROM mtb_lisa WHERE cod_alis = %s AND cod_mart = %s AND ( %s is null OR cod_art_for = %s) ORDER BY flag_attivo",
             listino, codMart, codArtFor, codArtFor);
diff --git a/ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java b/ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java
index 4c5b16629d..a7d1f81038 100644
--- a/ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java
+++ b/ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java
@@ -721,7 +721,7 @@ public class MesProductionServiceV2 {
 
         pairList.add(new PairsDTO("num_collo", mtbColtToPrint.getNumCollo()));
         pairList.add(new PairsDTO("ser_collo", mtbColtToPrint.getSerCollo()));
-        pairList.add(new PairsDTO("data_collo", new SimpleDateFormat(CommonConstants.DATE_FORMAT_YMD).format(mtbColtToPrint.getDataCollo())));
+        pairList.add(new PairsDTO("data_collo", CommonConstants.DATE_YMD_DASHED_FORMATTER.format(mtbColtToPrint.getDataCollo())));
         pairList.add(new PairsDTO("gestione", mtbColtToPrint.getGestione()));
         pairList.add(new PairsDTO("num_prog_collo", numProgCollo));