diff --git a/ems-core/src/main/java/it/integry/ems/migration/_base/IntegryCustomer.java b/ems-core/src/main/java/it/integry/ems/migration/_base/IntegryCustomer.java index 4bdd6b5693..0050aae4fd 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/_base/IntegryCustomer.java +++ b/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, diff --git a/ems-core/src/main/java/it/integry/ems/migration/_base/IntegryCustomerDB.java b/ems-core/src/main/java/it/integry/ems/migration/_base/IntegryCustomerDB.java index d2a6b74c64..5cf48f0a6a 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/_base/IntegryCustomerDB.java +++ b/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"), diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241024132353.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241024132353.java new file mode 100644 index 0000000000..ce0c974b29 --- /dev/null +++ b/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 { + + } + +} \ No newline at end of file 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 9f3dc907e3..4e645daea1 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 @@ -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);