Skip to content

B
business-java
Commit 4a8e9210 authored by arawankar's avatar arawankar
Browse files
Options

Changes made in below components 

- MiscPayAutoIC.java
-Added setnodevalue method implementation

MiscPayAutoPrc.java
-Added unconfirmed payment error message

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@189918 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e7b8ad95
Show whitespace changes
Inline Side-by-side
Showing with 118 additions and 23 deletions
webitm-fin/ibase/webitm/ejb/fin/MiscPayAutoIC.java
View file @ 4a8e9210
...@@ -374,6 +374,7 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi ...@@ -374,6 +374,7 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi
Document domhr = null; Document domhr = null;
Document domAll = null; Document domAll = null;
String retString=""; String retString="";
//StringBuffer valueXmlString = null;
try try
{ {
System.out.println("************** Inside itemChanged method ****************"); System.out.println("************** Inside itemChanged method ****************");
...@@ -476,9 +477,13 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi ...@@ -476,9 +477,13 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi
if("itm_default".equalsIgnoreCase(currentColumn.trim())) if("itm_default".equalsIgnoreCase(currentColumn.trim()))
{ {
valueXmlString.append("<date__pay>").append("<![CDATA["+ sdf.format(date) +"]]>").append("</date__pay>"); valueXmlString.append("<date__pay>").append("<![CDATA["+ sdf.format(date) +"]]>").append("</date__pay>");
setNodeValue(dom, "date__pay", sdf.format(date));
valueXmlString.append("<date__fr>").append("<![CDATA["+ sdf.format(date) +"]]>").append("</date__fr>"); valueXmlString.append("<date__fr>").append("<![CDATA["+ sdf.format(date) +"]]>").append("</date__fr>");
setNodeValue(dom, "date__fr", sdf.format(date));
valueXmlString.append("<date__to>").append("<![CDATA["+ sdf.format(date) +"]]>").append("</date__to>"); valueXmlString.append("<date__to>").append("<![CDATA["+ sdf.format(date) +"]]>").append("</date__to>");
setNodeValue(dom, "date__to", sdf.format(date));
valueXmlString.append("<site_code__fr>").append("<![CDATA["+loginsiteCode+"]]>").append("</site_code__fr>"); valueXmlString.append("<site_code__fr>").append("<![CDATA["+loginsiteCode+"]]>").append("</site_code__fr>");
setNodeValue(dom, "site_code__fr", loginsiteCode);
valueXmlString.append("<site_code__to>").append("<![CDATA["+loginsiteCode+"]]>").append("</site_code__to>"); valueXmlString.append("<site_code__to>").append("<![CDATA["+loginsiteCode+"]]>").append("</site_code__to>");
setNodeValue(dom, "site_code__to", loginsiteCode); setNodeValue(dom, "site_code__to", loginsiteCode);
//itemChanged( dom, dom1, dom2, objContext, "site_code__fr", editFlag, xtraParams ,valueXmlString) ; //itemChanged( dom, dom1, dom2, objContext, "site_code__fr", editFlag, xtraParams ,valueXmlString) ;
...@@ -522,8 +527,8 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi ...@@ -522,8 +527,8 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
valueXmlString.append("<curr_code>").append("<![CDATA["+currCode+"]]>").append("</curr_code>"); valueXmlString.append("<curr_code>").append("<![CDATA["+currCodeTemp+"]]>").append("</curr_code>");
setNodeValue(dom, "curr_code",currCode); setNodeValue(dom, "curr_code", currCodeTemp);
//itemChanged(dom, dom1, dom2,objContext, "curr_code", editFlag, xtraParams,valueXmlString); //itemChanged(dom, dom1, dom2,objContext, "curr_code", editFlag, xtraParams,valueXmlString);
datePay = genericUtility.getColumnValue("date__pay", dom); datePay = genericUtility.getColumnValue("date__pay", dom);
...@@ -568,7 +573,7 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi ...@@ -568,7 +573,7 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi
pstmt = null; pstmt = null;
} }
valueXmlString.append("<curr_code>").append("<![CDATA["+currCodeTemp+"]]>").append("</curr_code>"); valueXmlString.append("<curr_code>").append("<![CDATA["+currCodeTemp+"]]>").append("</curr_code>");
setNodeValue(dom, "curr_code",currCodeTemp); setNodeValue(dom, "curr_code", currCodeTemp);
//itemChanged(dom, dom1, dom2,objContext, "curr_code", editFlag, xtraParams,valueXmlString); //itemChanged(dom, dom1, dom2,objContext, "curr_code", editFlag, xtraParams,valueXmlString);
sql = "select descr from site where site_code = ?"; sql = "select descr from site where site_code = ?";
...@@ -595,14 +600,17 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi ...@@ -595,14 +600,17 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi
maxRate = finCommon.getDailyExchRateSellBuy(currCodeTemp, "", siteCodeFr, datePay, "B",conn); maxRate = finCommon.getDailyExchRateSellBuy(currCodeTemp, "", siteCodeFr, datePay, "B",conn);
System.out.println("maxRate--["+maxRate+"]"); System.out.println("maxRate--["+maxRate+"]");
valueXmlString.append("<exch_rate>").append("<![CDATA["+maxRate+"]]>").append("</exch_rate>"); valueXmlString.append("<exch_rate>").append("<![CDATA["+maxRate+"]]>").append("</exch_rate>");
setNodeValue(dom, "exch_rate", maxRate+"");
if(currCode.equalsIgnoreCase(currCodeTemp)) if(currCode.equalsIgnoreCase(currCodeTemp))
{ {
valueXmlString.append("<exch_rate protect='1'>").append("<![CDATA["+"1"+"]]>").append("</exch_rate>"); valueXmlString.append("<exch_rate protect='1'>").append("<![CDATA["+"1"+"]]>").append("</exch_rate>");
setNodeValue(dom, "exch_rate", 1+"");
} }
else else
{ {
valueXmlString.append("<exch_rate protect='1'>").append("<![CDATA["+"0"+"]]>").append("</exch_rate>"); valueXmlString.append("<exch_rate protect='1'>").append("<![CDATA["+"0"+"]]>").append("</exch_rate>");
setNodeValue(dom, "exch_rate", 0+"");
} }
...@@ -626,6 +634,7 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi ...@@ -626,6 +634,7 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi
pstmt = null; pstmt = null;
} }
valueXmlString.append("<site_code_descr__fr>").append("<![CDATA["+siteDescr+"]]>").append("</site_code_descr__fr>"); valueXmlString.append("<site_code_descr__fr>").append("<![CDATA["+siteDescr+"]]>").append("</site_code_descr__fr>");
setNodeValue(dom, "site_code_descr__fr",siteDescr);
varValue = finCommon.getFinparams("999999", "SITE_CODE_MULTI", conn); varValue = finCommon.getFinparams("999999", "SITE_CODE_MULTI", conn);
if(varValue == null || varValue.trim().length() == 0 || varValue.equalsIgnoreCase("NULLFOUND")) if(varValue == null || varValue.trim().length() == 0 || varValue.equalsIgnoreCase("NULLFOUND"))
{ {
...@@ -634,11 +643,14 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi ...@@ -634,11 +643,14 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi
if("N".equalsIgnoreCase(varValue)) if("N".equalsIgnoreCase(varValue))
{ {
valueXmlString.append("<site_code__to protect='1'>").append("<![CDATA["+siteCodeFr+"]]>").append("</site_code__to>"); valueXmlString.append("<site_code__to protect='1'>").append("<![CDATA["+siteCodeFr+"]]>").append("</site_code__to>");
setNodeValue(dom, "site_code__to",siteCodeFr);
valueXmlString.append("<site_code_descr__to>").append("<![CDATA["+siteDescr+"]]>").append("</site_code_descr__to>"); valueXmlString.append("<site_code_descr__to>").append("<![CDATA["+siteDescr+"]]>").append("</site_code_descr__to>");
setNodeValue(dom, "site_code_descr__to",siteDescr);
} }
else else
{ {
valueXmlString.append("<site_code__to protect='0'>").append("<![CDATA["+""+"]]>").append("</site_code__to>"); valueXmlString.append("<site_code__to protect='0'>").append("<![CDATA["+""+"]]>").append("</site_code__to>");
setNodeValue(dom, "site_code__to","");
} }
...@@ -665,6 +677,7 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi ...@@ -665,6 +677,7 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi
pstmt = null; pstmt = null;
} }
valueXmlString.append("<site_code_descr__to>").append("<![CDATA["+siteCodeToDescr+"]]>").append("</site_code_descr__to>"); valueXmlString.append("<site_code_descr__to>").append("<![CDATA["+siteCodeToDescr+"]]>").append("</site_code_descr__to>");
setNodeValue(dom, "site_code_descr__to",siteCodeToDescr);
sql = "select descr from site where site_code = ?"; sql = "select descr from site where site_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -686,7 +699,9 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi ...@@ -686,7 +699,9 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi
pstmt = null; pstmt = null;
} }
valueXmlString.append("<site_code_descr__fr>").append("<![CDATA["+siteDescr+"]]>").append("</site_code_descr__fr>"); valueXmlString.append("<site_code_descr__fr>").append("<![CDATA["+siteDescr+"]]>").append("</site_code_descr__fr>");
setNodeValue(dom, "site_code_descr__fr",siteDescr);
valueXmlString.append("<site_code_descr__to>").append("<![CDATA["+siteDescr+"]]>").append("</site_code_descr__to>"); valueXmlString.append("<site_code_descr__to>").append("<![CDATA["+siteDescr+"]]>").append("</site_code_descr__to>");
setNodeValue(dom, "site_code_descr__to",siteDescr);
varValue = finCommon.getFinparams("999999", "SITE_CODE_MULTI", conn); varValue = finCommon.getFinparams("999999", "SITE_CODE_MULTI", conn);
if(varValue == null || varValue.trim().length() == 0 || varValue.equalsIgnoreCase("NULLFOUND")) if(varValue == null || varValue.trim().length() == 0 || varValue.equalsIgnoreCase("NULLFOUND"))
...@@ -696,10 +711,12 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi ...@@ -696,10 +711,12 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi
if(varValue.equalsIgnoreCase("N")) if(varValue.equalsIgnoreCase("N"))
{ {
valueXmlString.append("<site_code__to protect = '1'>").append("<![CDATA["+loginsiteCode+"]]>").append("</site_code__to>"); valueXmlString.append("<site_code__to protect = '1'>").append("<![CDATA["+loginsiteCode+"]]>").append("</site_code__to>");
setNodeValue(dom, "site_code__to",loginsiteCode);
} }
else else
{ {
valueXmlString.append("<site_code__to protect = '0'>").append("<![CDATA["+loginsiteCode+"]]>").append("</site_code__to>"); valueXmlString.append("<site_code__to protect = '0'>").append("<![CDATA["+loginsiteCode+"]]>").append("</site_code__to>");
setNodeValue(dom, "site_code__to",loginsiteCode);
} }
sql = "select A.bank_code ,B.bank_name from site A ,bank B where A.bank_code = B.bank_code AND A.site_code = ?"; sql = "select A.bank_code ,B.bank_name from site A ,bank B where A.bank_code = B.bank_code AND A.site_code = ?";
...@@ -723,8 +740,10 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi ...@@ -723,8 +740,10 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi
pstmt = null; pstmt = null;
} }
valueXmlString.append("<bank_code>").append("<![CDATA["+bankCode+"]]>").append("</bank_code>"); valueXmlString.append("<bank_code>").append("<![CDATA["+bankCode+"]]>").append("</bank_code>");
setNodeValue(dom, "bank_code",bankCode);
valueXmlString.append("<bank_name>").append("<![CDATA["+bankName+"]]>").append("</bank_name>"); valueXmlString.append("<bank_name>").append("<![CDATA["+bankName+"]]>").append("</bank_name>");
//itemChanged(dom, dom1, dom2,objContext, "bank_code", editFlag, xtraParams); setNodeValue(dom, "bank_name",bankName);
//itemChanged(dom, dom1, dom2,objContext, "bank_code", editFlag, xtraParams,valueXmlString);
tranType = finCommon.getFinparams("999999", "TRAN_TYPE_AUTO_PAY", conn); tranType = finCommon.getFinparams("999999", "TRAN_TYPE_AUTO_PAY", conn);
if(tranType == null || tranType.trim().length() == 0 || tranType.equalsIgnoreCase("NULLFOUND")) if(tranType == null || tranType.trim().length() == 0 || tranType.equalsIgnoreCase("NULLFOUND"))
...@@ -732,9 +751,13 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi ...@@ -732,9 +751,13 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi
tranType = "0"; tranType = "0";
} }
valueXmlString.append("<tran_type>").append("<![CDATA["+tranType+"]]>").append("</tran_type>"); valueXmlString.append("<tran_type>").append("<![CDATA["+tranType+"]]>").append("</tran_type>");
setNodeValue(dom, "tran_type",tranType);
valueXmlString.append("<pay_mode>").append("<![CDATA["+"%"+"]]>").append("</pay_mode>"); valueXmlString.append("<pay_mode>").append("<![CDATA["+"%"+"]]>").append("</pay_mode>");
setNodeValue(dom, "pay_mode","%");
valueXmlString.append("<post>").append("<![CDATA["+"N"+"]]>").append("</post>"); valueXmlString.append("<post>").append("<![CDATA["+"N"+"]]>").append("</post>");
setNodeValue(dom, "post","N");
valueXmlString.append("<chq_split>").append("<![CDATA["+"N"+"]]>").append("</chq_split>"); valueXmlString.append("<chq_split>").append("<![CDATA["+"N"+"]]>").append("</chq_split>");
setNodeValue(dom, "chq_split","N");
} }
if("bank_code".equalsIgnoreCase(currentColumn.trim())) if("bank_code".equalsIgnoreCase(currentColumn.trim()))
{ {
...@@ -827,7 +850,7 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi ...@@ -827,7 +850,7 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi
pstmt = null; pstmt = null;
} }
valueXmlString.append("<curr_code>").append("<![CDATA["+currCode+"]]>").append("</curr_code>"); valueXmlString.append("<curr_code>").append("<![CDATA["+currCode+"]]>").append("</curr_code>");
//itemChanged(dom, dom1, dom2,objContext, "curr_code", editFlag, xtraParams); //itemChanged(dom, dom1, dom2,objContext, "curr_code", editFlag, xtraParams,valueXmlString);
sql = "select descr from site where site_code = ?"; sql = "select descr from site where site_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -909,7 +932,7 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi ...@@ -909,7 +932,7 @@ public class MiscPayAutoIC extends ValidatorEJB implements MiscPayAutoICLocal,Mi
pstmt = null; pstmt = null;
} }
valueXmlString.append("<curr_code>").append("<![CDATA["+currCodeTemp+"]]>").append("</curr_code>"); valueXmlString.append("<curr_code>").append("<![CDATA["+currCodeTemp+"]]>").append("</curr_code>");
//itemChanged(dom, dom1, dom2,objContext, "curr_code", editFlag, xtraParams); //itemChanged(dom, dom1, dom2,objContext, "curr_code", editFlag, xtraParams,valueXmlString);
sql = "select descr from site where site_code = ?"; sql = "select descr from site where site_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
......
webitm-fin/ibase/webitm/ejb/fin/MiscPayAutoPrc.java
View file @ 4a8e9210
...@@ -70,6 +70,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -70,6 +70,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
if (xmlString2 != null && xmlString2.trim().length() != 0) if (xmlString2 != null && xmlString2.trim().length() != 0)
{ {
dom1 = genericUtility.parseString(xmlString2); dom1 = genericUtility.parseString(xmlString2);
} }
retString = getData(dom, dom1, windowName, xtraParams,conn); retString = getData(dom, dom1, windowName, xtraParams,conn);
...@@ -505,7 +506,6 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -505,7 +506,6 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
System.out.println("retStr---["+retStr+"]"); System.out.println("retStr---["+retStr+"]");
if(retStr == null || retStr.trim().length() == 0) if(retStr == null || retStr.trim().length() == 0)
{ {
errString = itmDBAccess.getErrorString( "", "VTFIN00001" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18 errString = itmDBAccess.getErrorString( "", "VTFIN00001" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18
return errString; return errString;
} }
...@@ -726,11 +726,11 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -726,11 +726,11 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
itmDBAccess = new ITMDBAccessEJB();// changes by Nandkumar Gadkari on 20/07/18 itmDBAccess = new ITMDBAccessEJB();// changes by Nandkumar Gadkari on 20/07/18
//Changes successLine and errorLine string by Varsha V on 06-08-18 //Changes successLine and errorLine string by Varsha V on 06-08-18
successLine = "Confirmed Transactions</br>"; successLine = "--- Confirmed Payments ---</br></br>";
//successLine = "-----------------Confirmed Transactions------------"; //successLine = "-----------------Confirmed Transactions------------";
succesString = successLine + succesString; succesString = successLine + succesString;
errorLine = "Payment Are Not Generated Due To Unconfirmed Payment Pending"; errorLine = "--- Unconfirmed Payments ---</br>";
//errorLine = "-----------------Unconfirmed Transactions------------"; //errorLine = "-----------------Unconfirmed Transactions------------";
errorString = errorLine + errorString; errorString = errorLine + errorString;
...@@ -912,9 +912,14 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -912,9 +912,14 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
ArrayList<String> payModeList = new ArrayList<String>( Arrays.asList( payModeArray) ); ArrayList<String> payModeList = new ArrayList<String>( Arrays.asList( payModeArray) );
parentNodeList = detailDom.getElementsByTagName("Detail2"); parentNodeList = detailDom.getElementsByTagName("Detail2");
//Added by Anjali R. on [27/06/2018][To validate the paymode][Start]
System.out.println("childNodeLength---["+parentNodeList.getLength()+"]"); System.out.println("childNodeLength---["+parentNodeList.getLength()+"]");
if(parentNodeList.getLength() <= 0)
{
errString = itmDBAccess.getErrorString( "", "VTFIN00004" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18
errString = getErrorXml(errString);
return errString;
}
//Added by Anjali R. on [27/06/2018][To validate the paymode][Start]
for(ctr = 0; ctr < parentNodeList.getLength(); ctr++) for(ctr = 0; ctr < parentNodeList.getLength(); ctr++)
{ {
parentNode = parentNodeList.item(ctr); parentNode = parentNodeList.item(ctr);
...@@ -1048,6 +1053,34 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -1048,6 +1053,34 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
String temp = genericUtility.getColumnValueFromNode("pay_amt", parentNode1); String temp = genericUtility.getColumnValueFromNode("pay_amt", parentNode1);
mPayAmt = temp!= null && temp.trim().length()>0 ?Double.parseDouble(temp):0.0; mPayAmt = temp!= null && temp.trim().length()>0 ?Double.parseDouble(temp):0.0;
mChequeNo = genericUtility.getColumnValueFromNode("cheque_no", parentNode1); mChequeNo = genericUtility.getColumnValueFromNode("cheque_no", parentNode1);
//Modified by Anjali R. on [27/08/2018][Start]
if(mPayAmt == 0.0 || netPayable == 0.0)
{
String errStr = "Payment amount can not be zero or greater then balance amount: Series("+mTranSer+") Voucher No ("+mVouchNo+")";
errString = getErrorXML("PAYMENT NOT GENERATED", errStr, "VTPAYANTZR", "", "E");
return errString;
}
else if (netPayable > 0 && (mPayAmt > netPayable || mPayAmt <= 0))
{
String errStr = "Payment amount can not be zero or greater then balance amount: Series("+mTranSer+") Voucher No ("+mVouchNo+")";
errString = getErrorXML("PAYMENT NOT GENERATED", errStr, "VTPAYANTZR", "", "E");
return errString;
}
else if (netPayable < 0 && (mPayAmt < netPayable || mPayAmt >= 0) )
{
String errStr = "Payment amount can not be zero or greater then balance amount: Series("+mTranSer+") Voucher No ("+mVouchNo+")";
errString = getErrorXML("PAYMENT NOT GENERATED", errStr, "VTPAYANTZR", "", "E");
return errString;
}
else if(mPayAmt + totUnconfAmt > netPayable)
{
String errStr = "Payment Are Not Generated Due To Unconfirmed Payment Pending </br> Voucher No :"+mVouchNo+""
+ "Pay Amount:"+mPayAmt +"</br>Unconfirm Pay Amount:"+totUnconfAmt+" </br> Net Payable Amount:"+netPayable;
errString = getErrorXML("PAYMENT NOT GENERATED", errStr, "VTPAYANTZR", "", "E");
return errString;
}
//Modified by Anjali R. on [27/08/2018][End]
//Added by Varsha V on 25-06-18 //Added by Varsha V on 25-06-18
try try
{ {
...@@ -1791,9 +1824,11 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -1791,9 +1824,11 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
{ {
succesString = succesString + "</br>Voucher No. " + miscPaymentTranID+"</br> Pay Amount:- "+payAmt+" Unconfirmed Pay Amount:- "+totUnconfAmt+" Net Payable Amount:- "+netPayable; succesString = succesString + "</br>Voucher No. " + miscPaymentTranID+"</br> Pay Amount:- "+payAmt+" Unconfirmed Pay Amount:- "+totUnconfAmt+" Net Payable Amount:- "+netPayable;
} }
}
confirmRetString = ""; confirmRetString = "";
confirmRetString = succesString + errorString; confirmRetString = succesString + errorString;
}
/*confirmRetString = "";
confirmRetString = succesString + errorString;*/
if("N".equalsIgnoreCase(autoPost)) if("N".equalsIgnoreCase(autoPost))
{ {
confirmRetString = ""; confirmRetString = "";
...@@ -1976,13 +2011,14 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -1976,13 +2011,14 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
utilMethods = new UtilMethods(); utilMethods = new UtilMethods();
itmDBAccess =new ITMDBAccessEJB();// changes by Nandkumar Gadkari on 20/07/18 itmDBAccess =new ITMDBAccessEJB();// changes by Nandkumar Gadkari on 20/07/18
//Changes successLine and errorLine string by Varsha V on 06-08-18 //Changes successLine and errorLine string by Varsha V on 06-08-18
successLine = "Confirmed Transactions</br>"; successLine = "--- Confirmed Payments ---</br></br>";
//successLine = "-----------------Confirmed Transactions------------";
succesString = successLine + succesString; succesString = successLine + succesString;
errorLine = "Payment Are Not Generated Due To Unconfirmed Payment Pending</br>"; errorLine = "--- Unconfirmed Payments ---</br>";
//errorLine = "-----------------Unconfirmed Transactions------------";
errorString = errorLine + errorString; errorString = errorLine + errorString;
xmlString = new StringBuffer("<?xml version = \"1.0\"?>"); xmlString = new StringBuffer("<?xml version = \"1.0\"?>");
xmlString.append("<DocumentRoot>"); xmlString.append("<DocumentRoot>");
xmlString.append("<description>").append("Datawindow Root").append("</description>"); xmlString.append("<description>").append("Datawindow Root").append("</description>");
...@@ -2162,8 +2198,14 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -2162,8 +2198,14 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
ArrayList<String> payModeList = new ArrayList<String>( Arrays.asList( payModeArray) ); ArrayList<String> payModeList = new ArrayList<String>( Arrays.asList( payModeArray) );
parentNodeList = detailDom.getElementsByTagName("Detail2"); parentNodeList = detailDom.getElementsByTagName("Detail2");
System.out.println("childNodeLength---["+parentNodeList.getLength()+"]"); System.out.println("childNodeLength---["+parentNodeList.getLength()+"]");
if(parentNodeList.getLength() <= 0)
{
errString = itmDBAccess.getErrorString( "", "VTFIN00004" , loginCode,"",conn);
errString = getErrorXml(errString);
return errString;
}
for(ctr = 0; ctr < parentNodeList.getLength(); ctr++) for(ctr = 0; ctr < parentNodeList.getLength(); ctr++)
{ {
parentNode = parentNodeList.item(ctr); parentNode = parentNodeList.item(ctr);
...@@ -2296,7 +2338,36 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -2296,7 +2338,36 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
String temp = genericUtility.getColumnValueFromNode("pay_amt", parentNode1); String temp = genericUtility.getColumnValueFromNode("pay_amt", parentNode1);
mPayAmt = temp!= null && temp.trim().length()>0 ?Double.parseDouble(temp):0.0; mPayAmt = temp!= null && temp.trim().length()>0 ?Double.parseDouble(temp):0.0;
mChequeNo = genericUtility.getColumnValueFromNode("cheque_no", parentNode1); mChequeNo = genericUtility.getColumnValueFromNode("cheque_no", parentNode1);
try {
//Modified by Anjali R. on [27/08/2018][Start]
if(mPayAmt == 0.0 || netPayable == 0.0)
{
String errStr = "Payment amount can not be zero or greater then balance amount: Series("+mTranSer+") Voucher No ("+mVouchNo+")";
errString = getErrorXML("PAYMENT NOT GENERATED", errStr, "VTPAYANTZR", "", "E");
return errString;
}
else if (netPayable > 0 && (mPayAmt > netPayable || mPayAmt <= 0))
{
String errStr = "Payment amount can not be zero or greater then balance amount: Series("+mTranSer+") Voucher No ("+mVouchNo+")";
errString = getErrorXML("PAYMENT NOT GENERATED", errStr, "VTPAYANTZR", "", "E");
return errString;
}
else if (netPayable < 0 && (mPayAmt < netPayable || mPayAmt >= 0) )
{
String errStr = "Payment amount can not be zero or greater then balance amount: Series("+mTranSer+") Voucher No ("+mVouchNo+")";
errString = getErrorXML("PAYMENT NOT GENERATED", errStr, "VTPAYANTZR", "", "E");
return errString;
}
else if(mPayAmt + totUnconfAmt > netPayable)
{
String errStr = "Payment Are Not Generated Due To Unconfirmed Payment Pending </br> Voucher No :"+mVouchNo+""
+ "Pay Amount:"+mPayAmt +"</br>Unconfirm Pay Amount:"+totUnconfAmt+" </br> Net Payable Amount:"+netPayable;
errString = getErrorXML("PAYMENT NOT GENERATED", errStr, "VTPAYANTZR", "", "P");
return errString;
}
//Modified by Anjali R. on [27/08/2018][End]
try
{
chequeNoInt = mChequeNo!= null && mChequeNo.trim().length()>0 ? Integer.parseInt(mChequeNo):0; chequeNoInt = mChequeNo!= null && mChequeNo.trim().length()>0 ? Integer.parseInt(mChequeNo):0;
} }
catch(Exception e) catch(Exception e)
...@@ -3391,7 +3462,8 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -3391,7 +3462,8 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
valueXmlErrorString.append("<error id=\"").append(errorId).append("\" type=\""+type+"\"").append(" column_name=\"description\"").append(">"); valueXmlErrorString.append("<error id=\"").append(errorId).append("\" type=\""+type+"\"").append(" column_name=\"description\"").append(">");
valueXmlErrorString.append("<message><![CDATA[").append(message).append("]]></message>\r\n"); //valueXmlErrorString.append("<message><![CDATA[").append(message).append("]]></message>\r\n");
valueXmlErrorString.append("<message><![CDATA[").append(message).append("]]></message>\r\n</br>");
valueXmlErrorString.append("<description><![CDATA[").append(messageValue).append("]]></description>\r\n"); valueXmlErrorString.append("<description><![CDATA[").append(messageValue).append("]]></description>\r\n");
valueXmlErrorString.append("<type>E</type>\r\n"); valueXmlErrorString.append("<type>E</type>\r\n");
valueXmlErrorString.append("<option></option>\r\n"); valueXmlErrorString.append("<option></option>\r\n");
...@@ -3589,7 +3661,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -3589,7 +3661,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
} }
else else
{ {
retXml = getErrorXML("", retXml, "", "","P"); retXml = getErrorXML("Message", retXml, "VTCONFTRAN", "","P");
} }
} }
......
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