Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Giuseppe Scorrano
2024-05-14 11:39:12 +02:00
parent 5c46e4aed5 55c97f3441
commit c6d88346d1
4 changed files with 65 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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");
}

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

@@ -11,12 +11,12 @@ public class Migration_20240506152142 extends BaseMigration implements Migration
if (isHistoryDB())
return;
if (!isCustomerDb(
IntegryCustomerDB.Gramm_Gramm)){
return;
}
if (!isCustomerDb(
IntegryCustomerDB.Gramm_Gramm)) {
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

58
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240514113425.java Normal file
View File

@@ -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 {
}
}

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

@@ -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());