Skip to content

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

MiscPayAutoPrc.java 

-Changes made in above component to resolve issue in automatic payment reported by QC.

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@190886 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d3a593c7
Hide whitespace changes
Inline Side-by-side
Showing with 207 additions and 42 deletions
webitm-fin/ibase/webitm/ejb/fin/MiscPayAutoPrc.java
View file @ c238399d
...@@ -176,6 +176,13 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -176,6 +176,13 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
{ {
mvouchTo = "z"; mvouchTo = "z";
} }
//Modified by Anjali R. on [01/09/2018][TO check paymode in case of blank][Start]
if(payMode == null || payMode.trim().length() == 0)
{
payMode = "%";
}
//Modified by Anjali R. on [01/09/2018][TO check paymode in case of blank][End]
if(sundryType == null || sundryType.trim().length() == 0) if(sundryType == null || sundryType.trim().length() == 0)
{ {
sundryType = "%"; sundryType = "%";
...@@ -513,7 +520,17 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -513,7 +520,17 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
{ {
System.out.println("retStr---["+retStr+"]"); System.out.println("retStr---["+retStr+"]");
//return getErrorXML("ALL CONFIRM AND UNCONFIRMED TRANSACTIONS", retStr, "VTUNCONF01", ""); //return getErrorXML("ALL CONFIRM AND UNCONFIRMED TRANSACTIONS", retStr, "VTUNCONF01", "");
return getErrorXml(retStr); //Modified by Anjali R. on [01/09/2018][Changes made to show confirm message from java component][Start]
//return getErrorXml(retStr);
if(retStr.indexOf("root") != -1 ||retStr.indexOf("Root") != -1)
{
return retStr;
}
else
{
return getErrorXml(retStr);
}
//Modified by Anjali R. on [01/09/2018][Changes made to show confirm message from java component][End]
} }
} }
catch(Exception e) catch(Exception e)
...@@ -816,14 +833,14 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -816,14 +833,14 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
{ {
//Bank code is not found in the master. //Bank code is not found in the master.
errString = itmDBAccess.getErrorString( "", "VMBANK0" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18 errString = itmDBAccess.getErrorString( "", "VMBANK0" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18
errString = getErrorXml(errString); //errString = getErrorXml(errString);//Commented by Anjali R. on[01/09/2018]
return errString; return errString;
} }
if(acctCodeBal == null || acctCodeBal.trim().length() == 0) if(acctCodeBal == null || acctCodeBal.trim().length() == 0)
{ {
//VMACCT //VMACCT
errString = itmDBAccess.getErrorString( "", "VMACCT" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18 errString = itmDBAccess.getErrorString( "", "VMACCT" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18
errString = getErrorXml(errString); //errString = getErrorXml(errString);//Commented by Anjali R. on[01/09/2018]
return errString; return errString;
} }
if(resultSet != null) if(resultSet != null)
...@@ -861,6 +878,17 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -861,6 +878,17 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
System.out.println("tranDate--["+tranDate+"]autoPost--["+autoPost+"]taxEnv--["+taxEnv+"]mExchRatePay--["+mExchRatePay+"]"); System.out.println("tranDate--["+tranDate+"]autoPost--["+autoPost+"]taxEnv--["+taxEnv+"]mExchRatePay--["+mExchRatePay+"]");
//Modified by Anjali R. on [01/09/2018][If specific paymoode has been selected then paymode set as paymode + "%" to remove percentage sign from paymode][Start]
String payModeHeader = genericUtility.getColumnValue("pay_mode", headerDom,"1","");
System.out.println("payModeHeader--["+payModeHeader+"]");
System.out.println("payModeHeader length--["+payModeHeader.length()+"]");
if(payModeHeader.indexOf("%") != -1 && payModeHeader.trim().length() > 1)
{
payModeHeader = payModeHeader.substring(0,payModeHeader.length()-1);
System.out.println("payModeHeader---after substring["+payModeHeader+"]");
}
//Modified by Anjali R. on [01/09/2018][If specific paymoode has been selected then paymode set as paymode + "%" to remove percentage sign from paymode][End]
headerBuff = new StringBuffer(); headerBuff = new StringBuffer();
headerBuff.append("<Detail1 dbID=\"\" domID=\"1\" objName=\"misc_pay\" objContext=\"1\">"); headerBuff.append("<Detail1 dbID=\"\" domID=\"1\" objName=\"misc_pay\" objContext=\"1\">");
headerBuff.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>"); headerBuff.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>");
...@@ -894,7 +922,10 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -894,7 +922,10 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
headerBuff.append("<bank_name>").append("<![CDATA[" + genericUtility.getColumnValue("bank_name", headerDom,"1","") + "]]>").append("</bank_name>"); headerBuff.append("<bank_name>").append("<![CDATA[" + genericUtility.getColumnValue("bank_name", headerDom,"1","") + "]]>").append("</bank_name>");
headerBuff.append("<sundry_type>").append("<![CDATA[" + genericUtility.getColumnValue("sundry_type", headerDom,"1","") + "]]>").append("</sundry_type>"); headerBuff.append("<sundry_type>").append("<![CDATA[" + genericUtility.getColumnValue("sundry_type", headerDom,"1","") + "]]>").append("</sundry_type>");
headerBuff.append("<sundry_code>").append("<![CDATA[" + genericUtility.getColumnValue("sundry_code", headerDom,"1","") + "]]>").append("</sundry_code>"); headerBuff.append("<sundry_code>").append("<![CDATA[" + genericUtility.getColumnValue("sundry_code", headerDom,"1","") + "]]>").append("</sundry_code>");
headerBuff.append("<pay_mode>").append("<![CDATA[" + genericUtility.getColumnValue("pay_mode", headerDom,"1","") + "]]>").append("</pay_mode>"); //Commented by Anjali R. on[01/09/2018][If Paymode is with percentage sign then set paymode only][Start]
//headerBuff.append("<pay_mode>").append("<![CDATA[" + genericUtility.getColumnValue("pay_mode", headerDom,"1","") + "]]>").append("</pay_mode>");
headerBuff.append("<pay_mode>").append("<![CDATA[" + payModeHeader+ "]]>").append("</pay_mode>");
//Commented by Anjali R. on[01/09/2018][If Paymode is with percentage sign then set paymode only][End]
headerBuff.append("<entry_batch_no>").append("<![CDATA[" + genericUtility.getColumnValue("entry_batch_no", headerDom,"1","") + "]]>").append("</entry_batch_no>"); headerBuff.append("<entry_batch_no>").append("<![CDATA[" + genericUtility.getColumnValue("entry_batch_no", headerDom,"1","") + "]]>").append("</entry_batch_no>");
headerBuff.append("<chq_split>").append("<![CDATA[" + genericUtility.getColumnValue("chq_split", headerDom,"1","") + "]]>").append("</chq_split>"); headerBuff.append("<chq_split>").append("<![CDATA[" + genericUtility.getColumnValue("chq_split", headerDom,"1","") + "]]>").append("</chq_split>");
headerBuff.append("<bank_code__add>").append("<![CDATA[" + genericUtility.getColumnValue("bank_code__add", headerDom,"1","") + "]]>").append("</bank_code__add>"); headerBuff.append("<bank_code__add>").append("<![CDATA[" + genericUtility.getColumnValue("bank_code__add", headerDom,"1","") + "]]>").append("</bank_code__add>");
...@@ -916,7 +947,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -916,7 +947,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
if(parentNodeList.getLength() <= 0) if(parentNodeList.getLength() <= 0)
{ {
errString = itmDBAccess.getErrorString( "", "VTFIN00004" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18 errString = itmDBAccess.getErrorString( "", "VTFIN00004" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18
errString = getErrorXml(errString); //errString = getErrorXml(errString);//Commented by Anjali R. on[01/09/2018]
return errString; return errString;
} }
//Added by Anjali R. on [27/06/2018][To validate the paymode][Start] //Added by Anjali R. on [27/06/2018][To validate the paymode][Start]
...@@ -933,14 +964,14 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -933,14 +964,14 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
else if(payMode == null || payMode.trim().length() == 0) else if(payMode == null || payMode.trim().length() == 0)
{ {
errString = itmDBAccess.getErrorString( "pay_mode", "VTFIN00002" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18 errString = itmDBAccess.getErrorString( "pay_mode", "VTFIN00002" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18
errString = getErrorXml(errString); //errString = getErrorXml(errString);//Commented by Anjali R. on[01/09/2018]
return errString; return errString;
} }
else else
{ {
System.out.println("return paymode"); System.out.println("return paymode");
errString = itmDBAccess.getErrorString( "pay_mode", "VTFIN00003" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18 errString = itmDBAccess.getErrorString( "pay_mode", "VTFIN00003" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18
errString = getErrorXml(errString); //errString = getErrorXml(errString);//Commented by Anjali R. on[01/09/2018]
return errString; return errString;
} }
} }
...@@ -1055,29 +1086,34 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -1055,29 +1086,34 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
mChequeNo = genericUtility.getColumnValueFromNode("cheque_no", parentNode1); mChequeNo = genericUtility.getColumnValueFromNode("cheque_no", parentNode1);
//Modified by Anjali R. on [27/08/2018][Start] //Modified by Anjali R. on [27/08/2018][Start]
if(mPayAmt == 0.0 || netPayable == 0.0) 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+")"; 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"); //Modified by Anjali R. on[]
//errString = getErrorXML("PAYMENT NOT GENERATED", errStr, "VTPAYANTZR", "", "E");
errString = getErrorMessage("PAYMENT NOT GENERATED", errStr, "VTPAYANTZR", "", "E");
return errString; return errString;
} }
else if (netPayable > 0 && (mPayAmt > netPayable || mPayAmt <= 0)) 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+")"; 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"); //errString = getErrorXML("PAYMENT NOT GENERATED", errStr, "VTPAYANTZR", "", "E");
errString = getErrorMessage("PAYMENT NOT GENERATED", errStr, "VTPAYANTZR", "", "E");
return errString; return errString;
} }
else if (netPayable < 0 && (mPayAmt < netPayable || mPayAmt >= 0) ) 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+")"; 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"); //errString = getErrorXML("PAYMENT NOT GENERATED", errStr, "VTPAYANTZR", "", "E");
errString = getErrorMessage("PAYMENT NOT GENERATED", errStr, "VTPAYANTZR", "", "E");
return errString; return errString;
} }
else if(mPayAmt + totUnconfAmt > netPayable) else if(mPayAmt + totUnconfAmt > netPayable)
{ {
String errStr = "Payment Are Not Generated Due To Unconfirmed Payment Pending </br> Voucher No :"+mVouchNo+"" 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; + "Pay Amount:"+mPayAmt +"</br>Unconfirm Pay Amount:"+totUnconfAmt+" </br> Net Payable Amount:"+netPayable;
errString = getErrorXML("PAYMENT NOT GENERATED", errStr, "VTPAYANTZR", "", "E"); //errString = getErrorXML("PAYMENT NOT GENERATED", errStr, "VTPAYANTZR", "", "E");
errString = getErrorMessage("PAYMENT NOT GENERATED", errStr, "VTPAYANTZR", "", "E");
return errString; return errString;
} }
//Modified by Anjali R. on [27/08/2018][End] //Modified by Anjali R. on [27/08/2018][End]
...@@ -1261,7 +1297,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -1261,7 +1297,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
{ {
//The currency in which you want to make the payment is not the same on voucher. //The currency in which you want to make the payment is not the same on voucher.
errString = itmDBAccess.getErrorString( "", "VTPAYM4" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18 errString = itmDBAccess.getErrorString( "", "VTPAYM4" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18
errString = getErrorXml(errString); //errString = getErrorXml(errString);
return errString; return errString;
} }
...@@ -1456,7 +1492,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -1456,7 +1492,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
if(mRefNoUpto != null && mRefNoUpto.trim().length() > 0 && Integer.parseInt(mRefNo) > Integer.parseInt(mRefNoUpto)) if(mRefNoUpto != null && mRefNoUpto.trim().length() > 0 && Integer.parseInt(mRefNo) > Integer.parseInt(mRefNoUpto))
{ {
errString = itmDBAccess.getErrorString( "", "VTPAYM7" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18 errString = itmDBAccess.getErrorString( "", "VTPAYM7" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18
errString = getErrorXml(errString); //errString = getErrorXml(errString);
return errString; return errString;
} }
} }
...@@ -1753,7 +1789,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -1753,7 +1789,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
{ {
String errCode = errList.get(1); String errCode = errList.get(1);
errString = itmDBAccess.getErrorString( "", errCode , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18 errString = itmDBAccess.getErrorString( "", errCode , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18
errString = getErrorXml(errString); //errString = getErrorXml(errString);
return errString; return errString;
} }
...@@ -1826,6 +1862,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -1826,6 +1862,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
} }
confirmRetString = ""; confirmRetString = "";
confirmRetString = succesString + errorString; confirmRetString = succesString + errorString;
confirmRetString = getErrorMessage("", confirmRetString, "VTTRANCONF", "", "P");
} }
/*confirmRetString = ""; /*confirmRetString = "";
confirmRetString = succesString + errorString;*/ confirmRetString = succesString + errorString;*/
...@@ -2101,14 +2138,14 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -2101,14 +2138,14 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
{ {
//Bank code is not found in the master. //Bank code is not found in the master.
errString = itmDBAccess.getErrorString( "", "VMBANK0" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18 errString = itmDBAccess.getErrorString( "", "VMBANK0" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18
errString = getErrorXml(errString); //errString = getErrorXml(errString);
return errString; return errString;
} }
if(acctCodeBal == null || acctCodeBal.trim().length() == 0) if(acctCodeBal == null || acctCodeBal.trim().length() == 0)
{ {
//VMACCT //VMACCT
errString = itmDBAccess.getErrorString( "", "VMACCT" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18 errString = itmDBAccess.getErrorString( "", "VMACCT" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18
errString = getErrorXml(errString); //errString = getErrorXml(errString);
return errString; return errString;
} }
if(resultSet != null) if(resultSet != null)
...@@ -2125,7 +2162,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -2125,7 +2162,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
{ {
//VMACCT--Entered account not defined in accounts master //VMACCT--Entered account not defined in accounts master
errString = itmDBAccess.getErrorString( "", "VMACCT" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18 errString = itmDBAccess.getErrorString( "", "VMACCT" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18
errString = getErrorXml(errString); //errString = getErrorXml(errString);
return errString; return errString;
} }
if(acctCodeCfAp == null || acctCodeCfAp.trim().length() == 0) if(acctCodeCfAp == null || acctCodeCfAp.trim().length() == 0)
...@@ -2203,7 +2240,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -2203,7 +2240,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
if(parentNodeList.getLength() <= 0) if(parentNodeList.getLength() <= 0)
{ {
errString = itmDBAccess.getErrorString( "", "VTFIN00004" , loginCode,"",conn); errString = itmDBAccess.getErrorString( "", "VTFIN00004" , loginCode,"",conn);
errString = getErrorXml(errString); //errString = getErrorXml(errString);
return errString; return errString;
} }
for(ctr = 0; ctr < parentNodeList.getLength(); ctr++) for(ctr = 0; ctr < parentNodeList.getLength(); ctr++)
...@@ -2219,14 +2256,14 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -2219,14 +2256,14 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
else if(payMode == null || payMode.trim().length() == 0) else if(payMode == null || payMode.trim().length() == 0)
{ {
errString = itmDBAccess.getErrorString( "pay_mode", "VTFIN00002" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18 errString = itmDBAccess.getErrorString( "pay_mode", "VTFIN00002" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18
errString = getErrorXml(errString); //errString = getErrorXml(errString);
return errString; return errString;
} }
else else
{ {
System.out.println("return paymode"); System.out.println("return paymode");
errString = itmDBAccess.getErrorString( "pay_mode", "VTFIN00003" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18 errString = itmDBAccess.getErrorString( "pay_mode", "VTFIN00003" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18
errString = getErrorXml(errString); //errString = getErrorXml(errString);
return errString; return errString;
} }
} }
...@@ -2270,6 +2307,10 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -2270,6 +2307,10 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
mSundryType = genericUtility.getColumnValueFromNode("sundry_type", parentNode); mSundryType = genericUtility.getColumnValueFromNode("sundry_type", parentNode);
System.out.println("mSundryType--["+mSundryType+"]"); System.out.println("mSundryType--["+mSundryType+"]");
//Modified by Anjali R. on[To make sundry code wise payment][Start]
mSundryCode = genericUtility.getColumnValueFromNode("sundry_code", parentNode);
System.out.println("sundry_code--["+mSundryCode+"]");
//if(alreadyExist.contains(mSundryType) && (!"Q".equalsIgnoreCase(tempPayMode) && !"D".equalsIgnoreCase(tempPayMode))) //if(alreadyExist.contains(mSundryType) && (!"Q".equalsIgnoreCase(tempPayMode) && !"D".equalsIgnoreCase(tempPayMode)))
if(alreadyExist.contains(mSundryType) ) if(alreadyExist.contains(mSundryType) )
{ {
...@@ -2340,29 +2381,29 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -2340,29 +2381,29 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
mChequeNo = genericUtility.getColumnValueFromNode("cheque_no", parentNode1); mChequeNo = genericUtility.getColumnValueFromNode("cheque_no", parentNode1);
//Modified by Anjali R. on [27/08/2018][Start] //Modified by Anjali R. on [27/08/2018][Start]
if(mPayAmt == 0.0 || netPayable == 0.0) 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+")"; 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"); //errString = getErrorXML("PAYMENT NOT GENERATED", errStr, "VTPAYANTZR", "", "E");
return errString; return errString;
} }
else if (netPayable > 0 && (mPayAmt > netPayable || mPayAmt <= 0)) 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+")"; 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"); //errString = getErrorXML("PAYMENT NOT GENERATED", errStr, "VTPAYANTZR", "", "E");
return errString; return errString;
} }
else if (netPayable < 0 && (mPayAmt < netPayable || mPayAmt >= 0) ) 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+")"; 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"); //errString = getErrorXML("PAYMENT NOT GENERATED", errStr, "VTPAYANTZR", "", "E");
return errString; return errString;
} }
else if(mPayAmt + totUnconfAmt > netPayable) else if(mPayAmt + totUnconfAmt > netPayable)
{ {
String errStr = "Payment Are Not Generated Due To Unconfirmed Payment Pending </br> Voucher No :"+mVouchNo+"" 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; + "Pay Amount:"+mPayAmt +"</br>Unconfirm Pay Amount:"+totUnconfAmt+" </br> Net Payable Amount:"+netPayable;
errString = getErrorXML("PAYMENT NOT GENERATED", errStr, "VTPAYANTZR", "", "P"); //errString = getErrorXML("PAYMENT NOT GENERATED", errStr, "VTPAYANTZR", "", "P");
return errString; return errString;
} }
//Modified by Anjali R. on [27/08/2018][End] //Modified by Anjali R. on [27/08/2018][End]
...@@ -2541,7 +2582,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -2541,7 +2582,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
{ {
//The currency in which you want to make the payment is not the same on voucher. //The currency in which you want to make the payment is not the same on voucher.
errString = itmDBAccess.getErrorString( "", "VTPAYM4" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18 errString = itmDBAccess.getErrorString( "", "VTPAYM4" , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18
errString = getErrorXml(errString); //errString = getErrorXml(errString);
return errString; return errString;
} }
...@@ -3036,7 +3077,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -3036,7 +3077,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
{ {
String errCode = errList.get(1); String errCode = errList.get(1);
errString = itmDBAccess.getErrorString( "", errCode , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18 errString = itmDBAccess.getErrorString( "", errCode , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18
errString = getErrorXml(errString); //errString = getErrorXml(errString);
return errString; return errString;
} }
System.out.println("miscPaymentTranID--["+miscPaymentTranID+"]"); System.out.println("miscPaymentTranID--["+miscPaymentTranID+"]");
...@@ -3160,7 +3201,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -3160,7 +3201,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
String errCode = errList.get(1); String errCode = errList.get(1);
System.out.println("errCode----["+errCode+"]"); System.out.println("errCode----["+errCode+"]");
errString = itmDBAccess.getErrorString( "", errCode , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18 errString = itmDBAccess.getErrorString( "", errCode , loginCode,"",conn);// changes by Nandkumar Gadkari on 20/07/18
errString = getErrorXml(errString); //errString = getErrorXml(errString);
return errString; return errString;
} }
System.out.println("miscPaymentTranID--["+miscPaymentTranID+"]"); System.out.println("miscPaymentTranID--["+miscPaymentTranID+"]");
...@@ -3450,7 +3491,40 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -3450,7 +3491,40 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
} }
return retString; return retString;
} }
public String getErrorMessage(String message,String messageValue,String errorId, String traceInfo ,String type) throws RemoteException,ITMException
{
System.out.println("getErrorXML..........");
String errString = "";
try
{
errString = "";
StringBuffer valueXmlErrorString = new StringBuffer("<Errors>\r\n ");
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("<description><![CDATA[").append(messageValue).append("]]></description>\r\n");
valueXmlErrorString.append("<type>E</type>\r\n");
valueXmlErrorString.append("<option></option>\r\n");
valueXmlErrorString.append("<time></time>\r\n");
valueXmlErrorString.append("<alarm></alarm>\r\n");
valueXmlErrorString.append("<source></source>\r\n");
valueXmlErrorString.append("<trace>Error : "+traceInfo+" </trace>\r\n");
valueXmlErrorString.append("<redirect>1</redirect>\r\n");
valueXmlErrorString.append("</error>\r\n");
valueXmlErrorString.append("</Errors>\r\n");
System.out.println( "\n****valueXmlErrorString :" + valueXmlErrorString.toString() + ":********" );
errString =valueXmlErrorString.toString();
System.out.println("Modified error string"+errString);
}
catch (Exception ex)
{
ex.printStackTrace();
}
return errString;
}
public String getErrorXML(String message,String messageValue,String errorId, String traceInfo ,String type) throws RemoteException,ITMException public String getErrorXML(String message,String messageValue,String errorId, String traceInfo ,String type) throws RemoteException,ITMException
{ {
System.out.println("getErrorXML.........."); System.out.println("getErrorXML..........");
...@@ -3458,12 +3532,9 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -3458,12 +3532,9 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
try try
{ {
errString = ""; errString = "";
StringBuffer valueXmlErrorString = new StringBuffer( "<?xml version=\"1.0\"?>\r\n<Root>\r\n<Header>\r\n<Errors>\r\n" ); StringBuffer valueXmlErrorString = new StringBuffer( "<?xml version=\"1.0\"?>\r\n<root>\r\n<Errors>\r\n" );
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");
...@@ -3474,8 +3545,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -3474,8 +3545,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
valueXmlErrorString.append("<redirect>1</redirect>\r\n"); valueXmlErrorString.append("<redirect>1</redirect>\r\n");
valueXmlErrorString.append("</error>\r\n"); valueXmlErrorString.append("</error>\r\n");
valueXmlErrorString.append("</Errors>\r\n"); valueXmlErrorString.append("</Errors>\r\n");
valueXmlErrorString.append("</Header>\r\n"); valueXmlErrorString.append( "</root>\r\n" );
valueXmlErrorString.append( "</Root>\r\n" );
System.out.println( "\n****valueXmlErrorString :" + valueXmlErrorString.toString() + ":********" ); System.out.println( "\n****valueXmlErrorString :" + valueXmlErrorString.toString() + ":********" );
errString =valueXmlErrorString.toString(); errString =valueXmlErrorString.toString();
...@@ -3544,6 +3614,10 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -3544,6 +3614,10 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
{ {
expr = xpath.compile("//Detail2 [sundry_type = '"+ name +"']"); expr = xpath.compile("//Detail2 [sundry_type = '"+ name +"']");
} }
else if("SC".equalsIgnoreCase(columnName))
{
expr = xpath.compile("//Detail2 [sundry_code = '"+ name +"']");
}
System.out.println("expr ==>["+ expr +"]"); System.out.println("expr ==>["+ expr +"]");
Object result = expr.evaluate(doc, XPathConstants.NODESET); Object result = expr.evaluate(doc, XPathConstants.NODESET);
nodes = (NodeList) result; nodes = (NodeList) result;
...@@ -3619,17 +3693,19 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -3619,17 +3693,19 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
int ctr=0; int ctr=0;
try try
{ {
genericUtility = new E12GenericUtility();
if(retXml.indexOf("<root>") != -1 || retXml.indexOf("<Root>") != -1 ) if(retXml.indexOf("<root>") != -1 || retXml.indexOf("<Root>") != -1 )
{ {
System.out.println("Inside root condition......"); System.out.println("Inside root condition......");
genericUtility = new E12GenericUtility();
Document errDom = genericUtility.parseString(retXml); Document errDom = genericUtility.parseString(retXml);
parentNodeList = errDom.getElementsByTagName("root"); parentNodeList = errDom.getElementsByTagName("Errors");
System.out.println("parentNodeList--["+parentNodeList.getLength()+"]");
parentNode = parentNodeList.item(0); parentNode = parentNodeList.item(0);
childNodeList = parentNode.getChildNodes(); childNodeList = parentNode.getChildNodes();
childNodeLength = childNodeList.getLength(); childNodeLength = childNodeList.getLength();
System.out.println("childNodeLength--["+childNodeLength+"]");
for(ctr = 0; ctr < childNodeLength; ctr++) for(ctr = 0; ctr < childNodeLength; ctr++)
{ {
childNode = childNodeList.item(ctr); childNode = childNodeList.item(ctr);
...@@ -3638,6 +3714,8 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -3638,6 +3714,8 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
{ {
errId = childNode.getAttributes().getNamedItem("id").getNodeValue(); errId = childNode.getAttributes().getNamedItem("id").getNodeValue();
System.out.println("Error code -----["+ errId +"]"); System.out.println("Error code -----["+ errId +"]");
msgType = childNode.getAttributes().getNamedItem("type").getNodeValue();
System.out.println("msgType--["+msgType+"]");
} }
else if("message".equalsIgnoreCase(childNodeName)) else if("message".equalsIgnoreCase(childNodeName))
{ {
...@@ -3651,17 +3729,104 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -3651,17 +3729,104 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
} }
else if("error".equalsIgnoreCase(childNodeName)) else if("error".equalsIgnoreCase(childNodeName))
{ {
msgType = childNode.getAttributes().getNamedItem("type").getNodeValue();
System.out.println("msgType--["+msgType+"]");
} }
}
parentNodeList = errDom.getElementsByTagName("error");
System.out.println("parentNodeList--["+parentNodeList.getLength()+"]");
parentNode = parentNodeList.item(0);
childNodeList = parentNode.getChildNodes();
childNodeLength = childNodeList.getLength();
System.out.println("childNodeLength--["+childNodeLength+"]");
for(ctr = 0; ctr < childNodeLength; ctr++)
{
childNode = childNodeList.item(ctr);
childNodeName = childNode.getNodeName();
if("message".equalsIgnoreCase(childNodeName))
{
message = genericUtility.getColumnValue("message", errDom);
System.out.println("message--["+message+"]");
}
else if("description".equalsIgnoreCase(childNodeName))
{
description = genericUtility.getColumnValue("description", errDom);
System.out.println("description--["+description+"]");
}
else if("error".equalsIgnoreCase(childNodeName))
{
}
} }
retXml = getErrorXML(message, description, errId, "",msgType); retXml = getErrorXML(message, description, errId, "",msgType);
System.out.println("retXml----[" + retXml + "]"); System.out.println("retXml----[" + retXml + "]");
} }
else else
{ {
retXml = getErrorXML("Message", retXml, "VTCONFTRAN", "","P"); System.out.println("Inside root condition......");
Document errDom = genericUtility.parseString(retXml);
parentNodeList = errDom.getElementsByTagName("Errors");
System.out.println("parentNodeList--["+parentNodeList.getLength()+"]");
parentNode = parentNodeList.item(0);
childNodeList = parentNode.getChildNodes();
childNodeLength = childNodeList.getLength();
System.out.println("childNodeLength--["+childNodeLength+"]");
for(ctr = 0; ctr < childNodeLength; ctr++)
{
childNode = childNodeList.item(ctr);
childNodeName = childNode.getNodeName();
if("error".equalsIgnoreCase(childNodeName))
{
errId = childNode.getAttributes().getNamedItem("id").getNodeValue();
System.out.println("Error code -----["+ errId +"]");
msgType = childNode.getAttributes().getNamedItem("type").getNodeValue();
System.out.println("msgType--["+msgType+"]");
}
else if("message".equalsIgnoreCase(childNodeName))
{
message = genericUtility.getColumnValue("message", errDom);
System.out.println("message--["+message+"]");
}
else if("description".equalsIgnoreCase(childNodeName))
{
description = genericUtility.getColumnValue("description", errDom);
System.out.println("description--["+description+"]");
}
else if("error".equalsIgnoreCase(childNodeName))
{
}
}
parentNodeList = errDom.getElementsByTagName("error");
System.out.println("parentNodeList--["+parentNodeList.getLength()+"]");
parentNode = parentNodeList.item(0);
childNodeList = parentNode.getChildNodes();
childNodeLength = childNodeList.getLength();
System.out.println("childNodeLength--["+childNodeLength+"]");
for(ctr = 0; ctr < childNodeLength; ctr++)
{
childNode = childNodeList.item(ctr);
childNodeName = childNode.getNodeName();
if("message".equalsIgnoreCase(childNodeName))
{
message = genericUtility.getColumnValue("message", errDom);
System.out.println("message--["+message+"]");
}
else if("description".equalsIgnoreCase(childNodeName))
{
description = genericUtility.getColumnValue("description", errDom);
System.out.println("description--["+description+"]");
}
else if("error".equalsIgnoreCase(childNodeName))
{
}
}
retXml = getErrorXML(message, description, errId, "",msgType);
System.out.println("retXml----[" + retXml + "]");
} }
} }
......
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