Merge remote-tracking branch 'origin/develop' into develop

ems-core/src/main/java/it/integry/ems/migration/_base/IntegryCustomer.java

@@ -5,6 +5,8 @@ public enum IntegryCustomer {
     Agricoper(IntegryCustomerDB.Agricoper_Agricoper,
             IntegryCustomerDB.Agricoper_IlVisone,
             IntegryCustomerDB.Agricoper_Luva),
+
+    ATI(IntegryCustomerDB.ATI_Finpart),
     Auricchio(IntegryCustomerDB.Auricchio_Auricchio,
             IntegryCustomerDB.Auricchio_AuricchioMiki,
             IntegryCustomerDB.Auricchio_AuricchioSrl,

ems-core/src/main/java/it/integry/ems/migration/_base/IntegryCustomerDB.java

@@ -5,7 +5,7 @@ public enum IntegryCustomerDB {
     Agricoper_IlVisone("ilvisone"),
     Agricoper_Luva("ilvisone"),
 
-
+    ATI_Finpart("Finpart"),
     Auricchio_Auricchio("auricchio"),
     Auricchio_AuricchioMiki("auricchio_miki"),
     Auricchio_AuricchioSrl("auricchiosrl"),
@@ -171,8 +171,8 @@ public enum IntegryCustomerDB {
 
     Tempesta_Tempesta("tempesta"),
     Tempesta_VivaiTempesta("vivaitempesta"),
-    
-    
+
+
     Tosca_Ba("tosca_ba"),
     Tosca_Cz("tosca_cz"),
     Tosca_Rm("tosca_rm"),

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

@@ -0,0 +1,24 @@
+package it.integry.ems.migration.model;
+
+import it.integry.ems.migration._base.BaseMigration;
+import it.integry.ems.migration._base.IntegryCustomerDB;
+import it.integry.ems.migration._base.MigrationModelInterface;
+
+public class Migration_20241024132353 extends BaseMigration implements MigrationModelInterface {
+
+    @Override
+    public void up() throws Exception {
+        if (isHistoryDB())
+            return;
+
+        if (!isCustomerDb(IntegryCustomerDB.ATI_Finpart))
+            return;
+        executeStatement("alter table dtb_ordt add data_cons_prod_max datetime null;");
+    }
+
+    @Override
+    public void down() throws Exception {
+
+    }
+
+}

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

@@ -1558,7 +1558,7 @@ public class MesProductionServiceV2 {
                         .setRigaOrd(ordineLav.getPosRiga())
 //                    .setNumEtich(dto.getNumEtich())
 //                    .setNote(dto.getNote())
-                        .setQtaCol(ordineLav.getQtaProd().multiply(UtilityBigDecimal.isNull(ordineLav.getRapConvProd(), BigDecimal.ONE)))
+                        .setQtaCol(ordineLav.getQtaProd().multiply(UtilityBigDecimal.isNull(ordineLav.getRapConv2(), BigDecimal.ONE)))
                         .setNumCnf(ordineLav.getQtaProd());
                 mtbColrToInsert.setOperation(OperationType.INSERT);
                 mtbColtToInsert.getMtbColr().add(mtbColrToInsert);