Skip to content

B
business-java
Commit 83e65c2a authored by ngadkari's avatar ngadkari
Browse files
Options

changes in GenerateReceiptIC component for Auto AR Settlement 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@182703 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 65d75f78
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 28 deletions
webitm-fin/ibase/webitm/ejb/fin/GenerateReceiptIC.java
View file @ 83e65c2a
...@@ -122,7 +122,9 @@ conn = getConnection(); ...@@ -122,7 +122,9 @@ conn = getConnection();
if(currentColumn.trim().equalsIgnoreCase("itm_default")) if(currentColumn.trim().equalsIgnoreCase("itm_default"))
{ {
chequeDate = checkNull(genericUtility.getColumnValue("cheque_date", dom));
//commented by Nandkumar gadkari on 26/03/18 --statrt------
/* chequeDate = checkNull(genericUtility.getColumnValue("cheque_date", dom));*/
custBlank = checkNull(genericUtility.getColumnValue("cust_bank_ref", dom)); custBlank = checkNull(genericUtility.getColumnValue("cust_bank_ref", dom));
valueXmlString.append("<site_code>").append("<![CDATA[" + loginSite +"]]>").append("</site_code>"); valueXmlString.append("<site_code>").append("<![CDATA[" + loginSite +"]]>").append("</site_code>");
valueXmlString.append("<cheque_no protect='0'>").append("<![CDATA[ ]]>").append("</cheque_no>"); valueXmlString.append("<cheque_no protect='0'>").append("<![CDATA[ ]]>").append("</cheque_no>");
...@@ -130,8 +132,9 @@ conn = getConnection(); ...@@ -130,8 +132,9 @@ conn = getConnection();
valueXmlString.append("<cust_code__to>").append("<![CDATA[ZZ]]>").append("</cust_code__to>"); valueXmlString.append("<cust_code__to>").append("<![CDATA[ZZ]]>").append("</cust_code__to>");
valueXmlString.append("<due_date>").append("<![CDATA[" + simpleDateFormat1.format(new Date()) +"]]>").append("</due_date>"); valueXmlString.append("<due_date>").append("<![CDATA[" + simpleDateFormat1.format(new Date()) +"]]>").append("</due_date>");
valueXmlString.append("<due_date_to>").append("<![CDATA[" + simpleDateFormat1.format(new Date()) +"]]>").append("</due_date_to>"); valueXmlString.append("<due_date_to>").append("<![CDATA[" + simpleDateFormat1.format(new Date()) +"]]>").append("</due_date_to>");
valueXmlString.append("<cheque_date protect='1'>").append("<![CDATA["+chequeDate+"]]>").append("</cheque_date>"); /*valueXmlString.append("<cheque_date protect='1'>").append("<![CDATA["+chequeDate+"]]>").append("</cheque_date>");
valueXmlString.append("<cheque_amount protect='1'>").append("<![CDATA[]]>").append("</cheque_amount>"); valueXmlString.append("<cheque_amount protect='1'>").append("<![CDATA[]]>").append("</cheque_amount>");*/
//commented by Nandkumar gadkari on 26/03/18 --end------
valueXmlString.append("<cust_bank_ref protect='1'>").append("<![CDATA["+custBlank+"]]>").append("</cust_bank_ref>"); valueXmlString.append("<cust_bank_ref protect='1'>").append("<![CDATA["+custBlank+"]]>").append("</cust_bank_ref>");
sql = "select bank_code from site where site_code = ? "; sql = "select bank_code from site where site_code = ? ";
...@@ -189,24 +192,24 @@ conn = getConnection(); ...@@ -189,24 +192,24 @@ conn = getConnection();
//custCodeTo = checkNull(genericUtility.getColumnValue("cust_code__to", dom)); //custCodeTo = checkNull(genericUtility.getColumnValue("cust_code__to", dom));
custCodeTo=custCodeFrom; custCodeTo=custCodeFrom;
chequeNo = checkNull(genericUtility.getColumnValue("cheque_no", dom)); chequeNo = checkNull(genericUtility.getColumnValue("cheque_no", dom));
chequeDate = checkNull(genericUtility.getColumnValue("cheque_date", dom)); /*chequeDate = checkNull(genericUtility.getColumnValue("cheque_date", dom));
chequeAmt = checkNull(genericUtility.getColumnValue("cheque_amount", dom)); chequeAmt = checkNull(genericUtility.getColumnValue("cheque_amount", dom));*///commented by Nandkumar gadkari on 26/03/18
custBlank = checkNull(genericUtility.getColumnValue("cust_bank_ref", dom)); custBlank = checkNull(genericUtility.getColumnValue("cust_bank_ref", dom));
System.out.println("cust code frm ="+custCodeFrom); System.out.println("cust code frm ="+custCodeFrom);
System.out.println("cust code to ="+custCodeTo); System.out.println("cust code to ="+custCodeTo);
if(!custCodeFrom.trim().equalsIgnoreCase(custCodeTo.trim())) if(!custCodeFrom.trim().equalsIgnoreCase(custCodeTo.trim()))
{ {
valueXmlString.append("<cheque_no protect='1'>").append("<![CDATA[]]>").append("</cheque_no>"); valueXmlString.append("<cheque_no protect='1'>").append("<![CDATA[]]>").append("</cheque_no>");
valueXmlString.append("<cheque_date protect='1'>").append("<![CDATA[]]>").append("</cheque_date>"); /* valueXmlString.append("<cheque_date protect='1'>").append("<![CDATA[]]>").append("</cheque_date>");
valueXmlString.append("<cheque_amount protect='1'>").append("<![CDATA[]]>").append("</cheque_amount>"); valueXmlString.append("<cheque_amount protect='1'>").append("<![CDATA[]]>").append("</cheque_amount>");
valueXmlString.append("<cust_bank_ref protect='1'>").append("<![CDATA[]]>").append("</cust_bank_ref>"); valueXmlString.append("<cust_bank_ref protect='1'>").append("<![CDATA[]]>").append("</cust_bank_ref>");*///commented by Nandkumar gadkari on 26/03/18
} }
else else
{ {
valueXmlString.append("<cheque_no protect='0'>").append("<![CDATA["+chequeNo+"]]>").append("</cheque_no>"); valueXmlString.append("<cheque_no protect='0'>").append("<![CDATA["+chequeNo+"]]>").append("</cheque_no>");
valueXmlString.append("<cheque_date protect='0'>").append("<![CDATA["+chequeDate+"]]>").append("</cheque_date>"); /* valueXmlString.append("<cheque_date protect='0'>").append("<![CDATA["+chequeDate+"]]>").append("</cheque_date>");
valueXmlString.append("<cheque_amount protect='0'>").append("<![CDATA["+chequeAmt+"]]>").append("</cheque_amount>"); valueXmlString.append("<cheque_amount protect='0'>").append("<![CDATA["+chequeAmt+"]]>").append("</cheque_amount>");
valueXmlString.append("<cust_bank_ref protect='0'>").append("<![CDATA["+custBlank+"]]>").append("</cust_bank_ref>"); valueXmlString.append("<cust_bank_ref protect='0'>").append("<![CDATA["+custBlank+"]]>").append("</cust_bank_ref>");*///commented by Nandkumar gadkari on 26/03/18
valueXmlString.append("<cust_code__to protect='0'>").append("<![CDATA["+custCodeTo+"]]>").append("</cust_code__to>"); valueXmlString.append("<cust_code__to protect='0'>").append("<![CDATA["+custCodeTo+"]]>").append("</cust_code__to>");
} }
//valueXmlString.append("<cust_code__from>").append("<![CDATA["+custCode+"]]>").append("</cust_code__from>"); //valueXmlString.append("<cust_code__from>").append("<![CDATA["+custCode+"]]>").append("</cust_code__from>");
...@@ -255,9 +258,9 @@ conn = getConnection(); ...@@ -255,9 +258,9 @@ conn = getConnection();
{ {
valueXmlString.append("<bank_code protect='1'>").append("<![CDATA[" + bankCode +"]]>").append("</bank_code>"); valueXmlString.append("<bank_code protect='1'>").append("<![CDATA[" + bankCode +"]]>").append("</bank_code>");
valueXmlString.append("<cheque_no protect='1'>").append("<![CDATA["+chequeNo+"]]>").append("</cheque_no>"); valueXmlString.append("<cheque_no protect='1'>").append("<![CDATA["+chequeNo+"]]>").append("</cheque_no>");
valueXmlString.append("<cheque_date protect='1'>").append("<![CDATA["+chequeDate+"]]>").append("</cheque_date>"); /*valueXmlString.append("<cheque_date protect='1'>").append("<![CDATA["+chequeDate+"]]>").append("</cheque_date>");
valueXmlString.append("<cust_bank_ref protect='1'>").append("<![CDATA["+custBlank+"]]>").append("</cust_bank_ref>"); valueXmlString.append("<cust_bank_ref protect='1'>").append("<![CDATA["+custBlank+"]]>").append("</cust_bank_ref>");
valueXmlString.append("<cheque_amount>").append("<![CDATA[0]]>").append("</cheque_amount>"); valueXmlString.append("<cheque_amount>").append("<![CDATA[0]]>").append("</cheque_amount>");*///commented by Nandkumar gadkari on 26/03/18
} }
/*else /*else
{ {
...@@ -278,24 +281,24 @@ conn = getConnection(); ...@@ -278,24 +281,24 @@ conn = getConnection();
custCodeFrom = checkNull(genericUtility.getColumnValue("cust_code__from", dom)); custCodeFrom = checkNull(genericUtility.getColumnValue("cust_code__from", dom));
custCodeTo = checkNull(genericUtility.getColumnValue("cust_code__to", dom)); custCodeTo = checkNull(genericUtility.getColumnValue("cust_code__to", dom));
chequeNo = checkNull(genericUtility.getColumnValue("cheque_no", dom)); chequeNo = checkNull(genericUtility.getColumnValue("cheque_no", dom));
chequeDate = checkNull(genericUtility.getColumnValue("cheque_date", dom)); /* chequeDate = checkNull(genericUtility.getColumnValue("cheque_date", dom));
chequeAmt = checkNull(genericUtility.getColumnValue("cheque_amount", dom)); chequeAmt = checkNull(genericUtility.getColumnValue("cheque_amount", dom));*///commented by Nandkumar gadkari on 26/03/18
custBlank = checkNull(genericUtility.getColumnValue("cust_bank_ref", dom)); custBlank = checkNull(genericUtility.getColumnValue("cust_bank_ref", dom));
System.out.println("cust code frm ="+custCodeFrom); System.out.println("cust code frm ="+custCodeFrom);
System.out.println("cust code to ="+custCodeTo); System.out.println("cust code to ="+custCodeTo);
if(!custCodeFrom.trim().equalsIgnoreCase(custCodeTo.trim())) if(!custCodeFrom.trim().equalsIgnoreCase(custCodeTo.trim()))
{ {
valueXmlString.append("<cheque_no protect='1'>").append("<![CDATA["+chequeNo+"]]>").append("</cheque_no>"); valueXmlString.append("<cheque_no protect='1'>").append("<![CDATA["+chequeNo+"]]>").append("</cheque_no>");
valueXmlString.append("<cheque_date protect='1'>").append("<![CDATA["+chequeDate+"]]>").append("</cheque_date>"); /*valueXmlString.append("<cheque_date protect='1'>").append("<![CDATA["+chequeDate+"]]>").append("</cheque_date>");
valueXmlString.append("<cheque_amount protect='1'>").append("<![CDATA[]]>").append("</cheque_amount>"); valueXmlString.append("<cheque_amount protect='1'>").append("<![CDATA[]]>").append("</cheque_amount>");
valueXmlString.append("<cust_bank_ref protect='1'>").append("<![CDATA["+custBlank+"]]>").append("</cust_bank_ref>"); valueXmlString.append("<cust_bank_ref protect='1'>").append("<![CDATA["+custBlank+"]]>").append("</cust_bank_ref>");*///commented by Nandkumar gadkari on 26/03/18
} }
else else
{ {
valueXmlString.append("<cheque_no protect='0'>").append("<![CDATA["+chequeNo+"]]>").append("</cheque_no>"); valueXmlString.append("<cheque_no protect='0'>").append("<![CDATA["+chequeNo+"]]>").append("</cheque_no>");
valueXmlString.append("<cheque_date protect='0'>").append("<![CDATA["+chequeDate+"]]>").append("</cheque_date>"); /*valueXmlString.append("<cheque_date protect='0'>").append("<![CDATA["+chequeDate+"]]>").append("</cheque_date>");
valueXmlString.append("<cheque_amount protect='0'>").append("<![CDATA["+chequeAmt+"]]>").append("</cheque_amount>"); valueXmlString.append("<cheque_amount protect='0'>").append("<![CDATA["+chequeAmt+"]]>").append("</cheque_amount>");
valueXmlString.append("<cust_bank_ref protect='0'>").append("<![CDATA["+custBlank+"]]>").append("</cust_bank_ref>"); valueXmlString.append("<cust_bank_ref protect='0'>").append("<![CDATA["+custBlank+"]]>").append("</cust_bank_ref>");*///commented by Nandkumar gadkari on 26/03/18
} }
sql = "select udf_str1,udf_str2 from gencodes where mod_name = 'W_RECEIPT_ADV' and fld_name = 'TRAN_TYPE' and fld_value = ?"; sql = "select udf_str1,udf_str2 from gencodes where mod_name = 'W_RECEIPT_ADV' and fld_name = 'TRAN_TYPE' and fld_value = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -341,10 +344,10 @@ conn = getConnection(); ...@@ -341,10 +344,10 @@ conn = getConnection();
{ {
valueXmlString.append("<bank_code protect='1'>").append("<![CDATA[" + bankCode +"]]>").append("</bank_code>"); valueXmlString.append("<bank_code protect='1'>").append("<![CDATA[" + bankCode +"]]>").append("</bank_code>");
valueXmlString.append("<cheque_no protect='1'>").append("<![CDATA["+chequeNo+"]]>").append("</cheque_no>"); valueXmlString.append("<cheque_no protect='1'>").append("<![CDATA["+chequeNo+"]]>").append("</cheque_no>");
valueXmlString.append("<cheque_date protect='1'>").append("<![CDATA["+chequeDate+"]]>").append("</cheque_date>"); /* valueXmlString.append("<cheque_date protect='1'>").append("<![CDATA["+chequeDate+"]]>").append("</cheque_date>");
valueXmlString.append("<cust_bank_ref protect='1'>").append("<![CDATA["+custBlank+"]]>").append("</cust_bank_ref>"); valueXmlString.append("<cust_bank_ref protect='1'>").append("<![CDATA["+custBlank+"]]>").append("</cust_bank_ref>");
valueXmlString.append("<cheque_amount>").append("<![CDATA[0]]>").append("</cheque_amount>"); valueXmlString.append("<cheque_amount>").append("<![CDATA[0]]>").append("</cheque_amount>");*/ //commented by Nandkumar gadkari on 26/03/18
} }
/*else /*else
{ {
valueXmlString.append("<bank_code protect='0'>").append("<![CDATA[" + bankCode +"]]>").append("</bank_code>"); valueXmlString.append("<bank_code protect='0'>").append("<![CDATA[" + bankCode +"]]>").append("</bank_code>");
...@@ -360,8 +363,8 @@ conn = getConnection(); ...@@ -360,8 +363,8 @@ conn = getConnection();
{ {
tranType = checkNull(genericUtility.getColumnValue("tran_type", dom)); tranType = checkNull(genericUtility.getColumnValue("tran_type", dom));
chequeNo = checkNull(genericUtility.getColumnValue("cheque_no", dom)); chequeNo = checkNull(genericUtility.getColumnValue("cheque_no", dom));
chequeDate = checkNull(genericUtility.getColumnValue("cheque_date", dom)); /*chequeDate = checkNull(genericUtility.getColumnValue("cheque_date", dom));
chequeAmt = checkNull(genericUtility.getColumnValue("cheque_amount", dom)); chequeAmt = checkNull(genericUtility.getColumnValue("cheque_amount", dom));*///commented by Nandkumar gadkari on 26/03/18
custBlank = checkNull(genericUtility.getColumnValue("cust_bank_ref", dom)); custBlank = checkNull(genericUtility.getColumnValue("cust_bank_ref", dom));
custCodeFrom = checkNull(genericUtility.getColumnValue("cust_code__from", dom)); custCodeFrom = checkNull(genericUtility.getColumnValue("cust_code__from", dom));
custCodeTo = checkNull(genericUtility.getColumnValue("cust_code__to", dom)); custCodeTo = checkNull(genericUtility.getColumnValue("cust_code__to", dom));
...@@ -409,17 +412,17 @@ conn = getConnection(); ...@@ -409,17 +412,17 @@ conn = getConnection();
{ {
valueXmlString.append("<bank_code protect='1'>").append("<![CDATA[" + bankCode +"]]>").append("</bank_code>"); valueXmlString.append("<bank_code protect='1'>").append("<![CDATA[" + bankCode +"]]>").append("</bank_code>");
valueXmlString.append("<cheque_no protect='1'>").append("<![CDATA["+chequeNo+"]]>").append("</cheque_no>"); valueXmlString.append("<cheque_no protect='1'>").append("<![CDATA["+chequeNo+"]]>").append("</cheque_no>");
valueXmlString.append("<cheque_date protect='1'>").append("<![CDATA["+chequeDate+"]]>").append("</cheque_date>"); /*valueXmlString.append("<cheque_date protect='1'>").append("<![CDATA["+chequeDate+"]]>").append("</cheque_date>");
valueXmlString.append("<cust_bank_ref protect='1'>").append("<![CDATA["+custBlank+"]]>").append("</cust_bank_ref>"); valueXmlString.append("<cust_bank_ref protect='1'>").append("<![CDATA["+custBlank+"]]>").append("</cust_bank_ref>");
valueXmlString.append("<cheque_amount>").append("<![CDATA[0]]>").append("</cheque_amount>"); valueXmlString.append("<cheque_amount>").append("<![CDATA[0]]>").append("</cheque_amount>");*///commented by Nandkumar gadkari on 26/03/18
} }
else else
{ {
valueXmlString.append("<bank_code protect='0'>").append("<![CDATA[" + bankCode +"]]>").append("</bank_code>"); valueXmlString.append("<bank_code protect='0'>").append("<![CDATA[" + bankCode +"]]>").append("</bank_code>");
valueXmlString.append("<cheque_no protect='0'>").append("<![CDATA["+chequeNo+"]]>").append("</cheque_no>"); valueXmlString.append("<cheque_no protect='0'>").append("<![CDATA["+chequeNo+"]]>").append("</cheque_no>");
valueXmlString.append("<cheque_date protect='0'>").append("<![CDATA["+chequeDate+"]]>").append("</cheque_date>"); /*valueXmlString.append("<cheque_date protect='0'>").append("<![CDATA["+chequeDate+"]]>").append("</cheque_date>");
valueXmlString.append("<cust_bank_ref protect='0'>").append("<![CDATA["+custBlank+"]]>").append("</cust_bank_ref>"); valueXmlString.append("<cust_bank_ref protect='0'>").append("<![CDATA["+custBlank+"]]>").append("</cust_bank_ref>");
valueXmlString.append("<cheque_amount protect='0'>").append("<![CDATA["+chequeAmt+"]]>").append("</cheque_amount>"); valueXmlString.append("<cheque_amount protect='0'>").append("<![CDATA["+chequeAmt+"]]>").append("</cheque_amount>");*///commented by Nandkumar gadkari on 26/03/18
} }
System.out.println("check for code code to and from ..."); System.out.println("check for code code to and from ...");
System.out.println("cust code frm ="+custCodeFrom); System.out.println("cust code frm ="+custCodeFrom);
...@@ -427,9 +430,9 @@ conn = getConnection(); ...@@ -427,9 +430,9 @@ conn = getConnection();
if(!custCodeFrom.trim().equalsIgnoreCase(custCodeTo.trim())) if(!custCodeFrom.trim().equalsIgnoreCase(custCodeTo.trim()))
{ {
valueXmlString.append("<cheque_no protect='1'>").append("<![CDATA["+chequeNo+"]]>").append("</cheque_no>"); valueXmlString.append("<cheque_no protect='1'>").append("<![CDATA["+chequeNo+"]]>").append("</cheque_no>");
valueXmlString.append("<cheque_date protect='1'>").append("<![CDATA["+chequeDate+"]]>").append("</cheque_date>"); /*valueXmlString.append("<cheque_date protect='1'>").append("<![CDATA["+chequeDate+"]]>").append("</cheque_date>");
valueXmlString.append("<cheque_amount protect='1'>").append("<![CDATA[]]>").append("</cheque_amount>"); valueXmlString.append("<cheque_amount protect='1'>").append("<![CDATA[]]>").append("</cheque_amount>");
valueXmlString.append("<cust_bank_ref protect='1'>").append("<![CDATA["+custBlank+"]]>").append("</cust_bank_ref>"); valueXmlString.append("<cust_bank_ref protect='1'>").append("<![CDATA["+custBlank+"]]>").append("</cust_bank_ref>");*///commented by Nandkumar gadkari on 26/03/18
} }
/*else /*else
{ {
......
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