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 10:54:39 +02:00
parent e0512c5e9d 660d7f28a9
commit 23d3b620db
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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) return false;
if (!canBeExecuted && !dbName.equalsIgnoreCase("GRAMM")) return false;
return executionPermission.getOrDefault(dbName, false);
}

6
ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java
View File

@@ -651,8 +651,10 @@ public class ActivityService {
" FROM stb_activity " +
" WHERE stb_activity.parent_activity_id = " + UtilityDB.valueToString(parentStbActivity.getActivityId()) + " AND " +
"stb_activity.user_name = " + UtilityDB.valueToString(user.getUsername()) + " AND " +
"stb_activity.estimated_time = " + UtilityDB.valueDateToString(startDate, CommonConstants.DATETIME_FORMAT_YMD);
"stb_activity.estimated_time = " + UtilityDB.valueDateToString(startDate, CommonConstants.DATETIME_FORMAT_YMD) +
(!UtilityString.isNullOrEmpty(planActivityDTO.getDescription())?
" AND " +
"stb_activity.activity_description = " + UtilityDB.valueToString(planActivityDTO.getDescription()):"");
String activityId = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql);