Skip to content

B
business-java
Commit 9fa1e3a1 authored by ngadkari's avatar ngadkari
Browse files
Options

changes in method reverted 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@203614 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b7e91648
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 71 deletions
webitm-fin/ibase/webitm/ejb/fin/MiscPayAutoPrc.java
View file @ 9fa1e3a1
......@@ -758,8 +758,6 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
double payAmt = 0.0, netPayable = 0.0, totUnconfAmt = 0.0;
//Ended by Varsha V on 06-08-18 for declaring variable outside try
ArrayList<String> alreadyExist = null;
String finEntity="", loginSite="",currCodeBC="";// // ADDED BY NANDKUMAR GADKARI ON 13/07/19
double exchRateBC=0;
try
{
genericUtility = new E12GenericUtility();
......@@ -783,7 +781,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
xmlString.append("<group0>");
xmlString.append("<description>").append("Group0 description").append("</description>");
xmlString.append("<Header0>");
xmlString.append("<objName><![CDATA[").append("misc_pay_ap").append("]]></objName>");// obj_name change by nandkumar gadkari on 13/07/19
xmlString.append("<objName><![CDATA[").append("misc_pay").append("]]></objName>");
xmlString.append("<pageContext><![CDATA[").append("1").append("]]></pageContext>");
xmlString.append("<objContext><![CDATA[").append("1").append("]]></objContext>");
xmlString.append("<editFlag><![CDATA[").append("A").append("]]></editFlag>");
......@@ -914,44 +912,14 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
System.out.println("payModeHeader---after substring["+payModeHeader+"]");
}
//Modified by Anjali R. on [01/09/2018][If specific paymode has been selected then paymode set as paymode + "%" to remove percentage sign from paymode][End]
// ADDED BY NANDKUMAR GADKARI ON 13/07/19
loginSite = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
sql = "select fin_entity from site where site_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, loginSite);
resultSet = pstmt.executeQuery();
if(resultSet.next())
{
finEntity = resultSet.getString("fin_entity");
}
resultSet.close();
resultSet = null;
pstmt.close();
pstmt = null;
sql = "select CURR_CODE from bank where bank_code= ?" ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, mBankCode);
resultSet = pstmt.executeQuery();
if(resultSet.next())
{
currCodeBC = resultSet.getString(1);
}
resultSet.close();
resultSet = null;
pstmt.close();
pstmt = null;
exchRateBC=finCommon.getDailyExchRateSellBuy(currCodeBC, "", loginSite, tranDate, "B",conn);
headerBuff = new StringBuffer();
headerBuff.append("<Detail1 dbID=\"\" domID=\"1\" objName=\"misc_pay_ap\" objContext=\"1\">");// obj_name change by nandkumar gadkari on 13/07/19
headerBuff.append("<Detail1 dbID=\"\" domID=\"1\" objName=\"misc_pay\" objContext=\"1\">");
headerBuff.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>");
headerBuff.append("<tran_id>").append("<![CDATA[]]>").append("</tran_id>");
headerBuff.append("<tran_date>").append("<![CDATA[" + tranDate + "]]>").append("</tran_date>");// ADDED BY NANDKUMAR GADKARI ON 13/07/19
headerBuff.append("<tran_type>").append("<![CDATA[" + tranType + "]]>").append("</tran_type>");
headerBuff.append("<ref_no>").append("<![CDATA[" + mRefNo + "]]>").append("</ref_no>");
headerBuff.append("<ref_no__upto>").append("<![CDATA[" + mRefNoUpto + "]]>").append("</ref_no__upto>");
headerBuff.append("<ref_date>").append("<![CDATA[" + tranDate + "]]>").append("</ref_date>");// ADDED BY NANDKUMAR GADKARI ON 13/07/19
headerBuff.append("<bank_code>").append("<![CDATA[" + mBankCode + "]]>").append("</bank_code>");
headerBuff.append("<noof_confirmed>").append("<![CDATA[0]]>").append("</noof_confirmed>");
headerBuff.append("<noof_rejected>").append("<![CDATA[0]]>").append("</noof_rejected>");
......@@ -973,22 +941,11 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
headerBuff.append("<post>").append("<![CDATA[" + autoPost + "]]>").append("</post>");
headerBuff.append("<tax_env>").append("<![CDATA[" + taxEnv + "]]>").append("</tax_env>");
headerBuff.append("<exch_rate>").append("<![CDATA[" + mExchRatePay + "]]>").append("</exch_rate>");
/*headerBuff.append("<site_code__fr>").append("<![CDATA[" + genericUtility.getColumnValue("site_code__fr", headerDom,"1","") + "]]>").append("</site_code__fr>");
headerBuff.append("<site_code__to>").append("<![CDATA[" + genericUtility.getColumnValue("site_code__to", headerDom,"1","") + "]]>").append("</site_code__to>");*/// commented by nandkumar gadkari on 13/07/19
headerBuff.append("<curr_code__bc>").append("<![CDATA[" + currCodeBC + "]]>").append("</curr_code__bc>");
headerBuff.append("<exch_rate__bc>").append("<![CDATA[" + exchRateBC + "]]>").append("</exch_rate__bc>");
headerBuff.append("<site_code>").append("<![CDATA[" + loginSite + "]]>").append("</site_code>");//// ADDED BY NANDKUMAR GADKARI ON 13/07/19
headerBuff.append("<fin_entity>").append("<![CDATA[" + finEntity + "]]>").append("</fin_entity>");//// ADDED BY NANDKUMAR GADKARI ON 13/07/19
headerBuff.append("<site_code__fr>").append("<![CDATA[" + genericUtility.getColumnValue("site_code__fr", headerDom,"1","") + "]]>").append("</site_code__fr>");
headerBuff.append("<site_code__to>").append("<![CDATA[" + genericUtility.getColumnValue("site_code__to", headerDom,"1","") + "]]>").append("</site_code__to>");
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>");
if("C".equalsIgnoreCase(payModeHeader)|| "Q".equalsIgnoreCase(payModeHeader))
{
headerBuff.append("<sundry_code>").append("<![CDATA[" + genericUtility.getColumnValue("sundry_code", headerDom,"1","") + "]]>").append("</sundry_code>");
}
else
{
headerBuff.append("<sundry_code>").append("<![CDATA["+" "+"]]>").append("</sundry_code>");
}
headerBuff.append("<sundry_code>").append("<![CDATA[" + genericUtility.getColumnValue("sundry_code", headerDom,"1","") + "]]>").append("</sundry_code>");
//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>");
......@@ -1003,7 +960,6 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
headerBuff.append("<bank_flag>").append("<![CDATA[" + genericUtility.getColumnValue("bank_flag", headerDom,"1","") + "]]>").append("</bank_flag>");
headerBuff.append("<site_code_descr__fr>").append("<![CDATA[" + genericUtility.getColumnValue("site_code_descr__fr", headerDom,"1","") + "]]>").append("</site_code_descr__fr>");
headerBuff.append("<site_code_descr__to>").append("<![CDATA[" + genericUtility.getColumnValue("site_code_descr__to", headerDom,"1","") + "]]>").append("</site_code_descr__to>");
headerBuff.append("</Detail1>");
......@@ -1566,14 +1522,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
{
oRefNo = mRefNo;
System.out.println("oRefNo--["+oRefNo+"]mRefNo--["+mRefNo+"]");
//Added By PriyankaC [Start]
if(mRefNo == null || mRefNo.trim().length() == 0)
{
mRefNo = "0";
}
//Added Byn PriyankaC [END]
if(mRefNo != null && mRefNo.trim().length() > 0)// condition added by nandkumar gadkari on 13/07/19
{//Added by Varsha V on 25-06-18 changed parseDouble to parseInt
//Added by Varsha V on 25-06-18 changed parseDouble to parseInt
mRefNo = String.valueOf(Integer.parseInt(mRefNo) + 1);
//Ended by Varsha V on 25-06-18 changed parseDouble to parseInt
System.out.println("mRefNo--["+mRefNo+"]");
......@@ -1591,12 +1540,6 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
return errString;
}
}
}
else
{
oRefNo = "";
mRefNo = "";
}
}
else
{
......@@ -2155,7 +2098,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
xmlString.append("<group0>");
xmlString.append("<description>").append("Group0 description").append("</description>");
xmlString.append("<Header0>");
xmlString.append("<objName><![CDATA[").append("misc_pay_ap").append("]]></objName>");// obj_name change by nandkumar gadkari on 13/07/19
xmlString.append("<objName><![CDATA[").append("misc_pay").append("]]></objName>");
xmlString.append("<pageContext><![CDATA[").append("1").append("]]></pageContext>");
xmlString.append("<objContext><![CDATA[").append("1").append("]]></objContext>");
xmlString.append("<editFlag><![CDATA[").append("A").append("]]></editFlag>");
......@@ -2278,7 +2221,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
System.out.println("tranDate--["+tranDate+"]autoPost--["+autoPost+"]taxEnv--["+taxEnv+"]mExchRatePay--["+mExchRatePay+"]");
headerBuff = new StringBuffer();
headerBuff.append("<Detail1 dbID=\"\" domID=\"1\" objName=\"misc_pay_ap\" objContext=\"1\">");// obj_name change by nandkumar gadkari on 13/07/19
headerBuff.append("<Detail1 dbID=\"\" domID=\"1\" objName=\"misc_pay\" objContext=\"1\">");
headerBuff.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>");
headerBuff.append("<tran_id>").append("<![CDATA[]]>").append("</tran_id>");
headerBuff.append("<tran_type>").append("<![CDATA[" + tranType + "]]>").append("</tran_type>");
......@@ -2876,12 +2819,7 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
{
oRefNo = mRefNo;
System.out.println("oRefNo--["+oRefNo+"]mRefNo--["+mRefNo+"]");
//Added By PriyankaC [Start]
if(mRefNo == null || mRefNo.trim().length() == 0)
{
mRefNo = "0";
}
//Added Byn PriyankaC [END]
//mRefNo = String.valueOf(Double.parseDouble(mRefNo + 1));
mRefNo = String.valueOf(Integer.parseInt(mRefNo) + 1);
System.out.println("mRefNo--["+mRefNo+"]");
......
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