Skip to content

B
business-java
Commit 4ac23c71 authored by ssalve's avatar ssalve
Browse files
Options

Sarita: Done change on 09APR2018 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@183309 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 33a58e6a
Show whitespace changes
Inline Side-by-side
Showing with 160 additions and 58 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/PayVoucherComPrc.java
View file @ 4ac23c71
......@@ -55,6 +55,7 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
try
{
System.out.println("In PayVoucherComPrc!!!! getData method");
DistCommon distCommonObj = new DistCommon();
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
......@@ -726,17 +727,26 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
}
else
{
testlrD=" ";
tabSeparatedData.append ("<lr_date>").append("<![CDATA[" + testlrD +"]]>").append("</lr_date>");
//Done changes by sarita on 09APR2018 to remove space for lr_date
/*testlrD=" ";
tabSeparatedData.append ("<lr_date>").append("<![CDATA[" + testlrD +"]]>").append("</lr_date>");*/
testlrD="";
tabSeparatedData.append ("<lr_date>").append("<![CDATA["+testlrD+"]]>").append("</lr_date>");
}
//tabSeparatedData.append ("<lr_date>").append("<![CDATA[" + (rs.getString(2)==null?" ":sdf.format(rs.getString(2))) +"]]>").append("</lr_date>");
tabSeparatedData.append ("<stan_fr>").append("<![CDATA[" + (rs.getString(3)==null?" ":rs.getString(3)) +"]]>").append("</stan_fr>");
tabSeparatedData.append ("<stan_to>").append("<![CDATA[" + (rs.getString(4)==null?" ":rs.getString(4)) +"]]>").append("</stan_to>");
tabSeparatedData.append ("<tran_id>").append("<![CDATA[" + (rs.getString(5)==null?" ":rs.getString(5)) +"]]>").append("</tran_id>");
tabSeparatedData.append ("<gross_weight>").append("<![CDATA[" + (rs.getString(6)==null?" ":rs.getString(6)) +"]]>").append ("</gross_weight>");
//done changes by sarita on 09APR2018[start]gross_weight,no_art,amount,flag_onoff
/*tabSeparatedData.append ("<gross_weight>").append("<![CDATA[" + (rs.getString(6)==null?" ":rs.getString(6)) +"]]>").append ("</gross_weight>");
tabSeparatedData.append ("<no_art>").append("<![CDATA[" + (rs.getString(7)==null?" ":rs.getString(7)) +"]]>").append("</no_art>");
tabSeparatedData.append ("<amount>").append("<![CDATA[" + (rs.getString(8)==null?" ":rs.getString(8)) +"]]>").append("</amount>");
tabSeparatedData.append ("<flag_onoff>").append("<![CDATA[" + (rs.getString(9)==null?" ":rs.getString(9)) +"]]>").append("</flag_onoff>");
tabSeparatedData.append ("<flag_onoff>").append("<![CDATA[" + (rs.getString(9)==null?" ":rs.getString(9)) +"]]>").append("</flag_onoff>");*/
tabSeparatedData.append ("<gross_weight>").append("<![CDATA["+(rs.getString(6)==null?"":rs.getString(6).trim())+"]]>").append ("</gross_weight>");
tabSeparatedData.append ("<no_art>").append("<![CDATA["+(rs.getString(7)==null?"":rs.getString(7).trim())+"]]>").append("</no_art>");
tabSeparatedData.append ("<amount>").append("<![CDATA["+(rs.getString(8)==null?"":rs.getString(8))+"]]>").append("</amount>");
tabSeparatedData.append ("<flag_onoff>").append("<![CDATA["+(rs.getString(9)==null?"":rs.getString(9))+"]]>").append("</flag_onoff>");
//done changes by sarita on 09APR2018[end]gross_weight,no_art,amount,flag_onoff
tabSeparatedData.append ("<bill_no>").append("<![CDATA[" + (rs.getString(10)==null?" ":rs.getString(10)) +"]]>").append("</bill_no>");
String testBillD=rs.getString(11);//ibase3-webitm-fin5-7-17-7
System.out.println("testBillD["+testBillD+"]");
......@@ -750,8 +760,11 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
}
else
{
testBillD=" ";
tabSeparatedData.append ("<bill_date>").append("<![CDATA[" +testBillD +"]]>").append("</bill_date>");
//Done changes by sarita on 09APR2018 to remove space for bill_date
/*testBillD=" ";
tabSeparatedData.append ("<bill_date>").append("<![CDATA[" +testBillD +"]]>").append("</bill_date>");*/
testBillD="";
tabSeparatedData.append ("<bill_date>").append("<![CDATA["+testBillD+"]]>").append("</bill_date>");
}
// tabSeparatedData.append ("<bill_date>").append("<![CDATA[" + (rs.getTimestamp(11)==null?" ":sdf.format(rs.getTimestamp(11))) +"]]>").append("</bill_date>");
tabSeparatedData.append ("<curr_code>").append("<![CDATA[" + (rs.getString(12)==null?" ":rs.getString(12)) +"]]>").append("</curr_code>");
......@@ -768,21 +781,34 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
}
else
{
testTranD=" ";
tabSeparatedData.append ("<tran_date>").append("<![CDATA[" + testTranD +"]]>").append("</tran_date>");
//Done changes by sarita on 09APR2018 to remove space for tran_date
/*testTranD=" ";
tabSeparatedData.append ("<tran_date>").append("<![CDATA[" + testTranD +"]]>").append("</tran_date>");*/
testTranD="";
tabSeparatedData.append ("<tran_date>").append("<![CDATA["+testTranD+"]]>").append("</tran_date>");
}
// tabSeparatedData.append ("<tran_date>").append("<![CDATA[" + (rs.getTimestamp(14)==null?" ":sdf.format(rs.getTimestamp(14))) +"]]>").append("</tran_date>");
tabSeparatedData.append ("<ord_date>").append("<![CDATA[" + (rs.getString(15)==null?" ":rs.getString(15)) +"]]>").append("</ord_date>");
// tabSeparatedData.append ("<ord_date>").append("<![CDATA[" + (rs.getTimestamp(15)==null?" ":sdf.format(rs.getTimestamp(15))) +"]]>").append("</ord_date>");
/*Done changes by sarita on 09APR2018 to remove space for ord_date
tabSeparatedData.append ("<ord_date>").append("<![CDATA[" + (rs.getString(15)==null?" ":rs.getString(15)) +"]]>").append("</ord_date>"); */
tabSeparatedData.append ("<ord_date>").append("<![CDATA[" + (rs.getString(15)==null?"":rs.getString(15).trim()) +"]]>").append("</ord_date>");
//tabSeparatedData.append ("<ord_date>").append("<![CDATA[" + (rs.getTimestamp(15)==null?" ":sdf.format(rs.getTimestamp(15))) +"]]>").append("</ord_date>");
tabSeparatedData.append ("<supp_code>").append("<![CDATA[" + (rs.getString(16)==null?" ":rs.getString(16)) +"]]>").append("</supp_code>");
tabSeparatedData.append ("<supp_name>").append("<![CDATA[" + (rs.getString(17)==null?" ":rs.getString(17)) +"]]>").append("</supp_name>");
tabSeparatedData.append ("<descr>").append("<![CDATA[" + (rs.getString(18)==null?" ":rs.getString(18)) +"]]>").append("</descr>");
tabSeparatedData.append ("<item_code>").append("<![CDATA[" + (rs.getString(19)==null?" ":rs.getString(19)) +"]]>").append("</item_code>");
tabSeparatedData.append ("<quantity>").append("<![CDATA[" + (rs.getString(20)==null?" ":rs.getString(20)) +"]]>").append("</quantity>");
//done changes by sarita to remove space of quantity [start]
//tabSeparatedData.append ("<quantity>").append("<![CDATA[" + (rs.getString(20)==null?" ":rs.getString(20)) +"]]>").append("</quantity>");
tabSeparatedData.append ("<quantity>").append("<![CDATA["+(rs.getString(20)==null?"":rs.getString(20).trim())+"]]>").append("</quantity>");
//done changes by sarita to remove space of quantity [end]
tabSeparatedData.append ("<ref_ser>").append("<![CDATA[" + (rs.getString(21)==null?" ":rs.getString(21))+ "]]>").append("</ref_ser>");
tabSeparatedData.append ("<exp_amt>").append("<![CDATA[" + (rs.getString(22)==null?" ":rs.getString(22))+ "]]>").append("</exp_amt>");
//done changes by sarita to remove space of exp_amt,clg_chg & adl_amount [start]
/*tabSeparatedData.append ("<exp_amt>").append("<![CDATA[" + (rs.getString(22)==null?" ":rs.getString(22))+ "]]>").append("</exp_amt>");
tabSeparatedData.append ("<clg_chg>").append("<![CDATA[" + (rs.getString(23)==null?" ":rs.getString(23))+ "]]>").append("</clg_chg>");
tabSeparatedData.append ("<adl_amount>").append("<![CDATA[" + (rs.getString(24)==null?" ":rs.getString(24))+ "]]>").append("</adl_amount>");
tabSeparatedData.append ("<adl_amount>").append("<![CDATA[" + (rs.getString(24)==null?" ":rs.getString(24))+ "]]>").append("</adl_amount>");*/
tabSeparatedData.append ("<exp_amt>").append("<![CDATA["+(rs.getString(22)==null?"":rs.getString(22).trim())+"]]>").append("</exp_amt>");
tabSeparatedData.append ("<clg_chg>").append("<![CDATA["+(rs.getString(23)==null?"":rs.getString(23).trim())+"]]>").append("</clg_chg>");
tabSeparatedData.append ("<adl_amount>").append("<![CDATA["+(rs.getString(24)==null?"":rs.getString(24).trim())+"]]>").append("</adl_amount>");
//done changes by sarita to remove space of exp_amt,clg_chg & adl_amount [end]
tabSeparatedData.append ("<ref_line_no>").append("<![CDATA[" + (rs.getString(25)==null?" ":rs.getString(25)) +"]]>").append("</ref_line_no>");
tabSeparatedData.append ("<purc_order>").append("<![CDATA[" + (rs.getString(26)==null?" ":rs.getString(26)) +"]]>").append("</purc_order>");
tabSeparatedData.append ("<invoice_no>").append("<![CDATA[" + (rs.getString(27)==null?" ":rs.getString(27)) +"]]>").append("</invoice_no>");
......@@ -870,18 +896,30 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
}
else
{
testlrD=" ";
tabSeparatedData.append ("<lr_date>").append("<![CDATA[" + testlrD +"]]>").append("</lr_date>");
//Done changes by sarita on 09APR2018 to remove space for lr_date[porcp.lr_date]
/*testlrD=" ";
tabSeparatedData.append ("<lr_date>").append("<![CDATA[" + testlrD +"]]>").append("</lr_date>");*/
testlrD="";
tabSeparatedData.append ("<lr_date>").append("<![CDATA["+testlrD+"]]>").append("</lr_date>");
}
tabSeparatedData.append ("<stan_fr>").append("<![CDATA[" + (rs.getString(3)==null?" ":rs.getString(3)) +"]]>").append("</stan_fr>");
tabSeparatedData.append ("<stan_to>").append("<![CDATA[" + (rs.getString(4)==null?" ":rs.getString(4)) +"]]>").append("</stan_to>");
tabSeparatedData.append ("<tran_id>").append("<![CDATA[" + (rs.getString(5)==null?" ":rs.getString(5)) +"]]>").append("</tran_id>");
tabSeparatedData.append ("<gross_weight>").append("<![CDATA[" + (rs.getString(6)==null?" ":rs.getString(6)) +"]]>").append("</gross_weight>");
//done changes on 09APR2018 by sarita [start]gross_weight,no_art,amount,flag_onoff
/* tabSeparatedData.append ("<gross_weight>").append("<![CDATA[" + (rs.getString(6)==null?" ":rs.getString(6)) +"]]>").append("</gross_weight>");
tabSeparatedData.append ("<no_art>").append("<![CDATA[" + (rs.getString(7)==null?" ":rs.getString(7)) +"]]>").append("</no_art>");
tabSeparatedData.append ("<amount>").append("<![CDATA[" + (rs.getString(8)==null?" ":rs.getString(8)) +"]]>").append("</amount>");
tabSeparatedData.append ("<flag_onoff>").append("<![CDATA[" + (rs.getString(9)==null?" ":rs.getString(9)) +"]]>").append("</flag_onoff>");
tabSeparatedData.append ("<flag_onoff>").append("<![CDATA[" + (rs.getString(9)==null?" ":rs.getString(9)) +"]]>").append("</flag_onoff>");*/
tabSeparatedData.append ("<gross_weight>").append("<![CDATA["+(rs.getString(6)==null?"":rs.getString(6).trim())+"]]>").append("</gross_weight>");
tabSeparatedData.append ("<no_art>").append("<![CDATA["+(rs.getString(7)==null?"":rs.getString(7).trim())+"]]>").append("</no_art>");
tabSeparatedData.append ("<amount>").append("<![CDATA["+(rs.getString(8)==null?" ":rs.getString(8).trim())+"]]>").append("</amount>");
tabSeparatedData.append ("<flag_onoff>").append("<![CDATA["+(rs.getString(9)==null?" ":rs.getString(9).trim())+"]]>").append("</flag_onoff>");
//done changes on 09APR2018 by sarita [end]gross_weight,no_art,amount,flag_onoff
tabSeparatedData.append ("<bill_no>").append("<![CDATA[" + (rs.getString(10)==null?" ":rs.getString(10)) +"]]>").append("</bill_no>");
tabSeparatedData.append ("<bill_date>").append("<![CDATA[" + (rs.getString(11)==null?" ":rs.getString(11)) +"]]>").append("</bill_date>");
//tabSeparatedData.append ("<bill_date>").append("<![CDATA[" + (rs.getString(11)==null?" ":rs.getString(11)) +"]]>").append("</bill_date>");
/*changes by sarita on 09APR2018 to remove space of bill_date [' ' as bill_date]
tabSeparatedData.append ("<bill_date>").append("<![CDATA[" + (rs.getString(11)==null?"":rs.getString(11)) +"]]>").append("</bill_date>");*/
tabSeparatedData.append ("<bill_date>").append("<![CDATA["+(rs.getString(11)==null?"":rs.getString(11).trim())+"]]>").append("</bill_date>");
tabSeparatedData.append ("<curr_code>").append("<![CDATA[" + (rs.getString(12)==null?" ":rs.getString(12)) +"]]>").append("</curr_code>");
tabSeparatedData.append ("<site_code>").append("<![CDATA[" + (rs.getString(13)==null?" ":rs.getString(13)) +"]]>").append("</site_code>");
testTranL= rs.getString(14);
......@@ -896,20 +934,33 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
}
else
{
testTranL=" ";
tabSeparatedData.append ("<tran_date>").append("<![CDATA[" + testTranL +"]]>").append("</tran_date>");
//changes by sarita on 09APR2018 to remove space of tran_date [porcp.tran_date]
/*testTranL=" ";
tabSeparatedData.append ("<tran_date>").append("<![CDATA[" + testTranL +"]]>").append("</tran_date>");*/
testTranL="";
tabSeparatedData.append ("<tran_date>").append("<![CDATA["+testTranL+"]]>").append("</tran_date>");
}
// tabSeparatedData.append ("<tran_date>").append("<![CDATA[" + (rs.getString(14)==null?" ":sdf.format(rs.getString(14))) +"]]>").append("</tran_date>");
tabSeparatedData.append ("<ord_date>").append("<![CDATA[" + (rs.getString(15)==null?" ":rs.getString(15)) +"]]>").append("</ord_date>");
//changes by sarita on 09APR2018 to remove space of ord_date [' 'as ord_date]
//tabSeparatedData.append ("<ord_date>").append("<![CDATA[" + (rs.getString(15)==null?" ":rs.getString(15)) +"]]>").append("</ord_date>");
tabSeparatedData.append ("<ord_date>").append("<![CDATA[" + (rs.getString(15)==null?"":rs.getString(15).trim()) +"]]>").append("</ord_date>");
tabSeparatedData.append ("<supp_code>").append("<![CDATA[" + (rs.getString(16)==null?" ":rs.getString(16)) +"]]>").append("</supp_code>");
tabSeparatedData.append ("<supp_name>").append("<![CDATA[" + (rs.getString(17)==null?" ":rs.getString(17)) +"]]>").append("</supp_name>");
tabSeparatedData.append ("<descr>").append("<![CDATA[" + (rs.getString(18)==null?" ":rs.getString(18)) +"]]>").append("</descr>");
tabSeparatedData.append ("<item_code>").append("<![CDATA[" + (rs.getString(19)==null?" ":rs.getString(19)) +"]]>").append("</item_code>");
tabSeparatedData.append ("<quantity>").append("<![CDATA[" + (rs.getString(20)==null?" ":rs.getString(20)) +"]]>").append("</quantity>");
//changes by sarita to remove space for quantity [start]
//tabSeparatedData.append ("<quantity>").append("<![CDATA[" + (rs.getString(20)==null?" ":rs.getString(20)) +"]]>").append("</quantity>");
tabSeparatedData.append ("<quantity>").append("<![CDATA["+(rs.getString(20)==null?"":rs.getString(20).trim())+"]]>").append("</quantity>");
//changes by sarita to remove space for quantity [end]
tabSeparatedData.append ("<ref_ser>").append("<![CDATA[" + (rs.getString(21)==null?" ":rs.getString(21))+ "]]>").append("</ref_ser>");
tabSeparatedData.append ("<exp_amt>").append("<![CDATA[" + (rs.getString(22)==null?" ":rs.getString(22))+ "]]>").append("</exp_amt>");
//changes by sarita to remove space [start]exp_amt,clg_chg,adl_amount
/*tabSeparatedData.append ("<exp_amt>").append("<![CDATA[" + (rs.getString(22)==null?" ":rs.getString(22))+ "]]>").append("</exp_amt>");
tabSeparatedData.append ("<clg_chg>").append("<![CDATA[" + (rs.getString(23)==null?" ":rs.getString(23))+ "]]>").append("</clg_chg>");
tabSeparatedData.append ("<adl_amount>").append("<![CDATA[" + (rs.getString(24)==null?" ":rs.getString(24))+ "]]>").append("</adl_amount>");
tabSeparatedData.append ("<adl_amount>").append("<![CDATA[" + (rs.getString(24)==null?" ":rs.getString(24))+ "]]>").append("</adl_amount>");*/
tabSeparatedData.append ("<exp_amt>").append("<![CDATA["+(rs.getString(22)==null?"":rs.getString(22).trim())+"]]>").append("</exp_amt>");
tabSeparatedData.append ("<clg_chg>").append("<![CDATA["+(rs.getString(23)==null?"":rs.getString(23).trim())+"]]>").append("</clg_chg>");
tabSeparatedData.append ("<adl_amount>").append("<![CDATA["+ (rs.getString(24)==null?"":rs.getString(24).trim())+"]]>").append("</adl_amount>");
//changes by sarita to remove space [end]exp_amt,clg_chg,adl_amount
tabSeparatedData.append ("<ref_line_no>").append("<![CDATA[" + (rs.getString(25)==null?" ":rs.getString(25)) +"]]>").append("</ref_line_no>");
tabSeparatedData.append ("<purc_order>").append("<![CDATA[" + (rs.getString(26)==null?" ":rs.getString(26)) +"]]>").append("</purc_order>");
tabSeparatedData.append ("<invoice_no>").append("<![CDATA[" + (rs.getString(27)==null?" ":rs.getString(27)) +"]]>").append("</invoice_no>");
......@@ -1001,21 +1052,35 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
}
else
{
testlrD=" ";
tabSeparatedData.append ("<lr_date>").append("<![CDATA[" + testlrD +"]]>").append("</lr_date>");
//changes by sarita on 09APR2018 to remove space of lr_date[' ' as lr_date]
/*testlrD=" ";
tabSeparatedData.append ("<lr_date>").append("<![CDATA[" + testlrD +"]]>").append("</lr_date>");*/
testlrD="";
tabSeparatedData.append ("<lr_date>").append("<![CDATA["+testlrD+"]]>").append("</lr_date>");
}
tabSeparatedData.append ("<stan_fr>").append("<![CDATA[" + (rs.getString(3)==null?" ":rs.getString(3)) +"]]>").append("</stan_fr>");
tabSeparatedData.append ("<stan_to>").append("<![CDATA[" + (rs.getString(4)==null?" ":rs.getString(4)) +"]]>").append("</stan_to>");
tabSeparatedData.append ("<tran_id>").append("<![CDATA[" + (rs.getString(5)==null?" ":rs.getString(5)) +"]]>").append("</tran_id>");
tabSeparatedData.append ("<gross_weight>").append("<![CDATA[" + (rs.getString(6)==null?" ":rs.getString(6)) +"]]>").append("</gross_weight>");
//Done changes on 09APR2018 by sarita[start]gross_weight,no_art,amount,flag_onoff
/*tabSeparatedData.append ("<gross_weight>").append("<![CDATA[" + (rs.getString(6)==null?" ":rs.getString(6)) +"]]>").append("</gross_weight>");
tabSeparatedData.append ("<no_art>").append("<![CDATA[" + (rs.getString(7)==null?" ":rs.getString(7)) +"]]>").append("</no_art>");
tabSeparatedData.append ("<amount>").append("<![CDATA[" + (rs.getString(8)==null?" ":rs.getString(8)) +"]]>").append("</amount>");
tabSeparatedData.append ("<flag_onoff>").append("<![CDATA[" + (rs.getString(9)==null?" ":rs.getString(9)) +"]]>").append("</flag_onoff>");
tabSeparatedData.append ("<flag_onoff>").append("<![CDATA[" + (rs.getString(9)==null?" ":rs.getString(9)) +"]]>").append("</flag_onoff>");*/
tabSeparatedData.append ("<gross_weight>").append("<![CDATA["+(rs.getString(6)==null?"":rs.getString(6).trim())+"]]>").append("</gross_weight>");
tabSeparatedData.append ("<no_art>").append("<![CDATA["+(rs.getString(7)==null?"":rs.getString(7).trim())+"]]>").append("</no_art>");
tabSeparatedData.append ("<amount>").append("<![CDATA["+(rs.getString(8)==null?"":rs.getString(8).trim())+"]]>").append("</amount>");
tabSeparatedData.append ("<flag_onoff>").append("<![CDATA["+(rs.getString(9)==null?"":rs.getString(9).trim())+"]]>").append("</flag_onoff>");
//Done changes on 09APR2018 by sarita[end]gross_weight,no_art,amount,flag_onoff
tabSeparatedData.append ("<bill_no>").append("<![CDATA[" + (rs.getString(10)==null?" ":rs.getString(10)) +"]]>").append("</bill_no>");
tabSeparatedData.append ("<bill_date>").append("<![CDATA[" + (rs.getString(11)==null?" ":rs.getString(11)) +"]]>").append("</bill_date>");
//tabSeparatedData.append ("<bill_date>").append("<![CDATA[" + (rs.getString(11)==null?" ":rs.getString(11)) +"]]>").append("</bill_date>");
/*changes by sarita on 09APR2018 to remove space of bill_date [' ' as bill_date]
tabSeparatedData.append ("<bill_date>").append("<![CDATA[" + (rs.getString(11)==null?"":rs.getString(11)) +"]]>").append("</bill_date>");*/
tabSeparatedData.append ("<bill_date>").append("<![CDATA["+(rs.getString(11)==null?"":rs.getString(11).trim())+"]]>").append("</bill_date>");
tabSeparatedData.append ("<curr_code>").append("<![CDATA[" + (rs.getString(12)==null?" ":rs.getString(12)) +"]]>").append("</curr_code>");
tabSeparatedData.append ("<site_code>").append("<![CDATA[" + (rs.getString(13)==null?" ":rs.getString(13)) +"]]>").append("</site_code>");
tabSeparatedData.append ("<tran_date>").append("<![CDATA[" + (rs.getString(14)==null?" ":rs.getString(14)) +"]]>").append("</tran_date>");
/*changes by sarita on 09APR2018 to remove space of bill_date [' ' as tran_date]
tabSeparatedData.append ("<tran_date>").append("<![CDATA[" + (rs.getString(14)==null?" ":rs.getString(14)) +"]]>").append("</tran_date>");*/
tabSeparatedData.append ("<tran_date>").append("<![CDATA[" + (rs.getString(14)==null?"":rs.getString(14))+"]]>").append("</tran_date>");
pucOrder=rs.getString(15);
CordDate= rs.getString(16);
System.out.println("CordDate["+CordDate+"]");
......@@ -1029,21 +1094,32 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
}
else
{
CordDate=" ";
tabSeparatedData.append ("<ord_date>").append("<![CDATA[" + CordDate+"]]>").append("</ord_date>");
//changes by sarita on 09APR2018 to remove space of ord_date [porder.ord_date]
/*CordDate=" ";
tabSeparatedData.append ("<ord_date>").append("<![CDATA[" + CordDate+"]]>").append("</ord_date>");*/
CordDate="";
tabSeparatedData.append ("<ord_date>").append("<![CDATA["+CordDate+"]]>").append("</ord_date>");
}
// tabSeparatedData.append ("<ord_date>").append("<![CDATA[" + (rs.getString(16)==null?" ":rs.getString(16)) +"]]>").append("</ord_date>"); ibase3-webitm-fin5-7-17-9
tabSeparatedData.append ("<supp_code>").append("<![CDATA[" + (rs.getString(17)==null?" ":rs.getString(17)) +"]]>").append("</supp_code>");
tabSeparatedData.append ("<supp_name>").append("<![CDATA[" + (rs.getString(18)==null?" ":rs.getString(18)) +"]]>").append("</supp_name>");
tabSeparatedData.append ("<descr>").append("<![CDATA[" + (rs.getString(19)==null?" ":rs.getString(19)) +"]]>").append("</descr>");
tabSeparatedData.append ("<item_code>").append("<![CDATA[" + (rs.getString(20)==null?" ":rs.getString(20)) +"]]>").append("</item_code>");
tabSeparatedData.append ("<quantity>").append("<![CDATA[" + (rs.getString(21)==null?" ":rs.getString(21)) +"]]>").append("</quantity>");
//done changes by sarita to remove space for quantity [start]
//tabSeparatedData.append ("<quantity>").append("<![CDATA[" + (rs.getString(21)==null?" ":rs.getString(21)) +"]]>").append("</quantity>");
tabSeparatedData.append ("<quantity>").append("<![CDATA["+(rs.getString(21)==null?"":rs.getString(21).trim())+"]]>").append("</quantity>");
//done changes by sarita to remove space for quantity [end]
unit=rs.getString(22);
// taxamt=rs.getString(23);
tabSeparatedData.append ("<ref_ser>").append("<![CDATA[" + (rs.getString(23)==null?" ":rs.getString(23))+"]]>").append("</ref_ser>");
tabSeparatedData.append ("<exp_amt>").append("<![CDATA[" + (rs.getString(24)==null?" ":rs.getString(24))+"]]>").append("</exp_amt>");
//done changes by sarita to remove space [start]exp_amt,clg_chg,adl_amount
/*tabSeparatedData.append ("<exp_amt>").append("<![CDATA[" + (rs.getString(24)==null?" ":rs.getString(24))+"]]>").append("</exp_amt>");
tabSeparatedData.append ("<clg_chg>").append("<![CDATA[" + (rs.getString(25)==null?" ":rs.getString(25))+"]]>").append("</clg_chg>");
tabSeparatedData.append ("<adl_amount>").append("<![CDATA[" + (rs.getString(26)==null?" ":rs.getString(26))+"]]>").append("</adl_amount>");
tabSeparatedData.append ("<adl_amount>").append("<![CDATA[" + (rs.getString(26)==null?" ":rs.getString(26))+"]]>").append("</adl_amount>");*/
tabSeparatedData.append ("<exp_amt>").append("<![CDATA["+(rs.getString(24)==null?"":rs.getString(24).trim())+"]]>").append("</exp_amt>");
tabSeparatedData.append ("<clg_chg>").append("<![CDATA["+(rs.getString(25)==null?"":rs.getString(25).trim())+"]]>").append("</clg_chg>");
tabSeparatedData.append ("<adl_amount>").append("<![CDATA["+(rs.getString(26)==null?"":rs.getString(26).trim())+"]]>").append("</adl_amount>");
//done changes by sarita to remove space [end]exp_amt,clg_chg,adl_amount
tabSeparatedData.append ("<ref_line_no>").append("<![CDATA[" + (rs.getString(27)==null?" ":rs.getString(27)) +"]]>").append("</ref_line_no>");
tabSeparatedData.append ("<purc_order>").append("<![CDATA[" + (rs.getString(28)==null?" ":rs.getString(28)) +"]]>").append("</purc_order>");
tabSeparatedData.append ("<invoice_no>").append("<![CDATA[" + (rs.getString(29)==null?" ":rs.getString(29)) +"]]>").append("</invoice_no>");
......@@ -1367,9 +1443,9 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
System.out.println("Sql Fired :::::"+sql);
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1, dateFrom);
System.out.println("Setting From Date:::["+dateFrom+"]");
System.out.println("Setting From Date:::123["+dateFrom+"]");
pstmt.setTimestamp(2, dateTo);
System.out.println("Setting To Date:::["+dateTo+"]");
System.out.println("Setting To Date:::123["+dateTo+"]");
rs = pstmt.executeQuery();
while(rs.next())
{
......@@ -1390,16 +1466,25 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
}
else
{
testlrD=" ";
tabSeparatedData.append ("<lr_date>").append("<![CDATA[" + testlrD +"]]>").append("</lr_date>");
//changes by sarita on 09APR2018 to remove space of ord_date [despatch.lr_date]
/*testlrD=" ";
tabSeparatedData.append ("<lr_date>").append("<![CDATA[" + testlrD +"]]>").append("</lr_date>");*/
testlrD="";
tabSeparatedData.append ("<lr_date>").append("<![CDATA["+testlrD+"]]>").append("</lr_date>");
}
tabSeparatedData.append ("<stan_fr>").append("<![CDATA[" + (rs.getString(3)==null?" ":rs.getString(3)) +"]]>").append("</stan_fr>");
tabSeparatedData.append ("<stan_to>").append("<![CDATA[" + (rs.getString(4)==null?" ":rs.getString(4)) +"]]>").append("</stan_to>");
tabSeparatedData.append ("<tran_id>").append("<![CDATA[" + (rs.getString(5)==null?" ":rs.getString(5)) +"]]>").append("</tran_id>");
tabSeparatedData.append ("<gross_weight>").append("<![CDATA[" + (rs.getString(6)==null?" ":rs.getString(6)) +"]]>").append ("</gross_weight>");
//changes by sarita on 09APR2018 to remove space [start]gross_weight,no_art,amount,flag_onoff
/*tabSeparatedData.append ("<gross_weight>").append("<![CDATA[" + (rs.getString(6)==null?" ":rs.getString(6)) +"]]>").append ("</gross_weight>");
tabSeparatedData.append ("<no_art>").append("<![CDATA[" + (rs.getString(7)==null?" ":rs.getString(7)) +"]]>").append("</no_art>");
tabSeparatedData.append ("<amount>").append("<![CDATA[" + (rs.getString(8)==null?" ":rs.getString(8)) +"]]>").append("</amount>");
tabSeparatedData.append ("<flag_onoff>").append("<![CDATA[" + (rs.getString(9)==null?" ":rs.getString(9)) +"]]>").append("</flag_onoff>");
tabSeparatedData.append ("<flag_onoff>").append("<![CDATA[" + (rs.getString(9)==null?" ":rs.getString(9)) +"]]>").append("</flag_onoff>");*/
tabSeparatedData.append ("<gross_weight>").append("<![CDATA["+(rs.getString(6)==null?"":rs.getString(6).trim())+"]]>").append ("</gross_weight>");
tabSeparatedData.append ("<no_art>").append("<![CDATA["+(rs.getString(7)==null?"":rs.getString(7).trim())+"]]>").append("</no_art>");
tabSeparatedData.append ("<amount>").append("<![CDATA["+(rs.getString(8)==null?"":rs.getString(8).trim())+"]]>").append("</amount>");
tabSeparatedData.append ("<flag_onoff>").append("<![CDATA["+(rs.getString(9)==null?"":rs.getString(9).trim())+"]]>").append("</flag_onoff>");
//changes by sarita on 09APR2018 to remove space [end]gross_weight,no_art,amount,flag_onoff
tabSeparatedData.append ("<bill_no>").append("<![CDATA[" + (rs.getString(10)==null?" ":rs.getString(10)) +"]]>").append("</bill_no>");
//tabSeparatedData.append ("<bill_date>").append("<![CDATA[" + (rs.getString(11)==null?" ":sdf.format(rs.getString(11))) +"]]>").append("</bill_date>");
String testBill=rs.getString(11);//ibase3-webitm-fin5-7-17-7
......@@ -1410,12 +1495,14 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
System.out.println("d1["+d1+"]");
billDate= sdf.format(d1);
System.out.println("billDate["+billDate+"]");
tabSeparatedData.append ("<bill_date>").append("<![CDATA[" +billDate +"]]>").append("</bill_date>");
tabSeparatedData.append ("<bill_date>").append("<![CDATA["+billDate+"]]>").append("</bill_date>");
}
else
{
testBill=" ";
tabSeparatedData.append ("<bill_date>").append("<![CDATA[" +testBill +"]]>").append("</bill_date>");
/*testBill=" ";//changes by sarita on 09APR2018 to remove bill_date space
tabSeparatedData.append ("<bill_date>").append("<![CDATA[" +testBill +"]]>").append("</bill_date>");*/
testBill="";
tabSeparatedData.append ("<bill_date>").append("<![CDATA["+testBill+"]]>").append("</bill_date>");
}
tabSeparatedData.append ("<curr_code>").append("<![CDATA[" + (rs.getString(12)==null?" ":rs.getString(12)) +"]]>").append("</curr_code>");
tabSeparatedData.append ("<site_code>").append("<![CDATA[" + (rs.getString(13)==null?" ":rs.getString(13)) +"]]>").append("</site_code>");
......@@ -1432,19 +1519,32 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
}
else
{
testTran=" ";
tabSeparatedData.append ("<tran_date>").append("<![CDATA[" + testTran +"]]>").append("</tran_date>");
//changes by sarita on 09APR2018 to remove tran_date space [sreturn.tran_date]
/*testTran=" ";
tabSeparatedData.append ("<tran_date>").append("<![CDATA[" + testTran +"]]>").append("</tran_date>");*/
testTran="";
tabSeparatedData.append ("<tran_date>").append("<![CDATA["+testTran+"]]>").append("</tran_date>");
}
tabSeparatedData.append ("<ord_date>").append("<![CDATA[" + (rs.getString(15)==null?" ":rs.getString(15)) +"]]>").append("</ord_date>");
//changes by sarita on 09APR2018 to remove ord_date space [' ' as ord_date]
//tabSeparatedData.append ("<ord_date>").append("<![CDATA[" + (rs.getString(15)==null?" ":rs.getString(15)) +"]]>").append("</ord_date>");
tabSeparatedData.append ("<ord_date>").append("<![CDATA["+(rs.getString(15)==null?"":rs.getString(15).trim())+"]]>").append("</ord_date>");
tabSeparatedData.append ("<supp_code>").append("<![CDATA[" + (rs.getString(16)==null?" ":rs.getString(16)) +"]]>").append("</supp_code>");
tabSeparatedData.append ("<supp_name>").append("<![CDATA[" + (rs.getString(17)==null?" ":rs.getString(17)) +"]]>").append("</supp_name>");
tabSeparatedData.append ("<descr>").append("<![CDATA[" + (rs.getString(18)==null?" ":rs.getString(18)) +"]]>").append("</descr>");
tabSeparatedData.append ("<item_code>").append("<![CDATA[" + (rs.getString(19)==null?" ":rs.getString(19)) +"]]>").append("</item_code>");
tabSeparatedData.append ("<quantity>").append("<![CDATA[" + (rs.getString(20)==null?" ":rs.getString(20)) +"]]>").append("</quantity>");
//done changes by sarita on 09APR2018 to remove space quantity [start]
//tabSeparatedData.append ("<quantity>").append("<![CDATA[" + (rs.getString(20)==null?" ":rs.getString(20)) +"]]>").append("</quantity>");
tabSeparatedData.append ("<quantity>").append("<![CDATA["+(rs.getString(20)==null?"":rs.getString(20).trim()) +"]]>").append("</quantity>");
//done changes by sarita on 09APR2018 to remove space quantity [end]
tabSeparatedData.append ("<ref_ser>").append("<![CDATA[" +(rs.getString(21)==null?" ":rs.getString(21)) +"]]>").append("</ref_ser>");
tabSeparatedData.append ("<exp_amt>").append("<![CDATA[" + (rs.getString(22)==null?" ":rs.getString(22))+ "]]>").append("</exp_amt>");
//done changes by sarita on 09APR2018 to remove space [start] exp_amt,clg_chg,adl_amount
/*tabSeparatedData.append ("<exp_amt>").append("<![CDATA[" + (rs.getString(22)==null?" ":rs.getString(22))+ "]]>").append("</exp_amt>");
tabSeparatedData.append ("<clg_chg>").append("<![CDATA[" + (rs.getString(23)==null?" ":rs.getString(23))+ "]]>").append("</clg_chg>");
tabSeparatedData.append ("<adl_amount>").append("<![CDATA[" + (rs.getString(24)==null?" ":rs.getString(24))+ "]]>").append("</adl_amount>");
tabSeparatedData.append ("<adl_amount>").append("<![CDATA[" + (rs.getString(24)==null?" ":rs.getString(24))+ "]]>").append("</adl_amount>");*/
tabSeparatedData.append ("<exp_amt>").append("<![CDATA["+(rs.getString(22)==null?"":rs.getString(22).trim())+"]]>").append("</exp_amt>");
tabSeparatedData.append ("<clg_chg>").append("<![CDATA["+(rs.getString(23)==null?"":rs.getString(23).trim())+"]]>").append("</clg_chg>");
tabSeparatedData.append ("<adl_amount>").append("<![CDATA["+(rs.getString(24)==null?"":rs.getString(24).trim())+"]]>").append("</adl_amount>");
//done changes by sarita on 09APR2018 to remove space [end] exp_amt,clg_chg,adl_amount
tabSeparatedData.append ("<ref_line_no>").append("<![CDATA[" + (rs.getString(25)==null?" ":rs.getString(25)) +"]]>").append("</ref_line_no>");
tabSeparatedData.append ("<purc_order>").append("<![CDATA[" + (rs.getString(26)==null?" ":rs.getString(26)) +"]]>").append("</purc_order>");
tabSeparatedData.append ("<invoice_no>").append("<![CDATA[" + (rs.getString(27)==null?" ":rs.getString(27)) +"]]>").append("</invoice_no>");
......@@ -2488,6 +2588,8 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
String termID = GenericUtility.getInstance().getValueFromXTRA_PARAMS(xtraParams,"termId");
System.out.println("site_code__fr ["+lssitefr+"] , site__code_to ["+lssiteto+"]");
if(conn != null){System.out.println("It is Connected");}else {conn = getConnection();System.out.println("Not Connected!!");}
//select count(*) from site a, site b where a.FIN_ENTITY = b.FIN_ENTITY and a.site_code = ? and b.site_code = ?
sql="select count(*) from site a, site b where a.FIN_ENTITY = b.FIN_ENTITY and a.site_code = ? and b.site_code = ?";
pstmt = conn.prepareStatement(sql);
......@@ -3401,7 +3503,6 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
}
/*if(lstrantype==null)
{
lstrantype=" ";
xmlBuff.append("<tran_type><![CDATA[" + lstrantype.trim() + "]]></tran_type>");
}
else
......@@ -3741,3 +3842,4 @@ public class PayVoucherComPrc extends ProcessEJB implements PayVoucherComPrcLoca
}
}
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