Commit 4b94e93a authored by Ajit Deshmukh's avatar Ajit Deshmukh

Resolved the issues reported by QC regarding Worflow Remarks and Objects already exist exception

parent 14d86791
......@@ -85,7 +85,7 @@ public class ManageSQLAprv extends ValidatorEJB {
updPstmt.setNull(3, java.sql.Types.INTEGER);
} else if ("S".equalsIgnoreCase(signStatus)) {
updPstmt.setString(1, "A");
updPstmt.setNull(2, java.sql.Types.VARCHAR);
updPstmt.setString(2, signRemarks);
updPstmt.setInt(3, 2);
}
......
......@@ -554,6 +554,7 @@ public class ManageSql extends ValidatorEJB {
{
String applDB = checkNull(genericUtility.getColumnValue("appl_db", dom));
String wfStatus = checkNull(genericUtility.getColumnValue("wf_status", dom));
execAprv = checkNull(genericUtility.getColumnValue("exec_aprv", dom));
String selEnterprises = checkNull(genericUtility.getColumnValue("enterprises", dom));
String empgName = "";
String deptCode = "";
......
......@@ -96,6 +96,11 @@ public class ManageSqlConf extends ActionHandlerEJB {
pstmt = null;
}
if(execRights.trim().length()==0){
BaseLogger.log("3", null, null, "Blank Execution Rights");
errString = itmdbAccessLocal.getErrorString("confirmed", "MSQLBER", "", "", con);
return errString;
}
if (confirmed.trim().equalsIgnoreCase("Y")) {
BaseLogger.log("3", null, null, "Transaction is already confirmed Tran ID:: " + tranId);
errString = itmdbAccessLocal.getErrorString("confirmed", "VTCICONF1", "", "", con);
......@@ -2066,10 +2071,10 @@ public class ManageSqlConf extends ActionHandlerEJB {
tranId, enterpriseCode, linNo, requestID,
finalSql, updCount, "E", userId, chgTerm, error, dbMainSchema);
if (rethrow) {
System.out.println("In rethrow condition");
throw new RuntimeException(e);
}
// if (rethrow) {
// System.out.println("In rethrow condition");
// throw new RuntimeException(e);
// }
} finally {
if (connForExecRs != null)
connForExecRs.close();
......@@ -2386,6 +2391,10 @@ public class ManageSqlConf extends ActionHandlerEJB {
s = s.replaceFirst("CREATE\\s+OR\\s+REPLACE\\s+", "CREATE ");
}
// Remove EDITIONABLE / NONEDITIONABLE keywords
s = s.replaceFirst("CREATE\\s+NONEDITIONABLE\\s+", "CREATE ");
s = s.replaceFirst("CREATE\\s+EDITIONABLE\\s+", "CREATE ");
if (s.startsWith("CREATE TABLE"))
return "TABLE";
if (s.startsWith("CREATE SEQUENCE"))
......
......@@ -148,6 +148,13 @@ public class ManageSqlReleaseToQC extends ActionHandlerEJB{
if(existingAprvLvl>2) {
return itmDBAccessEJB.getErrorString("", "MSQLARQC", "", "", conn);
}
else if (wfStatus.trim().equalsIgnoreCase("R")) {
BaseLogger.log("3", null, null, "Workflow is rejected");
return itmDBAccessEJB.getErrorString("", "MSQLWFR", "", "", conn);
}
else if (executiveApproval.trim().equalsIgnoreCase("Y")) {
if (!wfStatus.trim().equalsIgnoreCase("A")) {
......
......@@ -378,4 +378,14 @@ select * from messages where msg_no = 'DQCNE';
update messages set MSG_DESCR = 'QC, Pilot, Client Dev and Live transaction cannot be edited' where msg_no = 'DQCNE';
---------------22 May------------------
Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION) values
('MSQLWFR','Workflow rejected. Cannot release to QC.','The workflow is rejected. The transaction cannot be released to QC.','E','Y',null,null,null,to_date('25-DEC-13','DD-MON-RR'),'BASE ','BASE',null,null);
Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,ERR_SOURCE,CHG_DATE,CHG_USER,CHG_TERM,OVERRIDE_INPUT,MAIL_OPTION) values
('MSQLBER','Transaction cannot be confirmed.','Cannot confirm transaction for blank execution rights.','E','Y',null,null,null,to_date('26-AUG-09','DD-MON-RR'),'Haneesh ','SUN',null,null);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment