Skip to content

B
business-java
Commit 959f5b89 authored by msalla's avatar msalla
Browse files
Options

Invoice cancellation testing with sales return. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@215435 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a859cd83
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 41 deletions
webitm-fin/src/ibase/webitm/ejb/fin/adv/RcvIbcaConf.java
View file @ 959f5b89
......@@ -20,6 +20,7 @@ import java.rmi.RemoteException;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.HashMap;
......@@ -66,7 +67,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
public String confirm(String tranId, String xtraParams,String forcedFlag, Connection conn) throws RemoteException,ITMException
{
System.out.println("RcvIbcaConf Confirm called........");
//System.out.println("RcvIbcaConf Confirm called........");
String sql = "";
String confirm = "";
String siteCode = "";
......@@ -137,7 +138,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
{
errString = retreiveRibca (tranId,siteCode,xtraParams,conn);
System.out.println("Return String from createRibca ["+errString+"]");
//System.out.println("Return String from createRibca ["+errString+"]");
if(errString != null && errString.trim().length() > 0)
{
......@@ -159,7 +160,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
pstmt.setString(2, loginEmpCode);
pstmt.setString(3, tranId);
int updateCoount = pstmt.executeUpdate();
System.out.println("Rows Updated= "+updateCoount);
//System.out.println("Rows Updated= "+updateCoount);
if(pstmt != null)
{
pstmt.close();pstmt = null;
......@@ -176,17 +177,34 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
}
else
{
System.out.println("The Selected transaction is already confirmed and can not be edited");
//System.out.println("The Selected transaction is already confirmed and can not be edited");
errString = itmDBAccessEJB.getErrorString("","VTMCONF1","","",conn);
return errString;
}
System.out.println("Error String from confirm method.....[" + errString + "]");
//System.out.println("Error String from confirm method.....[" + errString + "]");
}
catch( Exception e)
{
System.out.println("Exception inside RcvIbcaConf Confirm==>"+e.getMessage());
//added by monika 16 jan -2020
if(conn!=null)
{
try
{
if(connStatus)
{
conn.rollback();
}
}
catch (SQLException ex)
{
e.printStackTrace();
throw new ITMException(e);
}
}//end
e.printStackTrace();
throw new ITMException(e);
}
......@@ -250,7 +268,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
List detailList = new ArrayList();
try
{
System.out.println("Inside gbf_retrieve_ribca...ibcaID["+ibcaID+"] siteCode["+siteCode+"]");
//System.out.println("Inside gbf_retrieve_ribca...ibcaID["+ibcaID+"] siteCode["+siteCode+"]");
today = new java.sql.Timestamp(System.currentTimeMillis()) ;
......@@ -280,7 +298,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
{
tranIDRcpIBCA = tranIDList.get(i);
System.out.println("tranIDRcpIBCA--->["+tranIDRcpIBCA+"]");
//System.out.println("tranIDRcpIBCA--->["+tranIDRcpIBCA+"]");
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
......@@ -351,7 +369,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
hdrMap.put("sundry_type", rs.getString("sundry_type"));
hdrMap.put("sundry_code", rs.getString("sundry_code"));
System.out.println("IBCA header tranSer----["+rs.getString("tran_ser")+"]");
//System.out.println("IBCA header tranSer----["+rs.getString("tran_ser")+"]");
}
if(rs!=null)
{
......@@ -461,7 +479,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
}
retString = gbf_post_ribca(hdrMap,detailList,xtraParams,conn);
System.out.println("After gbf_post_ribca---->["+retString+"]");
//System.out.println("After gbf_post_ribca---->["+retString+"]");
if(retString != null && retString.trim().length() > 0)
{
return retString;
......@@ -518,7 +536,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
List expDetList = null;
try
{
System.out.println("Inside gbf_post_ribca...");
//System.out.println("Inside gbf_post_ribca...");
loginEmpCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
......@@ -547,7 +565,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
expHdr = hdrMap;
expDetList = detailList;
System.out.println("tranSer ["+tranSer.toUpperCase()+"]");
//System.out.println("tranSer ["+tranSer.toUpperCase()+"]");
//switch ( tranSer.toUpperCase() )
{
......@@ -555,11 +573,11 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
if("I".equals(tranSer))
{
retString = postRibcaHdrIssue(expHdr, xtraParams ,conn);
System.out.println("After postRibcaHdrIssue ["+retString+"]");
//System.out.println("After postRibcaHdrIssue ["+retString+"]");
if(retString.trim().length() == 0)
{
retString = postRibcaDetIssue(expHdr,expDetList,xtraParams, conn);
System.out.println("After postRibcaDetIssue ["+retString+"]");
//System.out.println("After postRibcaDetIssue ["+retString+"]");
if(retString.trim().length() == 0)
{
if("E".equals(hdrMap.get("link_type")) || "2".equals(ediOption))
......@@ -574,7 +592,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
{
CreateRCPXML createRCPXML = new CreateRCPXML("w_rcp_ibca", "tran_id");
dataStr = createRCPXML.getTranXML(tranId, conn);
System.out.println("dataStr =[ " + dataStr + "]");
// System.out.println("dataStr =[ " + dataStr + "]");
Document ediDataDom = genericUtility.parseString(dataStr);
E12CreateBatchLoadEjb e12CreateBatchLoad = new E12CreateBatchLoadEjb();
......@@ -582,7 +600,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
createRCPXML = null;
e12CreateBatchLoad = null;
System.out.println("retString from edi 2 batchload gbf_post_ribca--->[" + retString + "]");
// System.out.println("retString from edi 2 batchload gbf_post_ribca--->[" + retString + "]");
if (retString != null && retString.indexOf("SUCCESS") != -1)
{
......@@ -593,7 +611,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
{
CreateRCPXML createRCPXML = new CreateRCPXML("w_rcp_ibca", "tran_id");
dataStr = createRCPXML.getTranXML(tranId, conn);
System.out.println("dataStr =[ " + dataStr + "]");
//System.out.println("dataStr =[ " + dataStr + "]");
Document ediDataDom = genericUtility.parseString(dataStr);
E12CreateBatchLoadEjb e12CreateBatchLoad = new E12CreateBatchLoadEjb();
......@@ -601,7 +619,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
createRCPXML = null;
e12CreateBatchLoad = null;
System.out.println("retString from edi 2 batchload gbf_post_ribca--->[" + retString + "]");
// System.out.println("retString from edi 2 batchload gbf_post_ribca--->[" + retString + "]");
if (retString != null && retString.indexOf("SUCCESS") != -1)
{
......@@ -618,7 +636,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
else if("R".equals(tranSer))
{
retString = postRibcaHdrRcp(expHdr, conn);
System.out.println("After postRibcaHdrRcp ["+retString+"]");
//System.out.println("After postRibcaHdrRcp ["+retString+"]");
if(retString.trim().length() == 0)
{
if("E".equals(hdrMap.get("link_type")) || ediOption > 0)
......@@ -633,7 +651,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
{
CreateRCPXML createRCPXML = new CreateRCPXML("w_rcp_ibca", "tran_id");
dataStr = createRCPXML.getTranXML(tranId, conn);
System.out.println("dataStr =[ " + dataStr + "]");
//System.out.println("dataStr =[ " + dataStr + "]");
Document ediDataDom = genericUtility.parseString(dataStr);
E12CreateBatchLoadEjb e12CreateBatchLoad = new E12CreateBatchLoadEjb();
......@@ -641,7 +659,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
createRCPXML = null;
e12CreateBatchLoad = null;
System.out.println("retString from edi 2 batchload gbf_post_ribca--->[" + retString + "]");
//System.out.println("retString from edi 2 batchload gbf_post_ribca--->[" + retString + "]");
if (retString != null && retString.indexOf("SUCCESS") != -1)
{
......@@ -652,7 +670,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
{
CreateRCPXML createRCPXML = new CreateRCPXML("w_rcp_ibca", "tran_id");
dataStr = createRCPXML.getTranXML(tranId, conn);
System.out.println("dataStr =[ " + dataStr + "]");
//System.out.println("dataStr =[ " + dataStr + "]");
Document ediDataDom = genericUtility.parseString(dataStr);
E12CreateBatchLoadEjb e12CreateBatchLoad = new E12CreateBatchLoadEjb();
......@@ -660,7 +678,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
createRCPXML = null;
e12CreateBatchLoad = null;
System.out.println("retString from edi 2 batchload gbf_post_ribca--->[" + retString + "]");
// System.out.println("retString from edi 2 batchload gbf_post_ribca--->[" + retString + "]");
if (retString != null && retString.indexOf("SUCCESS") != -1)
{
......@@ -678,7 +696,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
return retString;
}
System.out.println("Before POST_ON_LINE.....");
//System.out.println("Before POST_ON_LINE.....");
postOnline = checkNullAndTrim(finCommon.getFinparams("999999", "POST_ON_LINE", conn));
if("Y".equals(postOnline))
......@@ -747,11 +765,11 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
{
linkType = (String) hdrMap.get("link_type");
System.out.println("Inside gbf_post_ribca_hdr_iss-----LinkType["+linkType+"]");
//System.out.println("Inside gbf_post_ribca_hdr_iss-----LinkType["+linkType+"]");
if(!"R".equals(linkType) && !"C".equals(linkType))
{
System.out.println("Inside if.....");
//System.out.println("Inside if.....");
glTraceMap = new HashMap();
glTraceMap.put("ref_type", "F");
......@@ -785,7 +803,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
glTraceMap.put("remarks", hdrMap.get("remarks"));
retString = finCommon.glTraceUpdate((HashMap) glTraceMap, conn);
System.out.println("After glTraceUpdate gbf_post_ribca_hdr_iss---->["+retString+"]");
//System.out.println("After glTraceUpdate gbf_post_ribca_hdr_iss---->["+retString+"]");
if(retString != null && retString.trim().length() > 0)
{
......@@ -876,7 +894,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
Map sundryMap = null;
try
{
System.out.println("Inside gbf_post_ribca_det_iss-----expDetList Size["+expDetList.size()+"]");
//System.out.println("Inside gbf_post_ribca_det_iss-----expDetList Size["+expDetList.size()+"]");
today = new java.sql.Timestamp(System.currentTimeMillis()) ;
......@@ -897,7 +915,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
refSer = (String)detMap.get("ref_ser");
lineNoref = (String)detMap.get("line_no__ref");
System.out.println("@@postRibcaDetIssue Link Type["+linkType+"]");
//System.out.println("@@postRibcaDetIssue Link Type["+linkType+"]");
if(!"R".equals(linkType) && !"C".equals(linkType))
{
......@@ -955,16 +973,16 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
sundryMap.put("adv_amt", 0.0);
retString = finCommon.gbf_sundrybal_upd((HashMap) sundryMap, conn);
System.out.println("After postRibcaDetIssue gbf_sundrybal_upd retString["+retString+"]");
//System.out.println("After postRibcaDetIssue gbf_sundrybal_upd retString["+retString+"]");
if(retString.trim().length() == 0)
{
retString = finCommon.glTraceUpdate((HashMap) glTraceMap, conn);
System.out.println("After postRibcaDetIssue glTraceUpdate retString["+retString+"]");
//System.out.println("After postRibcaDetIssue glTraceUpdate retString["+retString+"]");
}
}
System.out.println("After postRibcaDetIssue linkType !R && !C");
//System.out.println("After postRibcaDetIssue linkType !R && !C");
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
......@@ -998,7 +1016,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
pstmt.close();pstmt = null;
}
System.out.println("postRibcaDetIssue----totAmount["+totAmount+"] adjAmount["+adjAmount+"] amount["+amount+"]");
//System.out.println("postRibcaDetIssue----totAmount["+totAmount+"] adjAmount["+adjAmount+"] amount["+amount+"]");
if(Math.abs(totAmount - adjAmount) < Math.abs(amount) || (totAmount - adjAmount) == 0)
{
//retString = "VTBAL1";
......@@ -1032,7 +1050,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
}
}
System.out.println("postRibcaDetIssue retString["+retString+"]");
////System.out.println("postRibcaDetIssue retString["+retString+"]");
if(retString != null && retString.trim().length() > 0)
{
return retString;
......@@ -1106,7 +1124,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
try
{
System.out.println("Inside gbf_create_ribca-----tranIdFrom["+tranIdTo+"] tranIdTo["+tranIdTo+"] ");
//System.out.println("Inside gbf_create_ribca-----tranIdFrom["+tranIdTo+"] tranIdTo["+tranIdTo+"] ");
chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"userId");
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId");
......@@ -1447,7 +1465,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
glTraceMap.put("remarks", hdrMap.get("remarks"));
retString = finCommon.glTraceUpdate((HashMap) glTraceMap, conn);
System.out.println("After glTraceUpdate gbf_post_ribca_hdr_rcp---->["+retString+"]");
//System.out.println("After glTraceUpdate gbf_post_ribca_hdr_rcp---->["+retString+"]");
if(retString != null && retString.trim().length() > 0)
{
......@@ -1500,7 +1518,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
try
{
System.out.println("Inside gbf_post_ribca_det_rcp...");
//System.out.println("Inside gbf_post_ribca_det_rcp...");
tranId = (String)hdrMap.get("tran_id");
tranType = (String)hdrMap.get("tran_type");
......@@ -1531,7 +1549,7 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
glTraceMap.put("exch_rate", (Double) detMap.get("exch_rate"));
amount = (Double)detMap.get("tot_amt");
System.out.println("@@tot_amt ["+amount+"]");
//System.out.println("@@tot_amt ["+amount+"]");
if(amount > 0)
{
......@@ -1597,7 +1615,9 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
}
else
{
refSer = "R-IBCA"+count;
// refSer = "R-IBCA"+count;//commented by monika to check r-ibca count
refSer = "R-IBC"+count;
}
recvbleMap = new HashMap();
......@@ -1634,17 +1654,17 @@ public class RcvIbcaConf extends ActionHandlerEJB implements PayIbcaConfLocal, P
retString = finCommon.gbf_sundrybal_upd((HashMap) sundryBalMap, conn);
System.out.println("After postRibcaDetRcp gbf_sundrybal_upd retStrng["+retString+"]");
//System.out.println("After postRibcaDetRcp gbf_sundrybal_upd retStrng["+retString+"]");
if(retString.trim().length() == 0)
{
retString = finCommon.glTraceUpdate((HashMap) glTraceMap, conn);
System.out.println("After postRibcaDetRcp glTraceUpdate retStrng["+retString+"]");
//System.out.println("After postRibcaDetRcp glTraceUpdate retStrng["+retString+"]");
if(retString.trim().length() == 0)
{
retString = finCommon.gbfReceivablesUpd((HashMap) recvbleMap, conn);
System.out.println("After postRibcaDetRcp gbfReceivablesUpd retStrng["+retString+"]");
//System.out.println("After postRibcaDetRcp gbfReceivablesUpd retStrng["+retString+"]");
if(retString != null && retString.trim().length() > 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