Skip to content

B
business-java
Commit 2a1f230f authored by cpatil's avatar cpatil
Browse files
Options

*** empty log message *** 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@100982 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4f5a3a93
Show whitespace changes
Inline Side-by-side
Showing with 205 additions and 61 deletions
webitm-fin/ibase/webitm/ejb/fin/BankRecoWizIC.java
View file @ 2a1f230f
......@@ -1135,8 +1135,8 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
pstmt.close();
pstmt=null;
System.out.println("@@@@@@@ RefBTHashMap["+RefBTHashMap+"]");
System.out.println("@@@@@@@ tranIdBSMap["+tranIdBSMap+"]");
//System.out.println("@@@@@@@ RefBTHashMap["+RefBTHashMap+"]");
//System.out.println("@@@@@@@ tranIdBSMap["+tranIdBSMap+"]");
System.out.println("RefBSHashMap @@@@..... :"+RefBSHashMap);
System.out.println("RefBTHashMap.@@@@.... :"+RefBTHashMap);
......@@ -1173,8 +1173,8 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
tranIdBTList=listOfTranId(entry.getKey(),"banktran_log",autoReconFilter,siteCode,bankCode,conn);
System.out.println("tranIdBTList :"+tranIdBTList);
///////////////////////////////////////////////////////////////////////////
System.out.println("tranIdBSList.size():"+tranIdBSList.size());
System.out.println("tranIdBTList.size():"+tranIdBTList.size());
System.out.println("tranIdBSList.size()["+tranIdBSList.size()+"]tranIdBSList["+tranIdBSList+"]");
System.out.println("tranIdBTList.size()["+tranIdBTList.size()+"]tranIdBTList["+tranIdBTList+"]");
if(tranIdBSList.size() > 1 && tranIdBTList.size() == 1)
{
for(int i = 0 ; i < tranIdBSList.size() ; i++)
......@@ -1185,9 +1185,12 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println(tranIdBSList.get(i));
System.out.println(tranIdBTList.get(0));
// System.out.println(amtList.get(i));
double amtTemp = getReconcileAmount("bank_statement",tranIdBSList.get(i),conn);
traceData.add(tranIdBTList.get(0));
traceData.add(tranIdBSList.get(i));
traceData.add(lAmt);
traceData.add(amtTemp);
//traceData.add(lAmt);
arrayListData.add(traceData);
}
}
......@@ -1204,9 +1207,12 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println(tranIdBSList.get(0));
System.out.println(tranIdBTList.get(i));
//System.out.println(amtList.get(i));
double amtTemp = getReconcileAmount("banktran_log",tranIdBTList.get(i),conn);
traceData.add(tranIdBTList.get(i));
traceData.add(tranIdBSList.get(0));
traceData.add(lAmt);
traceData.add(amtTemp);
//traceData.add(lAmt);
arrayListData.add(traceData);
System.out.println("after :"+arrayListData);
}
......@@ -1225,6 +1231,25 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
traceData.add(lAmt);
arrayListData.add(traceData);
}
//cpatil for multiple BS and BT
if(tranIdBSList.size() > 1 && tranIdBTList.size() > 1)
{
for(int i = 0 ; i < tranIdBSList.size() ; i++)
{
ArrayList traceData = null;
traceData = new ArrayList();
System.out.println("multiple bank statement");
System.out.println(tranIdBSList.get(i));
System.out.println(tranIdBTList.get(i));
// System.out.println(amtList.get(i));
double amtTemp = getReconcileAmount("banktran_log",tranIdBTList.get(i),conn);
traceData.add(tranIdBTList.get(i));
traceData.add(tranIdBSList.get(i));
traceData.add(amtTemp);
//traceData.add(lAmt);
arrayListData.add(traceData);
}
}
////////////////////////////////////////////////////////////////////
}
......@@ -1244,13 +1269,39 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("nList :"+nList);
System.out.println("nList.getLength() : "+nList.getLength());
int bankStmtCnt = 0 , bankTrntCnt = 0;
// double paymentAmtBS=0, paymentAmtBT=0,receiptAmtBS=0,receiptAmtBT=0; // cpatil
double paymentAmtBS=0, paymentAmtBT=0,receiptAmtBS=0,receiptAmtBT=0; // cpatil
double calAmtBS=0, calAmtBT=0;
for (int temp = 0; temp < nList.getLength(); temp++)
{
Node nNode = nList.item(temp);
Element eElement = (Element) nNode;
tranName = checkNull(eElement.getElementsByTagName("tran_name").item(0).getTextContent());
System.out.println("tranName["+tranName+"]");
if(tranName.equalsIgnoreCase("bankStatement"))
{
bankStmtCnt++;
//totalBSAmount = totalBSAmount + Double.parseDouble(amtBc); //amtAdj
}
if(tranName.equalsIgnoreCase("bankTransaction"))
{
bankTrntCnt++;
//totalBTAmount = totalBTAmount + Double.parseDouble(amtBc);
}
}
System.out.println("bankStmtCnt["+bankStmtCnt+"]bankTrntCnt["+bankTrntCnt+"]");
for (int temp = 0; temp < nList.getLength(); temp++)
{
Node nNode = nList.item(temp);
Element eElement = (Element) nNode;
tranName = checkNull(eElement.getElementsByTagName("tran_name").item(0).getTextContent());
System.out.println("tranName["+tranName+"]");
//cpatil 09/03/16 start
refNo = checkNull(eElement.getElementsByTagName("ref_no").item(0).getTextContent()).trim();
......@@ -1259,9 +1310,11 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
amtBc = checkNull(eElement.getElementsByTagName("amt_bc").item(0).getTextContent()).trim();
System.out.println("temp["+temp+"]---refNo["+refNo+"]refDate["+refDate+"]amtAdj["+amtAdj+"]");
System.out.println("autoReconFilterValue["+autoReconFilterValue+"]refNo+refDate+amtAdj["+""+refNo+refDate+amtAdj+"]");
if( autoReconFilterValue != null && autoReconFilterValue.trim().length() > 0 )
{
if( "REFNO_DATE_AMT".equalsIgnoreCase(autoReconFilter) )
if( "REFNO_DATE_AMT".equalsIgnoreCase(autoReconFilter) && ( bankStmtCnt==1 || bankTrntCnt == 1 ))
{
System.out.println("@@@@:REFNO_DATE_AMT:autoReconFilterValue["+autoReconFilterValue+"]refNo+refDate["+refNo+refDate+"]");
if(!autoReconFilterValue.equalsIgnoreCase(refNo+refDate))
......@@ -1273,7 +1326,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
return valueXmlString;
}
}
else if("REFNO_DATE".equalsIgnoreCase(autoReconFilter) && (autoReconFilterValue != null || autoReconFilterValue.trim().length() > 0 ))
else if("REFNO_DATE".equalsIgnoreCase(autoReconFilter) && (autoReconFilterValue != null && autoReconFilterValue.trim().length() > 0 ) && ( bankStmtCnt==1 || bankTrntCnt == 1 ))
{ // not include
System.out.println("@@@@:REFNO_DATE:autoReconFilterValue["+autoReconFilterValue+"]refNo+refDate["+refNo+refDate+"]");
if(!autoReconFilterValue.equalsIgnoreCase(refNo+refDate))
......@@ -1285,7 +1338,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
return valueXmlString;
}
}
else if("REFDATE_AMT".equalsIgnoreCase(autoReconFilter) && (autoReconFilterValue != null || autoReconFilterValue.trim().length() > 0 ))
else if("REFDATE_AMT".equalsIgnoreCase(autoReconFilter) && (autoReconFilterValue != null && autoReconFilterValue.trim().length() > 0 ) && ( bankStmtCnt==1 || bankTrntCnt == 1 ))
{
System.out.println("@@@@:REFDATE_AMT:autoReconFilterValue["+autoReconFilterValue+"]refDate["+refDate+"]");
if(!autoReconFilterValue.equalsIgnoreCase(refDate))
......@@ -1297,7 +1350,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
return valueXmlString;
}
}
else if("REFNO_AMT".equalsIgnoreCase(autoReconFilter) && (autoReconFilterValue != null || autoReconFilterValue.trim().length() > 0 ))
else if("REFNO_AMT".equalsIgnoreCase(autoReconFilter) && (autoReconFilterValue != null && autoReconFilterValue.trim().length() > 0 ) && ( bankStmtCnt==1 || bankTrntCnt == 1 ))
{
System.out.println("@@@@:REFNO_AMT:autoReconFilterValue["+autoReconFilterValue+"]refNo["+refNo+"]");
if(!autoReconFilterValue.equalsIgnoreCase(refNo))
......@@ -1332,15 +1385,14 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
}
// end
System.out.println("tranName :"+tranName);
if(tranName.equalsIgnoreCase("bankStatement"))
{
bankStmtCnt++;
// bankStmtCnt++;
totalBSAmount = totalBSAmount + Double.parseDouble(amtBc); //amtAdj
}
if(tranName.equalsIgnoreCase("bankTransaction"))
{
bankTrntCnt++;
// bankTrntCnt++;
totalBTAmount = totalBTAmount + Double.parseDouble(amtBc);
}
......@@ -1692,9 +1744,18 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
// added by cpatil on 10/03/16 for multiple BS & BT //pending
if(bankStmtCnt > 1 && bankTrntCnt > 1 && false )
if( bankStmtCnt > 1 && bankTrntCnt > 1 )
{
if(!"REFNO_DATE_AMT".equalsIgnoreCase(autoReconFilter) )
{
System.out.println("..............Multiple Bank Statement and Multiple Bank Transacion..................");
valueXmlString = valueXmlString.append("<?xml version='1.0'?><Root>");
valueXmlString = valueXmlString.append("<message>RFNDTAMT</message>");
valueXmlString = valueXmlString.append("</Root>");
System.out.println("valueXmlString :"+valueXmlString);
return valueXmlString;
}
System.out.println("..............Multiple Bank Statement and Multiple Bank Transacion....autoReconFilter["+autoReconFilter+"]");
for (int temp = 0; temp < nList.getLength(); temp++)
{
Node nNode = nList.item(temp);
......@@ -1729,24 +1790,24 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
currSet.add(currCodeBS);
if(tranTypeBS.equalsIgnoreCase("P"))
/*if(tranTypeBS.equalsIgnoreCase("P"))
{
paymentAmt = paymentAmt + tempAmtBS;
}
else if(tranTypeBS.equalsIgnoreCase("R"))
{
receiptAmt = receiptAmt + tempAmtBS;
}
/*if(tranTypeBS.equalsIgnoreCase("P"))
}*/
if(tranTypeBS.equalsIgnoreCase("P"))
{
paymentAmtBS = paymentAmtBS + amtBS;
}
else if(tranTypeBS.equalsIgnoreCase("R"))
{
receiptAmtBS = receiptAmtBS + amtBS;
}*/
System.out.println("@@@@@ paymentAmt["+paymentAmt+"]receiptAmt["+receiptAmt+"]");
//System.out.println("@@@@@ paymentAmtBS["+paymentAmtBS+"]paymentAmtBT["+paymentAmtBT+"]receiptAmtBS["+receiptAmtBS+"]receiptAmtBT["+receiptAmtBT+"]");
}
//System.out.println("@@@@@ paymentAmt["+paymentAmt+"]receiptAmt["+receiptAmt+"]");
System.out.println("@@@@@ paymentAmtBS["+paymentAmtBS+"]paymentAmtBT["+paymentAmtBT+"]receiptAmtBS["+receiptAmtBS+"]receiptAmtBT["+receiptAmtBT+"]");
}//end of bankStatement
if(tranName.equalsIgnoreCase("bankTransaction"))
{
......@@ -1776,25 +1837,25 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
//amtList.add(amtBT);
currSet.add(currCodeBT);
if(tranTypeBT.equalsIgnoreCase("P"))
/*if(tranTypeBT.equalsIgnoreCase("P"))
{
paymentAmt = paymentAmt + tempAmtBT;
}
else if(tranTypeBT.equalsIgnoreCase("R"))
{
receiptAmt = receiptAmt + tempAmtBT;
}
}*/
/*if(tranTypeBT.equalsIgnoreCase("P"))
if(tranTypeBT.equalsIgnoreCase("P"))
{
paymentAmtBT = paymentAmtBT + amtBT;
}
else if(tranTypeBT.equalsIgnoreCase("R"))
{
receiptAmtBT = receiptAmtBT + amtBT;
}*/
System.out.println("@@@@@ paymentAmt["+paymentAmt+"]receiptAmt["+receiptAmt+"]");
//System.out.println("@@@@@ paymentAmtBS["+paymentAmtBS+"]paymentAmtBT["+paymentAmtBT+"]receiptAmtBS["+receiptAmtBS+"]receiptAmtBT["+receiptAmtBT+"]");
}
//System.out.println("@@@@@ paymentAmt["+paymentAmt+"]receiptAmt["+receiptAmt+"]");
System.out.println("@@@@@ paymentAmtBS["+paymentAmtBS+"]paymentAmtBT["+paymentAmtBT+"]receiptAmtBS["+receiptAmtBS+"]receiptAmtBT["+receiptAmtBT+"]");
}//end of bankTransaction
}///end of for loop\
......@@ -1803,18 +1864,32 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("paymentAmt :"+paymentAmt);
System.out.println("receiptAmt :"+receiptAmt);
System.out.println("tranTypeBS :"+tranTypeBS);
if(tranTypeBS.equalsIgnoreCase("P"))
//if(tranTypeBS.equalsIgnoreCase("P"))
//{
calAmtBS = paymentAmtBS - receiptAmtBS;
//}
//else if(tranTypeBS.equalsIgnoreCase("R"))
//{
calAmtBT = paymentAmtBT - receiptAmtBT ;
//}
/*if(tranTypeBS.equalsIgnoreCase("P"))
{
calAmt = paymentAmt - receiptAmt;
calAmtBS = paymentAmtBS - receiptAmtBS;
}
else if(tranTypeBS.equalsIgnoreCase("R"))
{
calAmt = receiptAmt - paymentAmt;
calAmtBT = receiptAmtBT - paymentAmtBT;
}
*/
System.out.println("calAmt :"+calAmt);
System.out.println("tempAmtBS :"+tempAmtBS);
if(calAmt == tempAmtBS && currSet.size() == 1)
System.out.println("calAmtBS["+calAmtBS+"]calAmtBT["+calAmtBT+"]");
if( calAmtBS == calAmtBT )
{
isReconcile = true;
System.out.println("isReconcile["+isReconcile+"]");
......@@ -1886,7 +1961,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
}
if(tranIdBTList.size() > 1 && tranIdBSList.size() > 1 && false)
if(tranIdBTList.size() > 1 && tranIdBSList.size() > 1 )
{
System.out.println("@@@@@@@@ tranIdBSList["+tranIdBSList+"]:::tranIdBTList["+tranIdBTList+"]");
for(int i = 0 ; i < tranIdBTList.size() ; i++)
......@@ -1901,7 +1976,9 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
//System.out.println(amtList.get(i));
traceData.add(tranIdBTList.get(i));
traceData.add(tranIdBSList.get(i));
traceData.add(amtList.get(i));
double amtTemp = getReconcileAmount("banktran_log",tranIdBTList.get(i),conn);
traceData.add(amtTemp);
//traceData.add(amtList.get(i));
arrayListData.add(traceData);
System.out.println("after :"+arrayListData);
}
......@@ -1912,17 +1989,13 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
}
}//else for CallByManually
System.out.println("arrayListData :"+arrayListData);
if(arrayListData != null && arrayListData.size() > 0)
{
System.out.println("@@@@@@@stringBuffer1["+stringBuffer+"]@@@@@@@,arrayListData.lenght["+arrayListData.size()+"]");
System.out.println("@@@@@@@arrayListData.size():["+arrayListData.size()+"]arrayListData11---->["+arrayListData+"]");
pstmt = conn.prepareStatement(insertSql);
......@@ -2053,6 +2126,38 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
}
private double getReconcileAmount(String tableName,String tranId, Connection conn)
{
double amount=0;
String sql="";
PreparedStatement pstmt=null;
ResultSet rs=null;
try
{
sql = "SELECT amount from " + tableName + " where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
while(rs.next())
{
amount=rs.getDouble("amount");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
catch(Exception e)
{
e.printStackTrace();
}
System.out.println("@@@@@@@ amount["+amount+"]");
return amount;
}
private ArrayList<ArrayList> buildTraceDataHM(HashMap<String,Double> bankStmtMap,HashMap<String,Double> bankTranMap,String siteCodeFr,String siteCodeTo,String rType,HashMap<String,String> bankStmtRefMap,HashMap<String,String> bankTranRefMap,String autoReconFilter) throws Exception
{
System.out.println("In buildTraceDataHM calling..........");
......@@ -2137,9 +2242,6 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
}
}
System.out.println(bankStmtRefMap);
System.out.println("bankStmtRefMap size ....."+bankStmtRefMap.size());
System.out.println(""+":"+keyArray[1].toString());
......@@ -2939,6 +3041,8 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
ResultSet rs=null;
List<String> tranIdList = new ArrayList<String>();
String refDateTemp="";
//Timestamp refDateTemp1= null;
try
{
......@@ -2953,7 +3057,21 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
{
refNo=keyArray[0].toString();
refDate=keyArray[1].toString();
sql = sql + " ref_no='"+refNo+"' and trim(ref_date)='"+refDate+"' ";
String format= genericUtility.getApplDateFormat();
System.out.println("@@@@@ format["+format+"]");
SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MMM-yy");
java.util.Date varDate=dateFormat.parse(refDate);
dateFormat=new SimpleDateFormat(format);
refDateTemp = dateFormat.format(varDate);
System.out.println("@@@@@@@@@ refDateTemp["+refDateTemp+"]");
//refDateTemp1 = Timestamp.valueOf(genericUtility.getValidDateString(refDateTemp, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
//refDateTemp = java.sql.Timestamp.valueOf(genericUtility.getValidDateString(refDate, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0");
System.out.println("@@@@@@@1refDate["+refDate+"]::::refDateTemp1["+refDateTemp+"]");
sql = sql + " ref_no='"+refNo+"' and ref_date = '"+refDateTemp+"' ";
//sql = sql + " ref_no='"+refNo+"' and trim(ref_date)='"+refDate+"' ";
}
else if("REFNO_AMT".equalsIgnoreCase(autoRecoFilter))
{
......@@ -2963,7 +3081,21 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
else if("REFDATE_AMT".equalsIgnoreCase(autoRecoFilter))
{
refDate=keyArray[0].toString();
sql = sql + " trim(ref_date)='"+refDate+"' ";
String format= genericUtility.getApplDateFormat();
System.out.println("@@@@@ format["+format+"]");
SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MMM-yy");
java.util.Date varDate=dateFormat.parse(refDate);
dateFormat=new SimpleDateFormat(format);
refDateTemp = dateFormat.format(varDate);
System.out.println("@@@@@@@@@ refDateTemp["+refDateTemp+"]");
//refDateTemp = Timestamp.valueOf(genericUtility.getValidDateString(refDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
//refDateTemp = java.sql.Timestamp.valueOf(genericUtility.getValidDateString(refDate, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0");
System.out.println("@@@@@@@2refDate["+refDate+"]::::refDateTemp["+refDateTemp+"]");
sql = sql + " ref_date = '"+refDateTemp+"' ";
//sql = sql + " trim(ref_date)='"+refDate+"' ";
}
sql = sql + "and site_code=? and bank_code=? and status in ('E', 'P')";
......@@ -2993,10 +3125,6 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
}
private String checkNull(String str)
{
if(str == null)
......
webitm-fin/module-resource/jsp/BankRecoWiz.jsp
View file @ 2a1f230f
......@@ -125,6 +125,22 @@
//window.close();
</script>
<%
}
else if(result.indexOf("RFNDTAMT") > -1)
{
%>
<script type="text/javascript">
//parent.window.close();
//this.window.close();
alert("Only REFNO_DATE_AMT key allowed for multiple Reconcilation..!!");
window.history.back();
//window.location = 'E12WizardPage.jsp?OBJ_NAME=bank_reconciliation_wiz&amp;FORM_NO=1';
//window.close();
</script>
<%
}
else
......
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