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

Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Mina Ruggiero
2025-05-29 13:36:42 +02:00
parent 23d3b620db 580c7d450b
commit a4cd2923b8
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ems-core/src/main/java/it/integry/ems/rules/completing/ConfigActivityRules.java
View File

@@ -42,22 +42,25 @@ public class ConfigActivityRules extends QueryRules {
blocca = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql);
}
} else {
List<Date> dataDaControllare = new ArrayList<>();
//if (stbActivity.getEstimatedDate() != null) dataDaControllare.add(stbActivity.getEstimatedDate());
if (stbActivity.getEffectiveDate() != null) dataDaControllare.add(stbActivity.getEffectiveDate());
Date dataCheck;
if (!(stbActivity.getOperation() == OperationType.DELETE && stbActivity.getEffectiveDate() == null)) {
if (stbActivity.getEffectiveDate() != null)
dataCheck = stbActivity.getEffectiveDate();
else if (stbActivity.getEstimatedDate() != null)
dataCheck = stbActivity.getEstimatedDate();
else
return false;
for (Date data : dataDaControllare) {
String sql =
Query.format(
"SELECT CAST(COUNT(*) AS BIT)\n" +
"FROM stb_activity_check\n" +
"WHERE stb_activity_check.cod_jcom = %s\n" +
" AND %s BETWEEN stb_activity_check.data_iniz AND stb_activity_check.data_fine",
stbActivity.getCodJcom(), data);
stbActivity.getCodJcom(), dataCheck);
blocca = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql);
if (blocca)
break;
}
}
if (blocca)

2
ems-core/src/main/java/it/integry/ems/service/production/MrpSetupHandlerService.java
View File

@@ -69,7 +69,7 @@ public class MrpSetupHandlerService {
}
public boolean isGestioneAbilitata(String dbName) {
if (!canBeExecuted && !dbName.equalsIgnoreCase("GRAMM")) return false;
if (!canBeExecuted ) return false;
return executionPermission.getOrDefault(dbName, false);
}