Skip to content

B
business-java
Commit 14857370 authored by pchavan's avatar pchavan
Browse files
Options 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@190989 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 75a6e0cf
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 73 deletions
webitm-fin/ibase/webitm/ejb/fin/BankRecoWizIC.java
View file @ 14857370
...@@ -893,20 +893,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -893,20 +893,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("valueXmlString of CallByItemChange(getXMLTransData) :"+valueXmlString); System.out.println("valueXmlString of CallByItemChange(getXMLTransData) :"+valueXmlString);
}else{ }else{
System.out.println("filter::::"); System.out.println("filter::::");
//Change By PriyankaC on on 18-SEP-2018
/*sql = " select bs.site_code,bs.bank_code,bs.TRAN_ID tran_id,bs.REF_NO ref_no," +
" to_char(bs.REF_DATE,'DD-MON-YY') ref_date," +
" bs.REF_MODE ref_mode,bs.AMOUNT amount,bs.TRAN_TYPE tran_type," +
" bs.EDI_REF EDI_REF_BS,bs.REMARKS remarks,bs.STAT_NO stat_no," +
" to_char(bs.STAT_DATE,'DD-MON-YY') stat_date," +
" bs.STATUS status," +
//" bs.AMT_ADJ amt_adj," +
" 0 as amt_adj," +
" to_char(bs.EFF_DATE,'DD-MON-YY') eff_date," +
" bs.DATE__FROM DATE__FROM_BS,bs.DATE__TO DATE__TO_BS," +
" bs.STATUS_DATE STATUS_DATE_BS,bs.EXCH_RATE exch_rate,bs.CURR_CODE curr_code" +
" from bank_statement bs where bs.site_code=? and bs.bank_code=? and status in ('E', 'P') " ;
*/
sql = " select bs.site_code,bs.bank_code,bs.TRAN_ID tran_id,bs.REF_NO ref_no," + sql = " select bs.site_code,bs.bank_code,bs.TRAN_ID tran_id,bs.REF_NO ref_no," +
" to_char(bs.REF_DATE,'DD-MON-YY') ref_date," + " to_char(bs.REF_DATE,'DD-MON-YY') ref_date," +
" bs.REF_MODE ref_mode,bs.AMOUNT amount,bs.TRAN_TYPE tran_type," + " bs.REF_MODE ref_mode,bs.AMOUNT amount,bs.TRAN_TYPE tran_type," +
...@@ -918,11 +905,10 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -918,11 +905,10 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
" to_char(bs.EFF_DATE,'DD-MON-YY') eff_date," + " to_char(bs.EFF_DATE,'DD-MON-YY') eff_date," +
" bs.DATE__FROM DATE__FROM_BS,bs.DATE__TO DATE__TO_BS," + " bs.DATE__FROM DATE__FROM_BS,bs.DATE__TO DATE__TO_BS," +
" bs.STATUS_DATE STATUS_DATE_BS,bs.EXCH_RATE exch_rate,bs.CURR_CODE curr_code" + " bs.STATUS_DATE STATUS_DATE_BS,bs.EXCH_RATE exch_rate,bs.CURR_CODE curr_code" +
" from bank_statement bs where bs.site_code=? and bs.bank_code=? and status in ('E', 'P') and (bs.EFF_DATE) <=( ?)" ; " from bank_statement bs where bs.site_code=? and bs.bank_code=? and status in ('E', 'P') " ;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode); pstmt.setString(1,siteCode);
pstmt.setString(2,bankCode); pstmt.setString(2,bankCode);
pstmt.setTimestamp(3, java.sql.Timestamp.valueOf(validupto));//Added By PriyankaC on 18-SEP-2018
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
...@@ -953,24 +939,6 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -953,24 +939,6 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
//Change By PriyankaC on on 18-SEP-2018
/*sql = " select bt.site_code,bt.bank_code,bt.TRAN_ID tran_id," +
" to_char(bt.TRAN_DATE,'DD-MON-YY') TRAN_DATE_BT," +
" bt.TRAN_SER TRAN_SER_BT," +
" bt.TRAN_NO TRAN_NO_BT,bt.REF_NO ref_no," +
" to_char(bt.REF_DATE,'DD-MON-YY') ref_date," +
" bt.REF_MODE ref_mode," +
" bt.AMOUNT amount,bt.TRAN_TYPE tran_type,bt.ACCT_CODE acct_code," +
" bt.CCTR_CODE cctr_code,bt.SUNDRY_CODE sundry_code,bt.STATUS status ," +
" bt.REMARKS remarks," +
" 0 as amt_adj," +
//" bt.AMT_ADJ amt_adj," +
"bt.SUNDRY_TYPE SUNDRY_TYPE_BT," +
" bt.EXCH_RATE exch_rate,bt.CURR_CODE curr_code from " +
" banktran_log bt where " +
" bt.site_code=? and bt.bank_code=? and status in ('E', 'P') ";*/
sql = " select bt.site_code,bt.bank_code,bt.TRAN_ID tran_id," + sql = " select bt.site_code,bt.bank_code,bt.TRAN_ID tran_id," +
" to_char(bt.TRAN_DATE,'DD-MON-YY') TRAN_DATE_BT," + " to_char(bt.TRAN_DATE,'DD-MON-YY') TRAN_DATE_BT," +
" bt.TRAN_SER TRAN_SER_BT," + " bt.TRAN_SER TRAN_SER_BT," +
...@@ -985,11 +953,10 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -985,11 +953,10 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
"bt.SUNDRY_TYPE SUNDRY_TYPE_BT," + "bt.SUNDRY_TYPE SUNDRY_TYPE_BT," +
" bt.EXCH_RATE exch_rate,bt.CURR_CODE curr_code from " + " bt.EXCH_RATE exch_rate,bt.CURR_CODE curr_code from " +
" banktran_log bt where " + " banktran_log bt where " +
" bt.site_code=? and bt.bank_code=? and status in ('E', 'P') and TRAN_DATE <= ? "; " bt.site_code=? and bt.bank_code=? and status in ('E', 'P') ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode); pstmt.setString(1,siteCode);
pstmt.setString(2,bankCode); pstmt.setString(2,bankCode);
pstmt.setTimestamp(3, java.sql.Timestamp.valueOf(validupto)); //Added By PriyankaC on 18-sep-2018
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
...@@ -1053,21 +1020,6 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -1053,21 +1020,6 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
return valueXmlString; return valueXmlString;
} }
//Changed By PriyankaC on 18-SEP-2018.
/*sql = "select bs.TRAN_ID tran_id,bs.REF_NO ref_no," +
" to_char(bs.REF_DATE,'DD-MON-YY') ref_date," +
" bs.REF_MODE ref_mode,bs.AMOUNT amount,bs.TRAN_TYPE tran_type," +
" bs.EDI_REF EDI_REF_BS,bs.REMARKS remarks,bs.STAT_NO stat_no," +
" to_char(bs.STAT_DATE,'DD-MON-YY') stat_date," +
" bs.STATUS status," +
" 0 as amt_adj," +
//" bs.AMT_ADJ amt_adj," +
" to_char(bs.EFF_DATE,'DD-MON-YY') eff_date," +
" bs.DATE__FROM DATE__FROM_BS,bs.DATE__TO DATE__TO_BS," +
" bs.STATUS_DATE STATUS_DATE_BS,bs.EXCH_RATE exch_rate,bs.CURR_CODE curr_code" +
" from bank_statement bs where bs.site_code=? and bs.bank_code=? and status in ('E', 'P') " ;
*/
sql = "select bs.TRAN_ID tran_id,bs.REF_NO ref_no," + sql = "select bs.TRAN_ID tran_id,bs.REF_NO ref_no," +
" to_char(bs.REF_DATE,'DD-MON-YY') ref_date," + " to_char(bs.REF_DATE,'DD-MON-YY') ref_date," +
" bs.REF_MODE ref_mode,bs.AMOUNT amount,bs.TRAN_TYPE tran_type," + " bs.REF_MODE ref_mode,bs.AMOUNT amount,bs.TRAN_TYPE tran_type," +
...@@ -1079,11 +1031,10 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -1079,11 +1031,10 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
" to_char(bs.EFF_DATE,'DD-MON-YY') eff_date," + " to_char(bs.EFF_DATE,'DD-MON-YY') eff_date," +
" bs.DATE__FROM DATE__FROM_BS,bs.DATE__TO DATE__TO_BS," + " bs.DATE__FROM DATE__FROM_BS,bs.DATE__TO DATE__TO_BS," +
" bs.STATUS_DATE STATUS_DATE_BS,bs.EXCH_RATE exch_rate,bs.CURR_CODE curr_code" + " bs.STATUS_DATE STATUS_DATE_BS,bs.EXCH_RATE exch_rate,bs.CURR_CODE curr_code" +
" from bank_statement bs where bs.site_code=? and bs.bank_code=? and status in ('E', 'P') and eff_date <= ?" ; " from bank_statement bs where bs.site_code=? and bs.bank_code=? and status in ('E', 'P')" ;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode); pstmt.setString(1,siteCode);
pstmt.setString(2,bankCode); pstmt.setString(2,bankCode);
pstmt.setTimestamp(3, java.sql.Timestamp.valueOf(validupto)); //Added By PriyankaC on 18-sep-2018.
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -1270,23 +1221,6 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -1270,23 +1221,6 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
System.out.println("@@@@@@@ RefBSHashMap["+RefBSHashMap+"]"); System.out.println("@@@@@@@ RefBSHashMap["+RefBSHashMap+"]");
System.out.println("@@@@@@@ tranIdBSMap["+tranIdBSMap+"]"); System.out.println("@@@@@@@ tranIdBSMap["+tranIdBSMap+"]");
//Changed By PriyankaC on 18-SEp-2018
/*sql = " select bt.TRAN_ID tran_id," +
" to_char(bt.TRAN_DATE,'DD-MON-YY') TRAN_DATE_BT," +
" bt.TRAN_SER TRAN_SER_BT," +
" bt.TRAN_NO TRAN_NO_BT,bt.REF_NO ref_no," +
" to_char(bt.REF_DATE,'DD-MON-YY') ref_date," +
" bt.REF_MODE ref_mode," +
" bt.AMOUNT amount,bt.TRAN_TYPE tran_type,bt.ACCT_CODE acct_code," +
" bt.CCTR_CODE cctr_code,bt.SUNDRY_CODE sundry_code,bt.STATUS status ," +
" bt.REMARKS remarks," +
" 0 as amt_adj," +
//" bt.AMT_ADJ amt_adj," +
" bt.SUNDRY_TYPE SUNDRY_TYPE_BT," +
" bt.EXCH_RATE exch_rate,bt.CURR_CODE curr_code from " +
" banktran_log bt where " +
" bt.site_code=? and bt.bank_code=? and status in ('E', 'P')";
*/
sql = " select bt.TRAN_ID tran_id," + sql = " select bt.TRAN_ID tran_id," +
" to_char(bt.TRAN_DATE,'DD-MON-YY') TRAN_DATE_BT," + " to_char(bt.TRAN_DATE,'DD-MON-YY') TRAN_DATE_BT," +
" bt.TRAN_SER TRAN_SER_BT," + " bt.TRAN_SER TRAN_SER_BT," +
...@@ -1301,11 +1235,10 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B ...@@ -1301,11 +1235,10 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
" bt.SUNDRY_TYPE SUNDRY_TYPE_BT," + " bt.SUNDRY_TYPE SUNDRY_TYPE_BT," +
" bt.EXCH_RATE exch_rate,bt.CURR_CODE curr_code from " + " bt.EXCH_RATE exch_rate,bt.CURR_CODE curr_code from " +
" banktran_log bt where " + " banktran_log bt where " +
" bt.site_code=? and bt.bank_code=? and status in ('E', 'P') and TRAN_DATE <= ?"; " bt.site_code=? and bt.bank_code=? and status in ('E', 'P') ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode); pstmt.setString(1,siteCode);
pstmt.setString(2,bankCode); pstmt.setString(2,bankCode);
pstmt.setTimestamp(3, java.sql.Timestamp.valueOf(validupto)); //Added By PriyankaC on 18-sep-2018.
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
......
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