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

Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Giuseppe Scorrano
2024-12-12 17:01:27 +01:00
parent eea7dd43e9 6278554155
commit 7ad6f150e1
9 changed files with 87 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241202092817.java
View File

@@ -1,6 +1,7 @@
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_20241202092817 extends BaseMigration implements MigrationModelInterface {
@@ -10,6 +11,9 @@ public class Migration_20241202092817 extends BaseMigration implements Migration
if (isHistoryDB())
return;
if (isCustomerDb(IntegryCustomerDB.Siciliani_DMS))
return;
createOrUpdateView("[cvw_mov_black_list]", "CREATE VIEW [dbo].[cvw_mov_black_list] AS\n" +
"SELECT crl_movt_rif_cmov.num_cmov, \n" +
"\tctb_movt.num_cmov as num_cmov_rif,\n" +

4
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241202165228.java
View File

@@ -1,6 +1,7 @@
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_20241202165228 extends BaseMigration implements MigrationModelInterface {
@@ -10,6 +11,9 @@ public class Migration_20241202165228 extends BaseMigration implements Migration
if (isHistoryDB())
return;
if (isCustomerDb(IntegryCustomerDB.Siciliani_DMS))
return;
executeStatement(
"alter table dtb_doct add incoterms varchar(20)",
"alter table dtb_dift add incoterms varchar(20)",

4
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241203095628.java
View File

@@ -1,6 +1,7 @@
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_20241203095628 extends BaseMigration implements MigrationModelInterface {
@@ -10,6 +11,9 @@ public class Migration_20241203095628 extends BaseMigration implements Migration
if (isHistoryDB())
return;
if (isCustomerDb(IntegryCustomerDB.Siciliani_DMS))
return;
dropIndex("arl_fogm", "ix_arl_fogm_mtb_sgrp");
executeStatement("ALTER TABLE arl_fogm ADD id INT IDENTITY(1,1)",
"EXEC DropPrimaryKey 'arl_fogm'",

4
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241203161255.java
View File

@@ -1,6 +1,7 @@
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_20241203161255 extends BaseMigration implements MigrationModelInterface {
@@ -10,6 +11,9 @@ public class Migration_20241203161255 extends BaseMigration implements Migration
if (isHistoryDB())
return;
if (isCustomerDb(IntegryCustomerDB.Siciliani_DMS))
return;
executeStatement("EXEC DropPrimaryKey 'arl_fogm'",
"ALTER TABLE arl_fogm ALTER COLUMN id bigint not null" ,
"ALTER TABLE arl_fogm ADD CONSTRAINT PK_arl_fogm_id PRIMARY KEY (id);");

4
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241203165546.java
View File

@@ -1,6 +1,7 @@
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_20241203165546 extends BaseMigration implements MigrationModelInterface {
@@ -10,6 +11,9 @@ public class Migration_20241203165546 extends BaseMigration implements Migration
if (isHistoryDB())
return;
if (isCustomerDb(IntegryCustomerDB.Siciliani_DMS))
return;
executeStatement(
"alter table vtb_viaggi add container varchar(20)",
"alter table vtb_viaggi add sigillo varchar(20)",

4
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241205153404.java
View File

@@ -1,6 +1,7 @@
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_20241205153404 extends BaseMigration implements MigrationModelInterface {
@@ -10,6 +11,9 @@ public class Migration_20241205153404 extends BaseMigration implements Migration
if (isHistoryDB())
return;
if (isCustomerDb(IntegryCustomerDB.Siciliani_DMS))
return;
boolean existsView = existsView("MES_MachineUsagePivot");
executeStatement((existsView ? "ALTER" : "CREATE") + " VIEW SYS_SequentialNumbers AS\n" +

4
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241205161212.java
View File

@@ -1,6 +1,7 @@
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_20241205161212 extends BaseMigration implements MigrationModelInterface {
@@ -10,6 +11,9 @@ public class Migration_20241205161212 extends BaseMigration implements Migration
if (isHistoryDB())
return;
if (isCustomerDb(IntegryCustomerDB.Siciliani_DMS))
return;
boolean existsView = existsView("MES_MachineUsagePivot");
executeStatement((existsView ? "ALTER" : "CREATE") + " VIEW [dbo].[MES_MachineUsagePivot] AS\n" +

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

@@ -0,0 +1,26 @@
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_20241212114532 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
executeStatement("alter table azienda alter column cod_fda varchar(20)");
if (isCustomerDb(IntegryCustomerDB.RossoGargano_RossoGargano)){
executeStatement("update azienda set cod_fda = '12273570736'" ,
"update azienda set cod_fce = 15968");
}
}
@Override
public void down() throws Exception {
}
}

34
ems-engine/src/main/java/it/integry/ems/document/export/service/SicilianiDMSExportService.java
View File

@@ -263,7 +263,6 @@ public class SicilianiDMSExportService {
"order by dtb_ordt_local.id_viaggio, dtb_ordt_local.key_ord";
whereCond = UtilityString.replaceSubString(whereCond, "dtb_ordr", "dtb_ordt_local");
sql = UtilityDB.addwhereCond(sql, whereCond, true);
PreparedStatement ps = conn.prepareStatement(sql, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
ResultSet res = ps.executeQuery();
@@ -442,6 +441,39 @@ public class SicilianiDMSExportService {
res.close();
ps.close();
// Cancellazione ID_Viaggio inviati ad Alyante, ma non più presenti in DMS
sql = "select dtb_ordt_local.key_ord, " +
" dtb_infoviaggi.id_viaggio " +
" from dtb_ordt_local INNER JOIN " + serverObject + ".dtb_infoviaggi ON dtb_ordt_local.key_ord_alyante = dtb_infoviaggi.key_ord COLLATE Latin1_General_100_CI_AS " +
" where dtb_ordt_local.id_viaggio is null ";
whereCond = UtilityString.replaceSubString(whereCond, "dtb_ordr", "dtb_ordt_local");
sql = UtilityDB.addwhereCond(sql, whereCond, true);
ps = conn.prepareStatement(sql, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
res = ps.executeQuery();
while (res.next()) {
String keyOrd = res.getString(1);
String idViaggio = res.getString(2);
// Verifica se l'id_viaggio è bloccato
Optional<HashMap<String, Object>> lockIdViaggio = Stream.of(resultMap)
.filter(x ->
((Integer) UtilityHashMap.getValueIfExists(x, "id_viaggio")).equals(idViaggio) &&
((String) UtilityHashMap.getValueIfExists(x, "lockIdViaggio")).equalsIgnoreCase("S")).findFirst();
if (!lockIdViaggio.isPresent()) {
sql = "delete from " + serverObject + ".dtb_infoviaggi " +
" from " + serverObject + ".dtb_infoviaggi " +
" where chiave_traxal = " + UtilityDB.valueToString(keyOrd);
PreparedStatement infoUpd = conAlyante.prepareStatement(sql, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
infoUpd.executeUpdate();
infoUpd.close();
}
}
res.close();
ps.close();
conAlyante.commit();
} catch (Exception e) {
//conAlyante.rollback();