Merge branch 'master' into develop

ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240426173500.java

@@ -17,7 +17,7 @@ public class Migration_20240426173500 extends BaseMigration implements Migration
         if (!isCustomerDb(
                 IntegryCustomerDB.Carelli_Format)
         )
-        return;
+            return;
 
         updateSetupValue("EXPORT_DOCUMENTI VENDITA", "DIALOGO", "INSERT_LOG", "S");
     }

ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240506152142.java

@@ -11,12 +11,12 @@ public class Migration_20240506152142 extends BaseMigration implements Migration
         if (isHistoryDB())
             return;
 
-            if (!isCustomerDb(
+        if (!isCustomerDb(
-                    IntegryCustomerDB.Gramm_Gramm)){
+                IntegryCustomerDB.Gramm_Gramm)) {
-                return;
+            return;
-            }
+        }
 
-		createSetup("IMPORT_ORDINI", "EURITMO", "SET_DATA_CONS_CLIE_C2339", "N", "Se impostato a S allora la data di consegna non viene calcolata, ma presa quella del cliente", false, null, false, false, false, false, false, null, false, null);
+        createSetup("IMPORT_ORDINI", "EURITMO", "SET_DATA_CONS_CLIE_C2339", "N", "Se impostato a S allora la data di consegna non viene calcolata, ma presa quella del cliente", false, null, false, false, false, false, false, null, false, null);
     }
 
     @Override

ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240514113425.java

@@ -0,0 +1,58 @@
+package it.integry.ems.migration.model;
+
+import it.integry.ems.entity_logger.db_schema_manager.component.SQLServerDBSchemaManager;
+import it.integry.ems.migration._base.BaseMigration;
+import it.integry.ems.migration._base.IntegryCustomer;
+import it.integry.ems.migration._base.MigrationModelInterface;
+
+import java.util.List;
+
+public class Migration_20240514113425 extends BaseMigration implements MigrationModelInterface {
+
+    @Override
+    public void up() throws Exception {
+        if (isHistoryDB())
+            return;
+
+        if (isCustomer(
+                IntegryCustomer.Biolevante,
+                IntegryCustomer.Cosmapack,
+                IntegryCustomer.Didonna,
+                IntegryCustomer.DolceBonta,
+                IntegryCustomer.Dulciar,
+                IntegryCustomer.FolliesGroup,
+                IntegryCustomer.Fiume,
+                IntegryCustomer.Frudis,
+                IntegryCustomer.Idrotecnica,
+                IntegryCustomer.Ime,
+                IntegryCustomer.Ivr,
+                IntegryCustomer.Lamonarca,
+                IntegryCustomer.Maggio,
+                IntegryCustomer.Materica,
+                IntegryCustomer.Midel,
+                IntegryCustomer.Morgante,
+                IntegryCustomer.ResinaColor,
+                IntegryCustomer.RossoGargano,
+                IntegryCustomer.Salpar,
+                IntegryCustomer.Sardinya,
+                IntegryCustomer.Smetar,
+                IntegryCustomer.Tosca,
+                IntegryCustomer.TwoBrothers,
+                IntegryCustomer.Vinella)) {
+            updateSetupValue("DATI_AZIENDA", "SETUP", "DELIMITED_IDENTIFIER", "1");
+            updateSetupValue("DATI_AZIENDA", "SETUP", "FLAG_ANSI_PADDING", "S");
+            updateSetupValue("DATI_AZIENDA", "SETUP", "FLAG_CONCAT_NULL_YIELDS_NULL", "S");
+
+            SQLServerDBSchemaManager schemaManager = new SQLServerDBSchemaManager(this.advancedDataSource.getConnection());
+            final List<String> queries = schemaManager.generateAlterTableToDisableAnsiPadding();
+
+            //executeStatement(queries.toArray(new String[0]));
+        }
+    }
+
+    @Override
+    public void down() throws Exception {
+
+    }
+
+}

ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java

@@ -46,7 +46,6 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Service
@@ -902,12 +901,11 @@ public class MesProductionServiceV2 {
 
 
     public MtbColt createColloCaricoProdottoFinito(CaricoProdottoFinitoDTO dto) throws Exception {
-
-
         DtbOrdt ordineLav = new DtbOrdt()
                 .setDataOrd(dto.getDataOrd())
                 .setGestione(dto.getGestione())
                 .setNumOrd(dto.getNumOrd());
+
         ordineLav.setOperation(OperationType.SELECT_OBJECT);
         entityProcessor.processEntity(ordineLav, multiDBTransactionManager);
         MtbAart mtbAart = new MtbAart().setCodMart(ordineLav.getCodProd());