Commit 57fa7d3b authored by pchavan's avatar pchavan

Change confirm condition on 17JULY2018.

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@187680 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9e8ce8f2
...@@ -59,6 +59,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -59,6 +59,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
String sql = ""; String sql = "";
ConnDriver connDriver = null; ConnDriver connDriver = null;
String confirm = "",errString = "" ; String confirm = "",errString = "" ;
String runMode = "" ;
boolean isLocal=false; boolean isLocal=false;
ITMDBAccessEJB itmDBAccessEJB = null; ITMDBAccessEJB itmDBAccessEJB = null;
...@@ -68,6 +69,8 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -68,6 +69,8 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
System.out.println("<!@#> In confirm ::::::::::::::::::::xtraParams:" +xtraParams +":"); System.out.println("<!@#> In confirm ::::::::::::::::::::xtraParams:" +xtraParams +":");
System.out.println("<!@#> In confirm ::::::::::::::::::::forcedFlag:" +forcedFlag +":"); System.out.println("<!@#> In confirm ::::::::::::::::::::forcedFlag:" +forcedFlag +":");
itmDBAccessEJB = new ITMDBAccessEJB(); itmDBAccessEJB = new ITMDBAccessEJB();
runMode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "runMode");
// connDriver = new ConnDriver(); // connDriver = new ConnDriver();
// //Changes and Commented By Bhushan on 06-06-2016 :START // //Changes and Commented By Bhushan on 06-06-2016 :START
//conn = connDriver.getConnectDB("DriverITM"); //conn = connDriver.getConnectDB("DriverITM");
...@@ -104,7 +107,9 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -104,7 +107,9 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
errString = gbfRetrieveMiscDrcrRcp(tranId,xtraParams,conn,isPreview); errString = gbfRetrieveMiscDrcrRcp(tranId,xtraParams,conn,isPreview);
} }
else{ else{
if(confirm != null && "Y".equalsIgnoreCase(confirm)) //Changed By PriyankaC on 9JULY2018.
// if(confirm != null && "Y".equalsIgnoreCase(confirm))
if((confirm != null && "Y".equalsIgnoreCase(confirm)) || ("Y".equalsIgnoreCase(confirm)) && ("B".equalsIgnoreCase(runMode)))
{ {
System.out.println("The Selected transaction is already confirmed"); System.out.println("The Selected transaction is already confirmed");
errString = itmDBAccessEJB.getErrorString("","VTMCONF1","","",conn); errString = itmDBAccessEJB.getErrorString("","VTMCONF1","","",conn);
...@@ -1727,7 +1732,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf ...@@ -1727,7 +1732,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
java.util.Date toDay = new java.util.Date(); java.util.Date toDay = new java.util.Date();
java.sql.Timestamp tDay = null; java.sql.Timestamp tDay = null;
String loginEmpCode="",gRefId="",tranSer="",winName="",ediOption="",acctCodePay="",siteCode=""; String loginEmpCode="",runMode = "",gRefId="",tranSer="",winName="",ediOption="",acctCodePay="",siteCode="";
String drcrFlag="",sType="",sCode="",sretNo="",confirm="",siteCodeFor="",cctrCodePay=""; String drcrFlag="",sType="",sCode="",sretNo="",confirm="",siteCodeFor="",cctrCodePay="";
double amount=0,drAmt=0,crAmt=0,mrpValue=0; double amount=0,drAmt=0,crAmt=0,mrpValue=0;
int cnt=0; int cnt=0;
......
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