Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
This commit is contained in:
@@ -146,7 +146,7 @@ public class SicilianiDMSExportService {
|
||||
}
|
||||
|
||||
// INSERIMENTO MODIFICA DELLA SOLA DATA CONSEGNA ORDINE IN TABELLA ALYANTE
|
||||
if (keyOrdOld.compareTo(keyOrd) != 0) {
|
||||
if (keyOrdOld.compareTo(keyOrd) != 0 || i >numRows) {
|
||||
if (existOrd.compareTo("N") == 0) {
|
||||
sql =
|
||||
"INSERT INTO dtb_date_scadenza (ditta " +
|
||||
@@ -193,8 +193,8 @@ public class SicilianiDMSExportService {
|
||||
//conAlyante.rollback();
|
||||
if (sql != null) {
|
||||
logger.error("[TAGLIA E CUCI]" + sql);
|
||||
throw new Exception(e.getMessage());
|
||||
}
|
||||
throw new Exception(e.getMessage());
|
||||
}
|
||||
return response;
|
||||
}
|
||||
@@ -228,6 +228,8 @@ public class SicilianiDMSExportService {
|
||||
String codiceDitta = setupGest.getSetup("DMS", "SETUP", "CODICE_DITTA");
|
||||
String serverObject = setupGest.getSetup("DMS", "PROFILE", "DB_INTERSCAMBIO");
|
||||
String userUnlockIDViaggio = setupGest.getSetupUser(conn, "W_VORGCONS_DISP", "SETUP","ABILITA_SBLOCCO_ID_VIAGGIO", userNAme);
|
||||
if (userUnlockIDViaggio == null || userUnlockIDViaggio.length() == 0){userUnlockIDViaggio = "N";}
|
||||
|
||||
|
||||
String columnPercPesoOrdine = "";
|
||||
String tableCostoViaggi = "";
|
||||
|
||||
Reference in New Issue
Block a user