Skip to content

B
business-java
Commit 70152e34 authored by prane's avatar prane
Browse files
Options

Remittance Form consideration in Ar Settlement process and R-JV should be... 

Remittance Form consideration in Ar Settlement process and R-JV should be generate based on Remittnace form mapping

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@217295 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d0a84f91
Show whitespace changes
Inline Side-by-side
Showing with 629 additions and 604 deletions
webitm-fin/src/ibase/webitm/ejb/fin/GenerateReceiptPrc.java
View file @ 70152e34
...@@ -9,7 +9,7 @@ import javax.ejb.*; ...@@ -9,7 +9,7 @@ import javax.ejb.*;
import org.w3c.dom.*; import org.w3c.dom.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import javax.xml.parsers.*; import javax.xml.parsers.*;
import java.util.HashMap;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.text.NumberFormat; import java.text.NumberFormat;
...@@ -216,7 +216,7 @@ Put a validation chq amount in filter and total of details matches in case heade ...@@ -216,7 +216,7 @@ Put a validation chq amount in filter and total of details matches in case heade
xmlBuff.append("<group0>"); xmlBuff.append("<group0>");
xmlBuff.append("<description>").append("Group0 description").append("</description>"); xmlBuff.append("<description>").append("Group0 description").append("</description>");
xmlBuff.append("<Header0>"); xmlBuff.append("<Header0>");
StringBuffer subXmlStr = new StringBuffer("");
/*StringBuffer xmlBuffStr = new StringBuffer("<?xml version = \"1.0\"?>"); /*StringBuffer xmlBuffStr = new StringBuffer("<?xml version = \"1.0\"?>");
System.out.println("In GetViewData::["+windowName+"]"); System.out.println("In GetViewData::["+windowName+"]");
if("generate_receipt_process".equals(windowName)) if("generate_receipt_process".equals(windowName))
...@@ -269,7 +269,9 @@ Put a validation chq amount in filter and total of details matches in case heade ...@@ -269,7 +269,9 @@ Put a validation chq amount in filter and total of details matches in case heade
Timestamp custRefDate= null; Timestamp custRefDate= null;
Timestamp dueDate = null; Timestamp dueDate = null;
Timestamp dueDateFR = null;// ADDED BY NANDKUMAR GADKARI ON 03/04/19 Timestamp dueDateFR = null;// ADDED BY NANDKUMAR GADKARI ON 03/04/19
String tranIdRcp = "";
BigDecimal chqAmt = new BigDecimal(0.0);
BigDecimal rcpAmt = new BigDecimal(0.0);
try try
{ {
...@@ -307,7 +309,8 @@ Put a validation chq amount in filter and total of details matches in case heade ...@@ -307,7 +309,8 @@ Put a validation chq amount in filter and total of details matches in case heade
xmlBuffStr.append("<group0>"); xmlBuffStr.append("<group0>");
xmlBuffStr.append("<description>").append("Group0 description").append("</description>"); xmlBuffStr.append("<description>").append("Group0 description").append("</description>");
xmlBuffStr.append("<Header0>"); xmlBuffStr.append("<Header0>");
suggestAdj = "Y"; //If remiitance value null then not to perofrom auto suggestion
//suggestAdj = "Y";
} }
if(siteCode == null || siteCode.trim().length() == 0) if(siteCode == null || siteCode.trim().length() == 0)
...@@ -430,25 +433,33 @@ Put a validation chq amount in filter and total of details matches in case heade ...@@ -430,25 +433,33 @@ Put a validation chq amount in filter and total of details matches in case heade
System.out.println("suggest_adj........["+suggestAdj+"]"); System.out.println("suggest_adj........["+suggestAdj+"]");
HashMap<String, ArrayList<ReceiptBean>> custGrpMap = new HashMap<String, ArrayList<ReceiptBean>>(); HashMap<String, ArrayList<ReceiptBean>> custGrpMap = new HashMap<String, ArrayList<ReceiptBean>>();
HashMap<String, HashMap<String, ArrayList<RemittBean>>> custRemittMap = new HashMap<String, HashMap<String, ArrayList<RemittBean>>>();
//ArrayList<ReceiptBean> selectedList = null; //ArrayList<ReceiptBean> selectedList = null;
try try
{ {
//Pavan Rane 20FEB20 Start [Advance Receipt Customization(remittance form consideration)] //Pavan Rane 20FEB20 Start [Advance Receipt Customization(remittance form consideration)]
if( "Y".equals(suggestRemit)) if( "Y".equals(suggestRemit))
{ {
suggestAdj = "Y"; /**
sql = "SELECT A.TRAN_ID__RCP,B.REF_NO, A.CUST_CODE, A.CHQ_AMT, B.RCP_AMT, C.GROUP_CODE" * Map is used to maintain remittance form detail of invoice from receivales
+ " FROM RECEIPT_FORM A, RCPDET_FORM B, CUSTOMER C" * HashMap<tran_id__rcp, ArrayList<ReceiptBean>> advancedMap;
* */
HashMap<String, ArrayList<ReceiptBean>> advancedMap = new HashMap<String, ArrayList<ReceiptBean>>();
sql = "SELECT A.TRAN_ID__RCP, A.CHQ_AMT, B.RCP_AMT, D.REF_NO,D.TRAN_SER,D.REF_DATE,D.TOT_AMT - D.ADJ_AMT AS BAL_AMT,C.CUST_NAME, ' ' BANK_CODE,D.TRAN_DATE,' ' AS CHEQUE_NO,0.0 CHQ_AMOUNT,C.CUST_CODE, D.CUST_REF_NO,D.REAS_CODE,D.REAS_DETAIL,D.CUST_REF_DATE,D.ADJ_AMT,D.CUST_REF_AMT,D.DUE_DATE,D.TOT_AMT, C.GROUP_CODE"
+ " FROM RECEIPT_FORM A, RCPDET_FORM B, CUSTOMER C , RECEIVABLES D"
+ " WHERE A.TRAN_ID = B.TRAN_ID" + " WHERE A.TRAN_ID = B.TRAN_ID"
+ " AND A.CUST_CODE = C.CUST_CODE" + " AND D.REF_NO = B.REF_NO"
+ " AND B.ADJ_METHOD='M'" + " AND A.CUST_CODE = D.CUST_CODE "
+ " AND C.CUST_CODE = D.CUST_CODE "
+ " AND D.TOT_AMT - D.ADJ_AMT <> 0"
+ " AND A.SITE_CODE= D.SITE_CODE"
+ " AND A.SITE_CODE= ?" + " AND A.SITE_CODE= ?"
+ " AND B.ADJ_METHOD='M' "
+ " AND A.TRAN_ID__RCP IS NOT NULL " + " AND A.TRAN_ID__RCP IS NOT NULL "
+ " AND A.TRAN_ID__ADJ IS NULL " + " AND A.TRAN_ID__ADJ IS NULL "
+ " AND A.CUST_CODE IN (SELECT CUST_CODE FROM CUSTOMER WHERE GROUP_CODE IN ( SELECT DISTINCT GROUP_CODE FROM CUSTOMER WHERE GROUP_CODE >= ? AND GROUP_CODE <= ? ) )" + " AND A.CUST_CODE IN (SELECT CUST_CODE FROM CUSTOMER WHERE GROUP_CODE IN ( SELECT DISTINCT GROUP_CODE FROM CUSTOMER WHERE GROUP_CODE >= ? AND GROUP_CODE <= ? ) )"
+ " AND A.TRAN_DATE >= ? AND A.TRAN_DATE <= ?" + " AND A.TRAN_DATE >= ? AND A.TRAN_DATE <= ?"
+ " ORDER BY A.TRAN_DATE"; + " ORDER BY A.TRAN_DATE";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode.trim()); pstmt.setString(1,siteCode.trim());
pstmt.setString(2,custCodeFrom.trim()); pstmt.setString(2,custCodeFrom.trim());
...@@ -457,69 +468,196 @@ Put a validation chq amount in filter and total of details matches in case heade ...@@ -457,69 +468,196 @@ Put a validation chq amount in filter and total of details matches in case heade
pstmt.setTimestamp(5,dueDateTo); pstmt.setTimestamp(5,dueDateTo);
//System.out.println("The getDataSQL Becomes ......:"+sql); //System.out.println("The getDataSQL Becomes ......:"+sql);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
int tCnt= 1;
while (rs.next()) while (rs.next())
{ {
System.out.println("inside while..................."); //Populate Remittamce Form detail data(Invoices detail from receivables)
String tranIdRcp = checkNull(rs.getString("TRAN_ID__RCP")); ArrayList<ReceiptBean> invList = new ArrayList<ReceiptBean>();
tranIdRcp = rs.getString("TRAN_ID__RCP");
chqAmt = new BigDecimal(rs.getDouble("CHQ_AMT"));
rcpAmt = new BigDecimal(rs.getDouble("RCP_AMT"));
invoiceId = checkNull(rs.getString("REF_NO"));
tranSer = checkNull(rs.getString("TRAN_SER"));
custRefNo = checkNull(rs.getString("CUST_REF_NO"));
tranDate = rs.getTimestamp("REF_DATE");
totAmt = new BigDecimal(rs.getDouble("TOT_AMT"));
balAmt = new BigDecimal(rs.getDouble("BAL_AMT"));
adjAmt = new BigDecimal(rs.getDouble("BAL_AMT"));
adjustedAmt = new BigDecimal(rs.getDouble("ADJ_AMT"));
invAmt = new BigDecimal(rs.getDouble("BAL_AMT"));
reasCode = checkNull(rs.getString("REAS_CODE"));
custName = checkNull(rs.getString("CUST_NAME"));
custCode = checkNull(rs.getString("CUST_CODE"));
bankCode = checkNull(rs.getString("BANK_CODE"));
chequeDate = rs.getTimestamp("TRAN_DATE");
chequeNo = checkNull(rs.getString("CHEQUE_NO"));
chqAmount = new BigDecimal(rs.getDouble("CHQ_AMOUNT"));
custRefDate= rs.getTimestamp("CUST_REF_DATE");
dueDate = rs.getTimestamp("DUE_DATE");
reasDetail = checkNull(rs.getString("REAS_DETAIL"));
custRefAmt = new BigDecimal(rs.getDouble("CUST_REF_AMT"));
groupCode = checkNull(rs.getString("GROUP_CODE"));
adjAmt = rcpAmt;
ReceiptBean rcpBean = new ReceiptBean();
rcpBean.setInvoiceId(invoiceId);
rcpBean.setTranSer(tranSer);
rcpBean.setCustRefNo(custRefNo);
rcpBean.setTranDate(tranDate);
rcpBean.setTotAmt(totAmt);
rcpBean.setBalAmt(balAmt);
rcpBean.setAdjAmt(adjAmt);
rcpBean.setAdjustedAmt(adjustedAmt);
rcpBean.setInvAmt(invAmt);
rcpBean.setReasCode(reasCode);
rcpBean.setCustName(custName);
rcpBean.setCustCode(custCode);
rcpBean.setBankCode(bankCode);
rcpBean.setChequeDate(chequeDate);
rcpBean.setChequeNo(chequeNo);
rcpBean.setChqAmount(chqAmount);
rcpBean.setCustRefDate(custRefDate);
rcpBean.setDueDate(dueDate);
rcpBean.setReasDetail(reasDetail);
rcpBean.setCustRefAmt(custRefAmt);
rcpBean.setTranIdRcp(tranIdRcp);
System.out.println("tranIdRcp["+tranIdRcp+"]"+tCnt+"] advancedMap Size>>"+advancedMap.size());
tCnt++;
if (!advancedMap.containsKey(tranIdRcp))
{ invList.add(rcpBean);
advancedMap.put(tranIdRcp, invList);
}
else {
if(advancedMap.containsKey(tranIdRcp))
{
ArrayList<ReceiptBean> tempList = new ArrayList<ReceiptBean>();
tempList = advancedMap.get(tranIdRcp);
tempList.add(rcpBean);
advancedMap.put(tranIdRcp, tempList);
//System.out.println(">>>>advancedMap.size()["+tempList.size()+"]");
}
}
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("advancedMap["+advancedMap.size()+"]");
if(advancedMap.size() > 0)
{
int gCnt1 = 1;
for (Map.Entry<String, ArrayList<ReceiptBean>> entry : advancedMap.entrySet())
{
tranIdRcp = entry.getKey();
ArrayList<ReceiptBean> invList = entry.getValue();
System.out.println("tranIdRcp::["+tranIdRcp+"]invList["+invList.size()+"]");
int recCount = checkAdvancedDishnor(tranIdRcp, conn); int recCount = checkAdvancedDishnor(tranIdRcp, conn);
System.out.println("check rcpdishnor["+tranIdRcp+"] recCount["+recCount+"]"); System.out.println("check rcpdishnor["+tranIdRcp+"] recCount["+recCount+"]");
if(recCount > 0) if(recCount > 0)
{ {
System.out.println("continue............Advanced Dishnored["+tranIdRcp+"]"); System.out.println("continue............next TranIdRcp Dishnored["+tranIdRcp+"]");
continue; continue;
} }
String refNo = checkNull(rs.getString("REF_NO")); /**Populate Advanced(Train_id__Rcp) details from receivables and prepare xml with list invoice details*/
//String custCode = rs.getString("CUST_CODE"); sql = "SELECT D.REF_NO,D.TRAN_SER,D.REF_DATE,D.TOT_AMT - D.ADJ_AMT AS BAL_AMT,C.CUST_NAME ,"
double chqAmt = rs.getDouble("CHQ_AMT"); + "' ' BANK_CODE,D.TRAN_DATE,' ' AS CHEQUE_NO,0.0 CHQ_AMOUNT,C.CUST_CODE, "
double rcpAmt = rs.getDouble("RCP_AMT"); + " D.CUST_REF_NO,D.REAS_CODE,D.REAS_DETAIL,D.CUST_REF_DATE,D.ADJ_AMT,D.CUST_REF_AMT,D.DUE_DATE,D.TOT_AMT, C.GROUP_CODE "
+ "FROM CUSTOMER C, RECEIVABLES D "
+ "WHERE C.CUST_CODE = D.CUST_CODE "
+ "AND D.TOT_AMT - D.ADJ_AMT <> 0 "
+ "AND D.SITE_CODE = ? "
+ "AND D.REF_NO = ? ";
/* +" and C.cust_code in (select cust_code from customer where group_code in ( select distinct group_code from customer where group_code >= ? and group_code <= ? ) ) "
+ "AND ((D.TRAN_DATE >= ? "
+ "AND D.TRAN_DATE <= ? ) OR (D.TRAN_DATE IS NULL)) "
+ "ORDER BY D.TRAN_DATE "; */
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode.trim());
pstmt.setString(2,tranIdRcp.trim());
//pstmt.setString(2,custCodeFrom.trim());
//pstmt.setString(3,custCodeTo.trim());
//pstmt.setTimestamp(4,dueDate);
//pstmt.setTimestamp(5,dueDateTo);
//System.out.println("The getDataSQL Becomes ......:"+sql);
rs = pstmt.executeQuery();
if (rs.next())
{
invoiceId = checkNull(rs.getString("REF_NO"));
tranSer = checkNull(rs.getString("TRAN_SER"));
custRefNo = checkNull(rs.getString("CUST_REF_NO"));
tranDate = rs.getTimestamp("REF_DATE");
totAmt = new BigDecimal(rs.getDouble("TOT_AMT"));
balAmt = new BigDecimal(rs.getDouble("BAL_AMT"));
adjAmt = new BigDecimal(rs.getDouble("BAL_AMT"));
adjustedAmt = new BigDecimal(rs.getDouble("ADJ_AMT"));
invAmt = new BigDecimal(rs.getDouble("BAL_AMT"));
reasCode = checkNull(rs.getString("REAS_CODE"));
custName = checkNull(rs.getString("CUST_NAME"));
custCode = checkNull(rs.getString("CUST_CODE"));
bankCode = checkNull(rs.getString("BANK_CODE"));
chequeDate = rs.getTimestamp("TRAN_DATE");
chequeNo = checkNull(rs.getString("CHEQUE_NO"));
chqAmount = new BigDecimal(rs.getDouble("CHQ_AMOUNT"));
custRefDate= rs.getTimestamp("CUST_REF_DATE");
dueDate = rs.getTimestamp("DUE_DATE");
reasDetail = checkNull(rs.getString("REAS_DETAIL"));
custRefAmt = new BigDecimal(rs.getDouble("CUST_REF_AMT"));
groupCode = checkNull(rs.getString("GROUP_CODE")); groupCode = checkNull(rs.getString("GROUP_CODE"));
System.out.println("Invoice["+refNo+"] Advanced["+tranIdRcp+"] AdvAmt["+chqAmt+"] invAmt["+rcpAmt+"]");
RemittBean remittBean = new RemittBean(); //to added remittance invoice amount for adjustment
remittBean.setRcpAmount(new BigDecimal(rs.getDouble("CHQ_AMT"))); adjAmt = chqAmt.subtract(rcpAmt);
remittBean.setRefAmt(new BigDecimal(rs.getDouble("RCP_AMT")));
remittBean.setRefNo(refNo); ReceiptBean rcpBean = new ReceiptBean();
remittBean.setTranIdRcp(tranIdRcp); rcpBean.setInvoiceId(invoiceId);
//System.out.println("(!custRemittMap.containsKey(groupCode))["+(!custRemittMap.containsKey(groupCode))+"]"); rcpBean.setTranSer(tranSer);
if (!custRemittMap.containsKey(groupCode)) rcpBean.setCustRefNo(custRefNo);
{ rcpBean.setTranDate(tranDate);
System.out.println("groupCode not matched"); rcpBean.setTotAmt(totAmt);
HashMap<String, ArrayList<RemittBean>> advMap = new HashMap<String, ArrayList<RemittBean>>(); rcpBean.setBalAmt(balAmt);
ArrayList<RemittBean> tempList = new ArrayList<RemittBean>(); rcpBean.setAdjAmt(adjAmt);
tempList.add(remittBean); rcpBean.setAdjustedAmt(adjustedAmt);
advMap.put(tranIdRcp, tempList); rcpBean.setInvAmt(invAmt);
custRemittMap.put(groupCode, advMap); rcpBean.setReasCode(reasCode);
} rcpBean.setCustName(custName);
else { rcpBean.setCustCode(custCode);
System.out.println("else...........1.0"); rcpBean.setBankCode(bankCode);
if(custRemittMap.containsKey(groupCode)) rcpBean.setChequeDate(chequeDate);
rcpBean.setChequeNo(chequeNo);
rcpBean.setChqAmount(chqAmount);
rcpBean.setCustRefDate(custRefDate);
rcpBean.setDueDate(dueDate);
rcpBean.setReasDetail(reasDetail);
rcpBean.setCustRefAmt(custRefAmt);
rcpBean.setTranIdRcp(tranIdRcp);
StringBuffer detXml = new StringBuffer();
if(invList.size() > 0)
{ {
System.out.println("else...........1.1"); BigDecimal totRemitAdvance = new BigDecimal(0.0);
HashMap<String, ArrayList<RemittBean>> advMaptmp = custRemittMap.get(groupCode); //invoice detail to append xml
if (!advMaptmp.containsKey(tranIdRcp)) for(ReceiptBean rcpBeanInv :invList)
{ {
System.out.println("else...........1.2"); detXml.append(generateXmls(headerDom, gCnt1, "Y", rcpBeanInv));
ArrayList<RemittBean> tempList = new ArrayList<RemittBean>(); totRemitAdvance = totRemitAdvance.add(rcpBeanInv.getAdjAmt());
tempList.add(remittBean); gCnt1 ++;
advMaptmp.put(tranIdRcp, tempList);
}
else {
System.out.println("else...........1.3");
ArrayList<RemittBean> tempList = advMaptmp.get(tranIdRcp);
tempList.add(remittBean);
advMaptmp.put(tranIdRcp, tempList);
} }
custRemittMap.put(groupCode, advMaptmp); //to set remittance form hder chk amount in advanced for adjustment
rcpBean.setAdjAmt(totRemitAdvance.negate());
//advanced to append xml above invoice
xmlBuff.append(generateXmls(headerDom, gCnt1+1, "Y", rcpBean));
xmlBuff.append(detXml);
} }
} }
//advMap.clear();
}
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println("custRemittMap.size()>>["+custRemittMap.size()+"] custRemittMap>>"+custRemittMap+"]\n\n\n\n"); }
}
}//Enf of if( "Y".equals(suggestRemit)) }//Enf of if( "Y".equals(suggestRemit))
//Pavan Rane 20FEB20 End [Advance Receipt Customization(remittance form consideration)] else
{
//*********Added on 28092006 //*********Added on 28092006
sql = "SELECT D.REF_NO,D.TRAN_SER,D.REF_DATE,D.TOT_AMT - D.ADJ_AMT ,C.CUST_NAME ," sql = "SELECT D.REF_NO,D.TRAN_SER,D.REF_DATE,D.TOT_AMT - D.ADJ_AMT ,C.CUST_NAME ,"
+ "' ' BANK_CODE,D.TRAN_DATE,' ' AS CHEQUE_NO,0.0 CHQ_AMOUNT,C.CUST_CODE, " // ADDED BY RAJESH AS ALIAS IS NOT REQUIRED FOR BANK_CODE + "' ' BANK_CODE,D.TRAN_DATE,' ' AS CHEQUE_NO,0.0 CHQ_AMOUNT,C.CUST_CODE, " // ADDED BY RAJESH AS ALIAS IS NOT REQUIRED FOR BANK_CODE
...@@ -592,6 +730,7 @@ Put a validation chq amount in filter and total of details matches in case heade ...@@ -592,6 +730,7 @@ Put a validation chq amount in filter and total of details matches in case heade
rcpBean.setDueDate(dueDate); rcpBean.setDueDate(dueDate);
rcpBean.setReasDetail(reasDetail); rcpBean.setReasDetail(reasDetail);
rcpBean.setCustRefAmt(custRefAmt); rcpBean.setCustRefAmt(custRefAmt);
rcpBean.setTranIdRcp("");
if (!custGrpMap.containsKey(groupCode)) if (!custGrpMap.containsKey(groupCode))
{ custList.add(rcpBean); { custList.add(rcpBean);
...@@ -673,6 +812,7 @@ Put a validation chq amount in filter and total of details matches in case heade ...@@ -673,6 +812,7 @@ Put a validation chq amount in filter and total of details matches in case heade
} }
retTabSepStrBuff.append("<cust_ref_amt>").append("<![CDATA["+ rounded(custRefAmt,3) +"]]>").append("</cust_ref_amt>"); retTabSepStrBuff.append("<cust_ref_amt>").append("<![CDATA["+ rounded(custRefAmt,3) +"]]>").append("</cust_ref_amt>");
retTabSepStrBuff.append("<remarks>").append("<![CDATA["+remarks+"]]>").append("</remarks>"); retTabSepStrBuff.append("<remarks>").append("<![CDATA["+remarks+"]]>").append("</remarks>");
retTabSepStrBuff.append("<tran_id__rcp>").append("<![CDATA["+""+"]]>").append("</tran_id__rcp>");
retTabSepStrBuff.append("</Detail2>"); retTabSepStrBuff.append("</Detail2>");
} }
...@@ -682,10 +822,10 @@ Put a validation chq amount in filter and total of details matches in case heade ...@@ -682,10 +822,10 @@ Put a validation chq amount in filter and total of details matches in case heade
rs = null; //Pavan Rane 23jul19[for open cursor issue] rs = null; //Pavan Rane 23jul19[for open cursor issue]
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} //else of if( "Y".equals(suggestRemit))
retTabSepStrBuff.append("</Header0>"); retTabSepStrBuff.append("</Header0>");
retTabSepStrBuff.append("</group0>"); retTabSepStrBuff.append("</group0>");
retTabSepStrBuff.append("</DocumentRoot>"); retTabSepStrBuff.append("</DocumentRoot>");
//Pavan Rane 20FEB20 Start [Commented for Advance Receipt Customization(remittance form consideration)]
//added by nandkumar gadkari---------------start--------------1/04/19-----for Remittance form Manual flag //added by nandkumar gadkari---------------start--------------1/04/19-----for Remittance form Manual flag
/*String refNo="",refSer=""; /*String refNo="",refSer="";
int cnt=0; int cnt=0;
...@@ -733,9 +873,9 @@ Put a validation chq amount in filter and total of details matches in case heade ...@@ -733,9 +873,9 @@ Put a validation chq amount in filter and total of details matches in case heade
pstmt = null; pstmt = null;
cnt =rcpFormRefNo.size(); cnt =rcpFormRefNo.size();
System.out.println("^^^^^^^rcpFormRefNo rcpFormRefNo["+rcpFormRefNo);*/ System.out.println("^^^^^^^rcpFormRefNo rcpFormRefNo["+rcpFormRefNo);
//added by nandkumar gadkari---------------end--------------1/04/19-----for Remittance form Manual flag */ //added by nandkumar gadkari---------------end--------------1/04/19-----for Remittance form Manual flag
//Pavan Rane 20FEB20 End [Commented for Advance Receipt Customization(remittance form consideration)]
//Added by Pavan R on 24MAY18 [F18BGTP001]- "Suggest adjustments" in Automatic AR settlement filter screen. //Added by Pavan R on 24MAY18 [F18BGTP001]- "Suggest adjustments" in Automatic AR settlement filter screen.
if("Y".equalsIgnoreCase(suggestAdj)) if("Y".equalsIgnoreCase(suggestAdj))
{ {
...@@ -744,11 +884,8 @@ Put a validation chq amount in filter and total of details matches in case heade ...@@ -744,11 +884,8 @@ Put a validation chq amount in filter and total of details matches in case heade
System.out.println("*******keyset [ "+sp+" ]******"); System.out.println("*******keyset [ "+sp+" ]******");
} }
int gCnt = 1; int gCnt = 1;
//for (ArrayList<ReceiptBean> templist : custGrpMap.values()) for (ArrayList<ReceiptBean> templist : custGrpMap.values())
for (Map.Entry<String, ArrayList<ReceiptBean>> entry : custGrpMap.entrySet())
{ {
groupCode = entry.getKey();
ArrayList<ReceiptBean> templist = entry.getValue();
BigDecimal tmpVal = new BigDecimal(-1); BigDecimal tmpVal = new BigDecimal(-1);
System.out.println("Global dom count["+gCnt+"]"); System.out.println("Global dom count["+gCnt+"]");
//selectedList = new ArrayList<ReceiptBean>(); //selectedList = new ArrayList<ReceiptBean>();
...@@ -793,8 +930,8 @@ Put a validation chq amount in filter and total of details matches in case heade ...@@ -793,8 +930,8 @@ Put a validation chq amount in filter and total of details matches in case heade
} }
else // added by nandkumar gadkari on 2/04/19 ------------end else // added by nandkumar gadkari on 2/04/19 ------------end
{*/ {
totPosAmt = totPosAmt.add(balAmt); */ totPosAmt = totPosAmt.add(balAmt);
posList.add(rcpBean); posList.add(rcpBean);
//} //}
...@@ -817,76 +954,7 @@ Put a validation chq amount in filter and total of details matches in case heade ...@@ -817,76 +954,7 @@ Put a validation chq amount in filter and total of details matches in case heade
} }
} }
System.out.println("***Total Amount Positive[" + totPosAmt + "]Negative[" + totNegAmt + "]"); System.out.println("***Total Amount Positive[" + totPosAmt + "]Negative[" + totNegAmt + "]");
System.out.println("****POSListSize[" + posList.size()+ "]****NEGListSize[" + negList.size() + "]custRemittMap["+custRemittMap.size()+"]"); System.out.println("****POSListSize[" + posList.size()+ "]****NEGListSize[" + negList.size() + "]");
//Pavan Rane 20FEB20 Start [Advance Receipt Customization(remittance form consideration)]
if("Y".equals(suggestRemit))
{
if(custRemittMap.size() > 0)
{
//HashMap<String, ArrayList<RemittBean>> advMap = custRemittMap.get(groupCode);
//if(advMap == null || advMap.isEmpty())
if(custRemittMap.get(groupCode) == null || (custRemittMap.get(groupCode) != null && custRemittMap.get(groupCode).isEmpty()))
{
/**If there are no adv in Remittance for curernt custcode in selected period then continue*/
System.out.println("There is/are No Adv in Remittance for CustCode["+groupCode+"].....");
continue;
}
else
{
HashMap<String, ArrayList<RemittBean>> advMap = custRemittMap.get(groupCode);/***/
System.out.println("advMap.size()["+advMap.size()+"]");
for (Map.Entry<String, ArrayList<RemittBean>> advEntry : advMap.entrySet())
{
String advReceipt = advEntry.getKey();
ArrayList<RemittBean> invoicelist = advEntry.getValue();
int index = indexOfReference(negList, advReceipt);
System.out.println("Index["+index+"] Current Advance["+advReceipt+"] invoicelist["+invoicelist.size()+"]");
if(index != -1)
{
BigDecimal totAdvAmt = BigDecimal.ZERO;
BigDecimal totinvAmt = BigDecimal.ZERO;
StringBuffer xmlBuffDetail = new StringBuffer();
/**Here populate and match the invoices **/
for(RemittBean remittBean : invoicelist)
{
int invIndex = indexOfReference(posList, remittBean);
System.out.println("Index["+invIndex+"] Invoice...Current Advance["+advReceipt+"]");
if(invIndex != -1)
{
ReceiptBean rcpBean = posList.get(invIndex);
totAdvAmt = remittBean.getRcpAmount();
totinvAmt = totinvAmt.add(remittBean.getRefAmt());
rcpBean.setAdjAmt(remittBean.getRefAmt());
//System.out.println("Invoice rcpBean["+rcpBean+"] invIndex["+invIndex+"]");
xmlBuffDetail.append(generateXmls(detailDom, gCnt, "Y", rcpBean));
gCnt++;
}
}
//if(totAdvAmt >= totinvAmt)
System.out.println("Comparing totAdvAmt["+totAdvAmt+"] totinvAmt["+totinvAmt+"]");
if (totAdvAmt.abs().compareTo(totinvAmt) >= 0)
{
ReceiptBean advRcpBean = negList.get(index);//adv
advRcpBean.setAdjAmt(totinvAmt.negate());
//System.out.println("Advanced rcpBean["+advRcpBean+"] invIndex["+index+"]");
subXmlStr.append(generateXmls(detailDom, gCnt, "Y", advRcpBean));
gCnt++;
subXmlStr.append(xmlBuffDetail);
}else
{
xmlBuffDetail.append("");//to clear invoices detail
System.out.println("continue.....");
continue;
}
}
}//adv loop end
//System.out.println("\n\n\nPAVAN RANE->>>>>xmlBuffStr["+xmlBuff+"]\n\n\n");
//xmlBuff.append(xmlBuff);
}
}
}//End of if("Y".equals(suggestRemit))
else
{ //Pavan Rane 20FEB20 End [Advance Receipt Customization(remittance form consideration)]
// If positive Amt is greater than negative // If positive Amt is greater than negative
//if (totPosAmt > totNegAmt*(-1)) //if (totPosAmt > totNegAmt*(-1))
if (totPosAmt.compareTo(totNegAmt.multiply(tmpVal)) == 1) if (totPosAmt.compareTo(totNegAmt.multiply(tmpVal)) == 1)
...@@ -1053,10 +1121,9 @@ Put a validation chq amount in filter and total of details matches in case heade ...@@ -1053,10 +1121,9 @@ Put a validation chq amount in filter and total of details matches in case heade
gCnt++; gCnt++;
} }
} }
//Pavan Rane 20FEB20 start [Commented for Advance Receipt Customization(remittance form consideration)] /*//added by nandkumar gadkari on 04/04/19---------------start-------------------for Remittance form Manual flag---------
//added by nandkumar gadkari on 04/04/19---------------start-------------------for Remittance form Manual flag---------
//below loop added to append unselected Positive records after matched selected //below loop added to append unselected Positive records after matched selected
/*if(cnt > 0) if(cnt > 0)
{ {
for (int i = 0; i < templist.size(); i++) { for (int i = 0; i < templist.size(); i++) {
...@@ -1096,7 +1163,6 @@ Put a validation chq amount in filter and total of details matches in case heade ...@@ -1096,7 +1163,6 @@ Put a validation chq amount in filter and total of details matches in case heade
}*/ }*/
//added by nandkumar gadkari on 04/04/19---------------end-----------------for Remittance form Manual flag----------- //added by nandkumar gadkari on 04/04/19---------------end-----------------for Remittance form Manual flag-----------
} }
}//else end of if("Y".equals(suggestRemit))
//Changes done on 26JUN2018 End //Changes done on 26JUN2018 End
}//end of for (ArrayList templist : custGrpMap.values()) }//end of for (ArrayList templist : custGrpMap.values())
/*xmlBuff.append("</Header0>"); /*xmlBuff.append("</Header0>");
...@@ -1105,7 +1171,7 @@ Put a validation chq amount in filter and total of details matches in case heade ...@@ -1105,7 +1171,7 @@ Put a validation chq amount in filter and total of details matches in case heade
//System.out.println("xml xmlBuff::::"+xmlBuff); //System.out.println("xml xmlBuff::::"+xmlBuff);
}//end of suggestion flag }//end of suggestion flag
//Pavan Rane 20FEB20 End [Advance Receipt Customization(remittance form consideration)] //Pavan R on 24MAY18 End
}//try }//try
catch (SQLException e) catch (SQLException e)
{ {
...@@ -1121,10 +1187,6 @@ Put a validation chq amount in filter and total of details matches in case heade ...@@ -1121,10 +1187,6 @@ Put a validation chq amount in filter and total of details matches in case heade
//if suggested adj is Y then display selected/unselected data else exsting will work //if suggested adj is Y then display selected/unselected data else exsting will work
if("generate_receipt_process".equals(objName) && "Y".equalsIgnoreCase(suggestAdj)) if("generate_receipt_process".equals(objName) && "Y".equalsIgnoreCase(suggestAdj))
{ {
if("Y".equalsIgnoreCase(suggestRemit))
{
xmlBuffStr.append(subXmlStr);
}
xmlBuffStr.append("</Header0>"); xmlBuffStr.append("</Header0>");
xmlBuffStr.append("</group0>"); xmlBuffStr.append("</group0>");
xmlBuffStr.append("</DocumentRoot>"); xmlBuffStr.append("</DocumentRoot>");
...@@ -1132,10 +1194,13 @@ Put a validation chq amount in filter and total of details matches in case heade ...@@ -1132,10 +1194,13 @@ Put a validation chq amount in filter and total of details matches in case heade
} }
else if("Y".equalsIgnoreCase(suggestAdj)) else if("Y".equalsIgnoreCase(suggestAdj))
{ {
if("Y".equalsIgnoreCase(suggestRemit)) xmlBuff.append("</Header0>");
{ xmlBuff.append("</group0>");
xmlBuff.append(subXmlStr); xmlBuff.append("</DocumentRoot>");
resultString = xmlBuff.toString();
} }
else if("Y".equals(suggestRemit))
{
xmlBuff.append("</Header0>"); xmlBuff.append("</Header0>");
xmlBuff.append("</group0>"); xmlBuff.append("</group0>");
xmlBuff.append("</DocumentRoot>"); xmlBuff.append("</DocumentRoot>");
...@@ -1264,6 +1329,7 @@ Put a validation chq amount in filter and total of details matches in case heade ...@@ -1264,6 +1329,7 @@ Put a validation chq amount in filter and total of details matches in case heade
String procDateStr = ""; String procDateStr = "";
String procDtStr = "",sdueDateTo = ""; String procDtStr = "",sdueDateTo = "";
Timestamp procDate = null, dueDateTo = null; Timestamp procDate = null, dueDateTo = null;
String tranIdRcp = "";
try try
{ {
if(conn==null) if(conn==null)
...@@ -1275,6 +1341,10 @@ conn = getConnection(); ...@@ -1275,6 +1341,10 @@ conn = getConnection();
conn.setAutoCommit(false); conn.setAutoCommit(false);
} }
ReceiptAdvConf rcpAdvConf = new ReceiptAdvConf(); ReceiptAdvConf rcpAdvConf = new ReceiptAdvConf();
if(jvAutoConf == null || jvAutoConf.trim().length() == 0 || "null".equals(jvAutoConf))
{
jvAutoConf = "N";
}
chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"); //changes by Nandkumar gadkari on 29/03/18 chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"); //changes by Nandkumar gadkari on 29/03/18
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId"); chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId");
//Added by Pavan R 10-may-18 to flag in filter on receivable JV creation, to create a confirmed or unconfirmed JV. //Added by Pavan R 10-may-18 to flag in filter on receivable JV creation, to create a confirmed or unconfirmed JV.
...@@ -1285,7 +1355,7 @@ conn = getConnection(); ...@@ -1285,7 +1355,7 @@ conn = getConnection();
suggestRemit = "N"; suggestRemit = "N";
} }
entryBatchNo = checkNull(genericUtility.getColumnValue("entry_batch_no", headerDom));//added by Pavan R 30aug18[to added in receivables header] entryBatchNo = checkNull(genericUtility.getColumnValue("entry_batch_no", headerDom));//added by Pavan R 30aug18[to added in receivables header]
System.out.println("Pavan----jvAutoConf ["+jvAutoConf+"]entryBatchNo["+entryBatchNo+"] suggestRemit["+suggestRemit+"]"); System.out.println("Pavan----jvAutoConf ["+jvAutoConf+"]entryBatchNo["+entryBatchNo+"]suggestRemit["+suggestRemit+"]");
//Added by Pavan R 10-may-18 end //Added by Pavan R 10-may-18 end
siteCode = genericUtility.getColumnValue("site_code",headerDom); siteCode = genericUtility.getColumnValue("site_code",headerDom);
//custCode = genericUtility.getColumnValue("cust_code",headerDom); //custCode = genericUtility.getColumnValue("cust_code",headerDom);
...@@ -1664,21 +1734,14 @@ conn = getConnection(); ...@@ -1664,21 +1734,14 @@ conn = getConnection();
if (childNodeName.equals("remarks"))//added by kunal on 19/10/12 if (childNodeName.equals("remarks"))//added by kunal on 19/10/12
{ {
//remarks = checkNull(childNode.getFirstChild().getNodeValue()).trim(); //remarks = checkNull(childNode.getFirstChild().getNodeValue()).trim();
if(childNode!=null) if(childNode!=null) {
{ if(childNode.getFirstChild()!=null) {
if(childNode.getFirstChild()!=null) if(childNode.getFirstChild().getNodeValue()!=null) {
{
if(childNode.getFirstChild().getNodeValue()!=null)
{
remarks = checkNull(childNode.getFirstChild().getNodeValue()); remarks = checkNull(childNode.getFirstChild().getNodeValue());
} } else {
else
{
remarks="KNOCKING OFF"; remarks="KNOCKING OFF";
} }
} } else {
else
{
remarks="KNOCKING OFF"; remarks="KNOCKING OFF";
} }
} }
...@@ -1694,6 +1757,27 @@ conn = getConnection(); ...@@ -1694,6 +1757,27 @@ conn = getConnection();
System.out.println("adjAmt :::::["+ adjAmt+"]"); System.out.println("adjAmt :::::["+ adjAmt+"]");
totalAdjAmt = getRequiredDecimal(totalAdjAmt,3)+adjAmt;// added by nandkumar gadkari on 03/04/18 totalAdjAmt = getRequiredDecimal(totalAdjAmt,3)+adjAmt;// added by nandkumar gadkari on 03/04/18
} }
//PAVAN RANE START 25FEB2020 [to get advance No against Remittance else default is @@@]
if (childNodeName.equals("tran_id__rcp"))
{
if(childNode!=null) {
if(childNode.getFirstChild()!=null) {
if(childNode.getFirstChild().getNodeValue()!=null) {
tranIdRcp = checkNull(childNode.getFirstChild().getNodeValue());
} else {
tranIdRcp="@@@";
}
} else {
tranIdRcp="@@@";
}
}
if(tranIdRcp == null || tranIdRcp.equalsIgnoreCase("null"))
{
tranIdRcp = "@@@";
}
}
System.out.println("tranIdRcp :::::"+ tranIdRcp);
//PAVAN RANE END 25FEB2020 [to get advance No against Remittance else default is @@@]
System.out.println("TotalAdjAmt Inner Loop ["+totalAdjAmt+"]"); System.out.println("TotalAdjAmt Inner Loop ["+totalAdjAmt+"]");
}//inner for }//inner for
sql = "SELECT GROUP_CODE FROM CUSTOMER WHERE CUST_CODE = ?"; sql = "SELECT GROUP_CODE FROM CUSTOMER WHERE CUST_CODE = ?";
...@@ -1713,7 +1797,9 @@ conn = getConnection(); ...@@ -1713,7 +1797,9 @@ conn = getConnection();
//searchKey = chequeNo + ":" + custCode; //added by rajesh k to concate chequeNo and custCode //searchKey = chequeNo + ":" + custCode; //added by rajesh k to concate chequeNo and custCode
searchKey= chequeNo + ":" + groupCode;//Added By Manoj dtd 26/11/2012 for Group Code //Pavan Rane Changes searchKey chnaged for tran_id__rcp for remittancewise receivables JV
//searchKey= chequeNo + ":" + groupCode;//Added By Manoj dtd 26/11/2012 for Group Code
searchKey= chequeNo + ":" + groupCode + tranIdRcp;
/*Commented by Manoj dtd 03/05/2014writeLog(filePtr,"chequeNo::::: "+chequeNo,true); /*Commented by Manoj dtd 03/05/2014writeLog(filePtr,"chequeNo::::: "+chequeNo,true);
writeLog(filePtr,"custCode::::: "+custCode,true); writeLog(filePtr,"custCode::::: "+custCode,true);
writeLog(filePtr,"searchKey::::: "+searchKey,true);*/ writeLog(filePtr,"searchKey::::: "+searchKey,true);*/
...@@ -3019,7 +3105,7 @@ conn = getConnection(); ...@@ -3019,7 +3105,7 @@ conn = getConnection();
{ {
//Commented by Manoj dtd 03/05/2014writeLog(filePtr,"[insertReceiptDtl]START:::",true); //Commented by Manoj dtd 03/05/2014writeLog(filePtr,"[insertReceiptDtl]START:::",true);
java.sql.Timestamp refDate = null,dueDate = null; java.sql.Timestamp refDate = null,dueDate = null;
String lineNo = "",refNo = "",currCode = "",custCode = "",acctCodeAr = "", sqlRemit=""; String lineNo = "",refNo = "",currCode = "",custCode = "",acctCodeAr = "",sqlRemit="";
String cctrCodeAr = "",billDisc = "",refSer=""; String cctrCodeAr = "",billDisc = "",refSer="";
double exchRateRcv = 0,discount = 0,badDebtAmt = 0,exchRate = 0,diffAmtExch = 0; double exchRateRcv = 0,discount = 0,badDebtAmt = 0,exchRate = 0,diffAmtExch = 0;
double taxAmt = 0,netAmt = 0,adjAmt = 0,rcpAmt = 0; double taxAmt = 0,netAmt = 0,adjAmt = 0,rcpAmt = 0;
...@@ -3031,7 +3117,6 @@ conn = getConnection(); ...@@ -3031,7 +3117,6 @@ conn = getConnection();
+ "ACCT_CODE__AR,CCTR_CODE__AR,BAD_DEBT_AMT,BILL_DISC,LINE_NO__REF,LINE_NO ) " + "ACCT_CODE__AR,CCTR_CODE__AR,BAD_DEBT_AMT,BILL_DISC,LINE_NO__REF,LINE_NO ) "
+ "VALUES ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; ////line number column added by kailas gaikwad on 27/5/2019 + "VALUES ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; ////line number column added by kailas gaikwad on 27/5/2019
//Commented by Manoj dtd 03/05/2014writeLog(filePtr,"[RCPDET SQL]:::"+sql,true); //Commented by Manoj dtd 03/05/2014writeLog(filePtr,"[RCPDET SQL]:::"+sql,true);
try try
{ {
if( "Y".equals(suggestRemit)) if( "Y".equals(suggestRemit))
...@@ -3151,6 +3236,11 @@ conn = getConnection(); ...@@ -3151,6 +3236,11 @@ conn = getConnection();
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
if(pstmtRemit != null)
{
pstmtRemit.close();
pstmtRemit = null;
}
} }
catch(Exception se){} catch(Exception se){}
} }
...@@ -3617,6 +3707,7 @@ conn = getConnection(); ...@@ -3617,6 +3707,7 @@ conn = getConnection();
String reasDetail = ""; String reasDetail = "";
String groupCode = ""; String groupCode = "";
String filterChqNo = ""; String filterChqNo = "";
String tranIdRcp = "";
/*double totAmt = 0.0; /*double totAmt = 0.0;
double balAmt = 0.0; double balAmt = 0.0;
double adjAmt = 0.0; double adjAmt = 0.0;
...@@ -3666,6 +3757,7 @@ conn = getConnection(); ...@@ -3666,6 +3757,7 @@ conn = getConnection();
reasDetail = rcpBean.getReasDetail(); reasDetail = rcpBean.getReasDetail();
custRefAmt = rcpBean.getCustRefAmt(); custRefAmt = rcpBean.getCustRefAmt();
filterChqNo = genericUtility.getColumnValue("cheque_no",headerDom); filterChqNo = genericUtility.getColumnValue("cheque_no",headerDom);
tranIdRcp = rcpBean.getTranIdRcp();
//System.out.println("totAmount["+totAmount+""); //System.out.println("totAmount["+totAmount+"");
xmlBuff.append("<Detail2 domID=\""+id+"\" selected=\""+isSelected+"\" > \r\n"); xmlBuff.append("<Detail2 domID=\""+id+"\" selected=\""+isSelected+"\" > \r\n");
...@@ -3733,6 +3825,7 @@ conn = getConnection(); ...@@ -3733,6 +3825,7 @@ conn = getConnection();
} }
xmlBuff.append("<cust_ref_amt>").append("<![CDATA["+ rounded(custRefAmt,3) +"]]>").append("</cust_ref_amt>"); xmlBuff.append("<cust_ref_amt>").append("<![CDATA["+ rounded(custRefAmt,3) +"]]>").append("</cust_ref_amt>");
xmlBuff.append("<remarks>").append("<![CDATA["+remarks+"]]>").append("</remarks>"); xmlBuff.append("<remarks>").append("<![CDATA["+remarks+"]]>").append("</remarks>");
xmlBuff.append("<tran_id__rcp>").append("<![CDATA["+tranIdRcp+"]]>").append("</tran_id__rcp>");
xmlBuff.append("</Detail2>"); xmlBuff.append("</Detail2>");
}catch (SQLException se) }catch (SQLException se)
{ {
...@@ -3769,45 +3862,12 @@ conn = getConnection(); ...@@ -3769,45 +3862,12 @@ conn = getConnection();
return objName; return objName;
} }
//Pavan Rane 20FEB20 start [Advance Receipt Customization(remittance form consideration)] //Pavan R on 24MAY18 End
public static BigDecimal rounded(BigDecimal aNumber, int prec) public static BigDecimal rounded(BigDecimal aNumber, int prec)
{ {
return aNumber.setScale(prec, BigDecimal.ROUND_HALF_EVEN); return aNumber.setScale(prec, BigDecimal.ROUND_HALF_EVEN);
} }
private int indexOfReference(ArrayList<ReceiptBean> refList,String RefNo) throws ITMException, Exception //Pavan Rane 20FEB20 end [Advance Receipt Customization(remittance form consideration)]
{
int retVal = -1, ctr = 0;
ReceiptBean rcpBean = null;
//System.out.println("indexOfReference.....refList.size()::["+refList.size()+"]");
for (ctr = 0; ctr < refList.size(); ctr++)
{
rcpBean = (ReceiptBean) refList.get(ctr);
//System.out.println("Find ReceiptBean...["+rcpBean.getInvoiceId()+"] RefNo["+RefNo+"]");
if (checkNull(rcpBean.getInvoiceId()).equals(checkNull(RefNo)))
{
retVal = ctr;
break;
}
}
return retVal;
}
private int indexOfReference(ArrayList<ReceiptBean> refList, RemittBean remittBean) throws ITMException, Exception
{
int retVal = -1, ctr = 0;
ReceiptBean rcpBean = null;
//System.out.println("indexOfReference.....refList.size()::["+refList.size()+"]");
for (ctr = 0; ctr < refList.size(); ctr++)
{
rcpBean = (ReceiptBean) refList.get(ctr);
//System.out.println("Find ReceiptBean------[" + rcpBean.getInvoiceId() + "] RemittBean----[" + remittBean.getRefNo()+"]");
if (checkNull(rcpBean.getInvoiceId()).equals(checkNull(remittBean.getRefNo())))
{
retVal = ctr;
break;
}
}
return retVal;
}
private int checkAdvancedDishnor(String RefNo, Connection conn) throws ITMException private int checkAdvancedDishnor(String RefNo, Connection conn) throws ITMException
{ {
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
...@@ -3838,7 +3898,6 @@ conn = getConnection(); ...@@ -3838,7 +3898,6 @@ conn = getConnection();
} }
//Pavan Rane 20FEB20 end [Advance Receipt Customization(remittance form consideration)] //Pavan Rane 20FEB20 end [Advance Receipt Customization(remittance form consideration)]
}//class }//class
//LHL22 //LHL22
...@@ -3879,7 +3938,7 @@ class ReceiptBean ...@@ -3879,7 +3938,7 @@ class ReceiptBean
private BigDecimal chqAmount = new BigDecimal(0.0); private BigDecimal chqAmount = new BigDecimal(0.0);
private BigDecimal custRefAmt = new BigDecimal(0.0); private BigDecimal custRefAmt = new BigDecimal(0.0);
private BigDecimal runningTotal = new BigDecimal(0.0); private BigDecimal runningTotal = new BigDecimal(0.0);
private String tranIdRcp = "";
public String getInvoiceId() { public String getInvoiceId() {
return invoiceId; return invoiceId;
...@@ -4068,6 +4127,12 @@ class ReceiptBean ...@@ -4068,6 +4127,12 @@ class ReceiptBean
public void setRunningTotal(BigDecimal runningTotal) { public void setRunningTotal(BigDecimal runningTotal) {
this.runningTotal = runningTotal; this.runningTotal = runningTotal;
} }
public String getTranIdRcp() {
return tranIdRcp;
}
public void setTranIdRcp(String tranIdRcp) {
this.tranIdRcp = tranIdRcp;
}
public static Comparator<ReceiptBean> receiptComparator = new Comparator<ReceiptBean>() { public static Comparator<ReceiptBean> receiptComparator = new Comparator<ReceiptBean>() {
...@@ -4082,44 +4147,4 @@ class ReceiptBean ...@@ -4082,44 +4147,4 @@ class ReceiptBean
}; };
} }
//Pavan Rane 20FEB20 start [Advance Receipt Customization(remittance form consideration)] //Pavan R on 24MAY18 End
class RemittBean \ No newline at end of file
{
private String tranIdRcp = "";
private String refNo = "";
private String custCode = "";
private BigDecimal rcpAmount = new BigDecimal(0.0);
private BigDecimal refAmt = new BigDecimal(0.0);
public String getTranIdRcp() {
return tranIdRcp;
}
public void setTranIdRcp(String tranIdRcp) {
this.tranIdRcp = tranIdRcp;
}
public String getRefNo() {
return refNo;
}
public void setRefNo(String refNo) {
this.refNo = refNo;
}
public BigDecimal getRcpAmount() {
return rcpAmount;
}
public void setRcpAmount(BigDecimal rcpAmount) {
this.rcpAmount = rcpAmount;
}
public BigDecimal getRefAmt() {
return refAmt;
}
public void setRefAmt(BigDecimal refAmt) {
this.refAmt = refAmt;
}
/*@Override
public String toString() {
return "\n>>>>>>>>>>>>>>>RemittBean<<<<<<<<<<<<<<<<<<<<<<<<<<\n"
+ "tranIdRcp[" + tranIdRcp + "] refNo [" + refNo + "]\n"
+ "rcpAmount["+ rcpAmount + "] refAmt [" + refAmt + "]\n"
+ ">>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n";
}*/
}
//Pavan Rane 20FEB20 end [Advance Receipt Customization(remittance form consideration)]
\ No newline at end of file
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