Commit 5959c47e authored by agaikwad's avatar agaikwad

Added runmode condition


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@105474 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8de25075
...@@ -57,7 +57,7 @@ public class POrderAmdConf extends ActionHandlerEJB implements POrderAmdConfLoca ...@@ -57,7 +57,7 @@ public class POrderAmdConf extends ActionHandlerEJB implements POrderAmdConfLoca
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
// PreparedStatement pstmt1 = null; // PreparedStatement pstmt1 = null;
ITMDBAccessEJB itmDBAccessEJB = null; ITMDBAccessEJB itmDBAccessEJB = null;
String errString = null, errCode = ""; String errString = null, errCode = "",runMode="";
ResultSet rs = null; ResultSet rs = null;
// ResultSet rs1 = null; // ResultSet rs1 = null;
String purcOrder = "", poStatus = "", amdNo = "", workflowStatus = ""; String purcOrder = "", poStatus = "", amdNo = "", workflowStatus = "";
...@@ -73,7 +73,9 @@ public class POrderAmdConf extends ActionHandlerEJB implements POrderAmdConfLoca ...@@ -73,7 +73,9 @@ public class POrderAmdConf extends ActionHandlerEJB implements POrderAmdConfLoca
conn = getConnection(); conn = getConnection();
//Changes and Commented By Bhushan on 09-06-2016 :END //Changes and Commented By Bhushan on 09-06-2016 :END
conn.setAutoCommit(false); conn.setAutoCommit(false);
runMode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "runMode");
System.out.println("runMode["+runMode+"]");
if (errString == null || errString.trim().length() == 0) if (errString == null || errString.trim().length() == 0)
{ {
amdNo = tranId; amdNo = tranId;
...@@ -114,7 +116,7 @@ public class POrderAmdConf extends ActionHandlerEJB implements POrderAmdConfLoca ...@@ -114,7 +116,7 @@ public class POrderAmdConf extends ActionHandlerEJB implements POrderAmdConfLoca
errString = itmDBAccessLocal.getErrorString("", errString, ""); errString = itmDBAccessLocal.getErrorString("", errString, "");
return errString; return errString;
} else if ("Y".equalsIgnoreCase(confirmed)) } else if ("Y".equalsIgnoreCase(confirmed) && "I".equalsIgnoreCase(runMode))
{ {
errString = "VTPACONF1"; errString = "VTPACONF1";
errString = itmDBAccessLocal.getErrorString("", errString, ""); errString = itmDBAccessLocal.getErrorString("", errString, "");
......
...@@ -41,7 +41,7 @@ public class AdjIssueRcpConf extends ActionHandlerEJB implements AdjIssueRcpConf ...@@ -41,7 +41,7 @@ public class AdjIssueRcpConf extends ActionHandlerEJB implements AdjIssueRcpConf
public String confirm(String tranId, String xtraParams, String forcedFlag)throws RemoteException, ITMException public String confirm(String tranId, String xtraParams, String forcedFlag)throws RemoteException, ITMException
{ {
System.out.println(">>>>>>>>>>>>>>>>>>AdjIssueRcpConf and receipt Conf confirm called>>>>>>>>>>>>>>>>>>>"); System.out.println(">>>>>>>>>>>>>>>>>>AdjIssueRcpConf and receipt Conf confirm called>>>>>>>>>>>>>>>>>>>");
String confirmed = ""; String confirmed = "",runMode="";
String sql = ""; String sql = "";
Connection conn = null; Connection conn = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
...@@ -61,6 +61,8 @@ public class AdjIssueRcpConf extends ActionHandlerEJB implements AdjIssueRcpConf ...@@ -61,6 +61,8 @@ public class AdjIssueRcpConf extends ActionHandlerEJB implements AdjIssueRcpConf
conn = getConnection(); conn = getConnection();
//Changes and Commented By Bhushan on 09-06-2016 :END //Changes and Commented By Bhushan on 09-06-2016 :END
conn.setAutoCommit(false); conn.setAutoCommit(false);
runMode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "runMode");
System.out.println("runMode["+runMode+"]");
if (tranId != null && tranId.trim().length() > 0) if (tranId != null && tranId.trim().length() > 0)
{ {
sql = " select confirmed,ref_ser from adj_issrcp where tran_id = ? "; sql = " select confirmed,ref_ser from adj_issrcp where tran_id = ? ";
...@@ -84,7 +86,7 @@ public class AdjIssueRcpConf extends ActionHandlerEJB implements AdjIssueRcpConf ...@@ -84,7 +86,7 @@ public class AdjIssueRcpConf extends ActionHandlerEJB implements AdjIssueRcpConf
{ {
winName="w_adj_rcp"; winName="w_adj_rcp";
} }
if ("Y".equalsIgnoreCase(confirmed)) if ("Y".equalsIgnoreCase(confirmed) && "I".equalsIgnoreCase(runMode))
{ {
errString = itmDBAccessLocal.getErrorString("", "VTAJISS3", ""); errString = itmDBAccessLocal.getErrorString("", "VTAJISS3", "");
return errString; return errString;
......
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