Skip to content

B
business-java
Commit 82ff9b56 authored by ssalve's avatar ssalve
Browse files
Options

Sarita : Reverted Previous changes and checked for confirmation of Transaction on 14MARCH2019 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@198455 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8b64afab
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 19 deletions
webitm-dis/ibase/webitm/ejb/dis/SRLContainerSplit.java
View file @ 82ff9b56
......@@ -16,6 +16,7 @@ import java.util.HashMap;
import javax.naming.InitialContext;
import ibase.ejb.CommonDBAccessEJB;
import ibase.ejb.CommonDBAccessRemote;
import ibase.system.config.AppConnectParm;
import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean;
......@@ -184,6 +185,7 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS
if(rs != null){rs.close();rs = null;}
if(pstmt != null){pstmt.close();pstmt = null;}
//Showing Error Message Transaction Splitted Already.[start]
if("C".equalsIgnoreCase(statusSrl))
{
......@@ -192,7 +194,15 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS
//Added by sarita on 19MARCH2018
isError = true;
return retSting;
}
//Added by sarita to check transaction is confirmed or not on 14MARCH2019 [START]
else if(!"A".equalsIgnoreCase(statusSrl))
{
retSting = itmDBAccessEJB.getErrorString("", "UNCONTRAN", "", "", conn);//This transaction is unconfirmed, Can not Split Record, Please Confirmed Transaction.
isError = true;
return retSting;
}
//Added by sarita to check transaction is confirmed or not on 14MARCH2019 [END]
//Added by sarita on 14APR2018 [start] to validate item_code as inv_srno_reqd is 'Y' or 'N'
else
{
......@@ -615,11 +625,9 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS
//Else block will execute if Transaction is Not Splitted [start]
if(!("C".equalsIgnoreCase(statusSrl)))
{
//flagSaveString = "";
//if(issueCondition && flagSaveString.equals(""))
//Commented By Sarita as adj_issue should not save from SRLContainerSplit on 08 MARCH 2019 [START]
/* if(issueCondition && (isError == false))
if(issueCondition && (isError == false))
{
System.out.println("Saving Data for Issue");
retSting = saveData(siteCode,valueXmlforIssue.toString(),conn,userId);
......@@ -655,12 +663,10 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS
System.out.println("Transaction rollbacking for Issue>>>>>>>>>");
isError = true;
}
}*/
//Commented By Sarita as adj_issue should not save from SRLContainerSplit on 08 MARCH 2019 [END]
}
//if(receiptCondition && flagSaveString.equals(""))
//Commented By Sarita as adj_rcp should not save from SRLContainerSplit on 08 MARCH 2019 [START]
/* if(receiptCondition && (isError == false))
if(receiptCondition && (isError == false))
{
System.out.println("Saving Data for Receipt");
//Commented and Added by sarit aon 02 NOV 2018 [START]
......@@ -700,7 +706,7 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS
{
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);
//transactionID = retSting;
......@@ -715,9 +721,9 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS
System.out.println("tranIdForReciept["+tranIdForReciept+"]");
//Commented by sarita on 19MARCH2018
//conn.commit();*/
//tranIdForReciept = retSting;
tranIdForReciept = retSting;
//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);
if(retSting.indexOf("VTSUCC1") > -1 || retSting.indexOf("VTMCONF2") > -1)
{
......@@ -739,16 +745,11 @@ public class SRLContainerSplit extends ActionHandlerEJB implements SRLContainerS
isError = true;
}
}
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 == "")
//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]
if(tranIdForReciept.length() > 0 && (isError == false))
{
//changes by sarita on 18MARCH2018
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