Skip to content

B
business-java
Commit 4ddee86a authored by ngadkari's avatar ngadkari
Browse files
Options

Changes for sundry code set blank 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@204007 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8abec52f
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 10 deletions
webitm-fin/ibase/webitm/ejb/fin/MiscPayAutoPrc.java
View file @ 4ddee86a
...@@ -945,7 +945,16 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -945,7 +945,16 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
headerBuff.append("<site_code__to>").append("<![CDATA[" + genericUtility.getColumnValue("site_code__to", headerDom,"1","") + "]]>").append("</site_code__to>"); 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("<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>"); if("C".equalsIgnoreCase(payModeHeader) || "Q".equalsIgnoreCase(payModeHeader))// condition added by nandkumar gadkari on 24/07/19
{
headerBuff.append("<sundry_code>").append("<![CDATA[" + genericUtility.getColumnValue("sundry_code", headerDom,"1","") + "]]>").append("</sundry_code>");
}
else
{
String test=" " ;
System.out.println("testtttttttttttttttttttttttttt"+test);
headerBuff.append("<sundry_code>").append("<![CDATA["+test+"]]>").append("</sundry_code>");
}
//Commented by Anjali R. on[01/09/2018][If Paymode is with percentage sign then set paymode only][Start] //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[" + genericUtility.getColumnValue("pay_mode", headerDom,"1","") + "]]>").append("</pay_mode>");
headerBuff.append("<pay_mode>").append("<![CDATA[" + payModeHeader+ "]]>").append("</pay_mode>"); headerBuff.append("<pay_mode>").append("<![CDATA[" + payModeHeader+ "]]>").append("</pay_mode>");
...@@ -1097,10 +1106,20 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -1097,10 +1106,20 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
mSiteCode = genericUtility.getColumnValueFromNode("site_code", parentNode1); mSiteCode = genericUtility.getColumnValueFromNode("site_code", parentNode1);
//Modified by Anjali R. on [25/02/2019][Start] //Modified by Anjali R. on [25/02/2019][Start]
dom = setNodeValue(genericUtility.parseString(headerBuff.toString()), "sundry_code", mSundryCode); if("C".equalsIgnoreCase(mPayMode) || "Q".equalsIgnoreCase(mPayMode))// condition added by nandkumar gadkari on 24/07/19
headerBuff = null; {
headerBuff = new StringBuffer(); dom = setNodeValue(genericUtility.parseString(headerBuff.toString()), "sundry_code", mSundryCode);
headerBuff.append(genericUtility.serializeDom(dom)); headerBuff = null;
headerBuff = new StringBuffer();
headerBuff.append(genericUtility.serializeDom(dom));
}
else
{
dom = setNodeValue(genericUtility.parseString(headerBuff.toString()), "sundry_code", " ");
headerBuff = null;
headerBuff = new StringBuffer();
headerBuff.append(genericUtility.serializeDom(dom));
}
//Modified by Anjali R. on [25/02/2019][End] //Modified by Anjali R. on [25/02/2019][End]
oPayMode = mPayMode; oPayMode = mPayMode;
...@@ -1520,7 +1539,10 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -1520,7 +1539,10 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
//if("Q".equalsIgnoreCase(oPayMode) || "D".equalsIgnoreCase(oPayMode) || "T".equalsIgnoreCase(oPayMode))//Changed for NEFT & RTGS //if("Q".equalsIgnoreCase(oPayMode) || "D".equalsIgnoreCase(oPayMode) || "T".equalsIgnoreCase(oPayMode))//Changed for NEFT & RTGS
if("Q".equalsIgnoreCase(oPayMode) || "D".equalsIgnoreCase(oPayMode) || "T".equalsIgnoreCase(oPayMode) || "N".equalsIgnoreCase(oPayMode) || "G".equalsIgnoreCase(oPayMode) ) if("Q".equalsIgnoreCase(oPayMode) || "D".equalsIgnoreCase(oPayMode) || "T".equalsIgnoreCase(oPayMode) || "N".equalsIgnoreCase(oPayMode) || "G".equalsIgnoreCase(oPayMode) )
{ {
oRefNo = mRefNo;
if(mRefNo !=null && mRefNo.trim().length() > 0)// condition added by nandkumar gadkari on 24/07/19
{
oRefNo = mRefNo;
System.out.println("oRefNo--["+oRefNo+"]mRefNo--["+mRefNo+"]"); System.out.println("oRefNo--["+oRefNo+"]mRefNo--["+mRefNo+"]");
//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); mRefNo = String.valueOf(Integer.parseInt(mRefNo) + 1);
...@@ -1540,6 +1562,12 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -1540,6 +1562,12 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
return errString; return errString;
} }
} }
}
else
{
oRefNo = "";
mRefNo = "";
}
} }
else else
{ {
...@@ -1837,7 +1865,14 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -1837,7 +1865,14 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
+ "discount_amt = ? where tran_id = ?"; + "discount_amt = ? where tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, oSundryType); pstmt.setString(1, oSundryType);
pstmt.setString(2, oSundryCode); if("C".equalsIgnoreCase(oPayMode) || "Q".equalsIgnoreCase(oPayMode))// condition added by nandkumar gadkari on 24/07/19
{
pstmt.setString(2, oSundryCode);
}
else
{
pstmt.setString(2, " ");
}
pstmt.setString(3, oPayMode); pstmt.setString(3, oPayMode);
//pstmt.setString(4, mRefNo); //pstmt.setString(4, mRefNo);
pstmt.setInt(4, refNoInt); pstmt.setInt(4, refNoInt);
...@@ -2252,7 +2287,16 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -2252,7 +2287,16 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
headerBuff.append("<site_code__to>").append("<![CDATA[" + genericUtility.getColumnValue("site_code__to", headerDom,"1","") + "]]>").append("</site_code__to>"); 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("<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>");
if("C".equalsIgnoreCase(genericUtility.getColumnValue("pay_mode", headerDom,"1","")) || "Q".equalsIgnoreCase(genericUtility.getColumnValue("pay_mode", headerDom,"1","")))// condition added by nandkumar gadkari on 24/07/19
{
headerBuff.append("<sundry_code>").append("<![CDATA[" + genericUtility.getColumnValue("sundry_code", headerDom,"1","") + "]]>").append("</sundry_code>");
}
else
{
String test=" " ;
headerBuff.append("<sundry_code>").append("<![CDATA[" +test+ "]]>").append("</sundry_code>");
}
headerBuff.append("<pay_mode>").append("<![CDATA[" + genericUtility.getColumnValue("pay_mode", headerDom,"1","") + "]]>").append("</pay_mode>"); headerBuff.append("<pay_mode>").append("<![CDATA[" + genericUtility.getColumnValue("pay_mode", headerDom,"1","") + "]]>").append("</pay_mode>");
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>");
...@@ -2368,10 +2412,20 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -2368,10 +2412,20 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
headerBuff = null; headerBuff = null;
headerBuff = new StringBuffer(); headerBuff = new StringBuffer();
headerBuff.append(genericUtility.serializeDom(dom)); headerBuff.append(genericUtility.serializeDom(dom));
if("C".equalsIgnoreCase(mPayMode) || "Q".equalsIgnoreCase(mPayMode))// condition added by nandkumar gadkari on 24/07/19
{
dom = setNodeValue(genericUtility.parseString(headerBuff.toString()), "sundry_code", mSundryCode); dom = setNodeValue(genericUtility.parseString(headerBuff.toString()), "sundry_code", mSundryCode);
headerBuff = null; headerBuff = null;
headerBuff = new StringBuffer(); headerBuff = new StringBuffer();
headerBuff.append(genericUtility.serializeDom(dom)); headerBuff.append(genericUtility.serializeDom(dom));
}
else
{
dom = setNodeValue(genericUtility.parseString(headerBuff.toString()), "sundry_code", " ");
headerBuff = null;
headerBuff = new StringBuffer();
headerBuff.append(genericUtility.serializeDom(dom));
}
//Modified by Anjali R. on [25/02/2019][End] //Modified by Anjali R. on [25/02/2019][End]
mRemarks = "Automatic Payment "; mRemarks = "Automatic Payment ";
...@@ -2817,7 +2871,10 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -2817,7 +2871,10 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
//if("Q".equalsIgnoreCase(oPayMode) || "D".equalsIgnoreCase(oPayMode) || "T".equalsIgnoreCase(oPayMode))//Changed for NEFT & RTGS //if("Q".equalsIgnoreCase(oPayMode) || "D".equalsIgnoreCase(oPayMode) || "T".equalsIgnoreCase(oPayMode))//Changed for NEFT & RTGS
if("Q".equalsIgnoreCase(oPayMode) || "D".equalsIgnoreCase(oPayMode) || "T".equalsIgnoreCase(oPayMode) || "N".equalsIgnoreCase(oPayMode) || "G".equalsIgnoreCase(oPayMode) ) if("Q".equalsIgnoreCase(oPayMode) || "D".equalsIgnoreCase(oPayMode) || "T".equalsIgnoreCase(oPayMode) || "N".equalsIgnoreCase(oPayMode) || "G".equalsIgnoreCase(oPayMode) )
{ {
oRefNo = mRefNo; if(mRefNo !=null && mRefNo.trim().length() > 0)// condition added by nandkumar gadkari on 24/07/19
{
oRefNo = mRefNo;
System.out.println("oRefNo--["+oRefNo+"]mRefNo--["+mRefNo+"]"); System.out.println("oRefNo--["+oRefNo+"]mRefNo--["+mRefNo+"]");
//mRefNo = String.valueOf(Double.parseDouble(mRefNo + 1)); //mRefNo = String.valueOf(Double.parseDouble(mRefNo + 1));
...@@ -2836,6 +2893,12 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -2836,6 +2893,12 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
break; break;
} }
} }
}
else
{
oRefNo = "";
mRefNo = "";
}
} }
else else
{ {
...@@ -3133,6 +3196,14 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -3133,6 +3196,14 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, oSundryType); pstmt.setString(1, oSundryType);
pstmt.setString(2, oSundryCode); pstmt.setString(2, oSundryCode);
if("C".equalsIgnoreCase(oPayMode) || "Q".equalsIgnoreCase(oPayMode))// condition added by nandkumar gadkari on 24/07/19
{
pstmt.setString(2, oSundryCode);
}
else
{
pstmt.setString(2, " ");
}
pstmt.setString(3, oPayMode); pstmt.setString(3, oPayMode);
//pstmt.setString(4, mRefNo); //pstmt.setString(4, mRefNo);
pstmt.setInt(4, refNoInt); pstmt.setInt(4, refNoInt);
...@@ -3256,7 +3327,15 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi ...@@ -3256,7 +3327,15 @@ public class MiscPayAutoPrc extends ProcessEJB implements MiscPayAutoPrcLocal,Mi
+ "discount_amt = ? where tran_id = ?"; + "discount_amt = ? where tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, oSundryType); pstmt.setString(1, oSundryType);
pstmt.setString(2, oSundryCode);
if("C".equalsIgnoreCase(oPayMode) || "Q".equalsIgnoreCase(oPayMode))// condition added by nandkumar gadkari on 24/07/19
{
pstmt.setString(2, oSundryCode);
}
else
{
pstmt.setString(2, " ");
}
pstmt.setString(3, oPayMode); pstmt.setString(3, oPayMode);
pstmt.setString(4, mRefNo); pstmt.setString(4, mRefNo);
pstmt.setString(5, mRemarks); pstmt.setString(5, mRemarks);
......
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