Commit 64e85bdc authored by ssalve's avatar ssalve

Sarita : Done changes as Adj_issue and Adj_rcp should not create from SRL...

Sarita : Done changes as Adj_issue and Adj_rcp should not create from SRL Container Split button on 11 MARCH2019

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@198279 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 90b264e8
...@@ -16,7 +16,6 @@ import java.util.HashMap; ...@@ -16,7 +16,6 @@ import java.util.HashMap;
import javax.naming.InitialContext; import javax.naming.InitialContext;
import ibase.ejb.CommonDBAccessEJB; import ibase.ejb.CommonDBAccessEJB;
import ibase.ejb.CommonDBAccessRemote;
import ibase.system.config.AppConnectParm; import ibase.system.config.AppConnectParm;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean; import ibase.utility.UserInfoBean;
...@@ -616,9 +615,11 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS ...@@ -616,9 +615,11 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS
//Else block will execute if Transaction is Not Splitted [start] //Else block will execute if Transaction is Not Splitted [start]
if(!("C".equalsIgnoreCase(statusSrl))) if(!("C".equalsIgnoreCase(statusSrl)))
{ {
//flagSaveString = ""; //flagSaveString = "";
//if(issueCondition && flagSaveString.equals("")) //if(issueCondition && flagSaveString.equals(""))
if(issueCondition && (isError == false)) //Commented By Sarita as adj_issue should not save from SRLContainerSplit on 08 MARCH 2019 [START]
/* if(issueCondition && (isError == false))
{ {
System.out.println("Saving Data for Issue"); System.out.println("Saving Data for Issue");
retSting = saveData(siteCode,valueXmlforIssue.toString(),conn,userId); retSting = saveData(siteCode,valueXmlforIssue.toString(),conn,userId);
...@@ -654,10 +655,12 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS ...@@ -654,10 +655,12 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS
System.out.println("Transaction rollbacking for Issue>>>>>>>>>"); System.out.println("Transaction rollbacking for Issue>>>>>>>>>");
isError = true; isError = true;
} }
} }*/
//Commented By Sarita as adj_issue should not save from SRLContainerSplit on 08 MARCH 2019 [END]
//if(receiptCondition && flagSaveString.equals("")) //if(receiptCondition && flagSaveString.equals(""))
if(receiptCondition && (isError == false)) //Commented By Sarita as adj_rcp should not save from SRLContainerSplit on 08 MARCH 2019 [START]
/* if(receiptCondition && (isError == false))
{ {
System.out.println("Saving Data for Receipt"); System.out.println("Saving Data for Receipt");
//Commented and Added by sarit aon 02 NOV 2018 [START] //Commented and Added by sarit aon 02 NOV 2018 [START]
...@@ -697,7 +700,7 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS ...@@ -697,7 +700,7 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS
{ {
formCnt = Integer.parseInt(totForms); formCnt = Integer.parseInt(totForms);
}*/ }*/
System.out.println("Form Count is == ["+formCnt+"]"); /* System.out.println("Form Count is == ["+formCnt+"]");
retSting = xml2DBLocal.saveXML2DB(refSer,valueXmlforReceipt.toString(),"adj_rcp", "A", formCnt, true, userId, "tran_id",false,xtraParams,null,wrkflwInit,isWrkflwToBeInitiated,wrkflwOpt,null,"","",false, conn, false, userInfo); retSting = xml2DBLocal.saveXML2DB(refSer,valueXmlforReceipt.toString(),"adj_rcp", "A", formCnt, true, userId, "tran_id",false,xtraParams,null,wrkflwInit,isWrkflwToBeInitiated,wrkflwOpt,null,"","",false, conn, false, userInfo);
//transactionID = retSting; //transactionID = retSting;
...@@ -712,9 +715,9 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS ...@@ -712,9 +715,9 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS
System.out.println("tranIdForReciept["+tranIdForReciept+"]"); System.out.println("tranIdForReciept["+tranIdForReciept+"]");
//Commented by sarita on 19MARCH2018 //Commented by sarita on 19MARCH2018
//conn.commit();*/ //conn.commit();*/
tranIdForReciept = retSting; //tranIdForReciept = retSting;
//Added and Commented by sarita on 02 NOV 2018 [END] //Added and Commented by sarita on 02 NOV 2018 [END]
retSting = confirmIssueAndReceipt("adj_rcp",tranIdForReciept,xtraParams,forcedFlag,conn,userId); /* retSting = confirmIssueAndReceipt("adj_rcp",tranIdForReciept,xtraParams,forcedFlag,conn,userId);
System.out.println("ReturnString[Saving Data for Issue] ::"+retSting); System.out.println("ReturnString[Saving Data for Issue] ::"+retSting);
if(retSting.indexOf("VTSUCC1") > -1 || retSting.indexOf("VTMCONF2") > -1) if(retSting.indexOf("VTSUCC1") > -1 || retSting.indexOf("VTMCONF2") > -1)
{ {
...@@ -736,11 +739,16 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS ...@@ -736,11 +739,16 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS
isError = true; isError = true;
} }
} }
System.out.println("Receipt "+tranIdForReciept); System.out.println("Receipt "+tranIdForReciept);
*/
//Commented By Sarita as adj_rcp should not save from SRLContainerSplit on 08 MARCH 2019 [START]
//if(tranIdForReciept.length() > 0 && flagSaveString == "") //if(tranIdForReciept.length() > 0 && flagSaveString == "")
if(tranIdForReciept.length() > 0 && (isError == false)) //Commenented and Added by sarita on 08MARCH2018 [START]
/*if(tranIdForReciept.length() > 0 && (isError == false))*/
if(isError == false)
//Commenented and Added by sarita on 08MARCH2018 [END]
{ {
//changes by sarita on 18MARCH2018 //changes by sarita on 18MARCH2018
sql = "update srl_container set status ='C' where serial_no=?"; sql = "update srl_container set status ='C' where serial_no=?";
......
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