Skip to content

B
business-java
Commit 6e03b31c authored by ngadkari's avatar ngadkari
Browse files
Options

site code blank allow 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@200946 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 968d4fd3
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 36 deletions
webitm-fin/ibase/webitm/ejb/fin/BankRecoWizIC.java
View file @ 6e03b31c
......@@ -127,7 +127,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
String errString = "";
String errCode = "";
Connection conn = null;
String userId = "",bankCode = "";
String userId = "",bankCode = "",siteCode="";
Date tranDate1,tranDate2;
Timestamp validDate= null;
......@@ -181,6 +181,21 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
}
//firstValue = null;
}
// condition added by nandkumar gadkari on 20/05/19
else if("site_code".equalsIgnoreCase(childNodeName))
{
siteCode = genericUtility.getColumnValue("site_code", dom);
System.out.println("siteCode: " + siteCode);
if (siteCode != null && siteCode.trim().length() > 0) {
cnt = getDBRowCount(conn, "site", "site_code", siteCode);
if (cnt == 0) {
errCode = "VMSITE1";
errString = getErrorString("site_code", errCode, userId);
break;
}
}
}// end of if block for site_code
}
break;
......@@ -426,7 +441,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
}
else
{
sql = "select site_code from bank where bank_code=?";
/*sql = "select site_code from bank where bank_code=?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, bankCode.trim());
rs = pstmt.executeQuery();
......@@ -437,7 +452,8 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
rs.close();
rs = null;
pstmt.close();
pstmt = null;
pstmt = null;*/ //coomented by nandkumar gadkari on 20/05/19
siteCode = genericUtility.getColumnValue("site_code",dom1);
System.out.println("siteCode:"+siteCode);
......@@ -792,12 +808,27 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
" 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') and (bs.EFF_DATE) <=( ?)" ;
" bs.STATUS_DATE STATUS_DATE_BS,bs.EXCH_RATE exch_rate,bs.CURR_CODE curr_code , site_code " +
" from bank_statement bs where ";
//conditon added by nandkumar gadkari on 16/05/19 for blank site code
if(siteCode !=null && siteCode.trim().length()> 0)
{
sql = sql + " bs.site_code=? and ";
}
sql = sql + " bs.bank_code=? and status in ('E', 'P') and (bs.EFF_DATE) <=( ?)" ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
pstmt.setString(2,bankCode);
pstmt.setTimestamp(3, java.sql.Timestamp.valueOf(validupto)); // Added By PriyankaC on 14SEP2018
//conditon added by nandkumar gadkari on 16/05/19 for blank site code
if(siteCode !=null && siteCode.trim().length()> 0)
{
pstmt.setString(1,siteCode);
pstmt.setString(2,bankCode);
pstmt.setTimestamp(3, java.sql.Timestamp.valueOf(validupto)); // Added By PriyankaC on 14SEP2018]
}
else
{
pstmt.setString(1,bankCode);
pstmt.setTimestamp(2, java.sql.Timestamp.valueOf(validupto)); // Added By PriyankaC on 14SEP2018]
}
rs = pstmt.executeQuery();
while(rs.next())
{
......@@ -817,6 +848,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
valueXmlString.append("<amt_adj><![CDATA[").append(checkNull(rs.getString("amt_adj"))).append("]]></amt_adj>");
valueXmlString.append("<status><![CDATA[").append(checkNull(rs.getString("status"))).append("]]></status>");
valueXmlString.append("<exch_rate><![CDATA[").append(checkNull(rs.getString("exch_rate"))).append("]]></exch_rate>");
valueXmlString.append("<site_code><![CDATA[").append(checkNull(rs.getString("site_code"))).append("]]></site_code>");
valueXmlString.append("</Detail>\r\n");
}
rs.close();
......@@ -851,14 +883,28 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
" 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') and TRAN_DATE <= ? ";
" bt.EXCH_RATE exch_rate,bt.CURR_CODE curr_code , site_code from " +
" banktran_log bt where ";
//conditon added by nandkumar gadkari on 16/05/19 for blank site code
if(siteCode !=null && siteCode.trim().length()> 0)
{
sql =sql+ " bt.site_code=? and ";
}
sql =sql + " bt.bank_code=? and status in ('E', 'P') and TRAN_DATE <= ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
pstmt.setString(2,bankCode);
pstmt.setTimestamp(3, java.sql.Timestamp.valueOf(validupto));
rs = pstmt.executeQuery();
//conditon added by nandkumar gadkari on 16/05/19 for blank site code
if(siteCode !=null && siteCode.trim().length()> 0)
{
pstmt.setString(1,siteCode);
pstmt.setString(2,bankCode);
pstmt.setTimestamp(3, java.sql.Timestamp.valueOf(validupto));
}
else
{
pstmt.setString(1,bankCode);
pstmt.setTimestamp(2, java.sql.Timestamp.valueOf(validupto));
}
rs = pstmt.executeQuery();
while(rs.next())
{
System.out.println("curr code:::::"+rs.getString("curr_code"));
......@@ -873,7 +919,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
valueXmlString.append("<ref_mode><![CDATA[").append(checkNull(rs.getString("ref_mode"))).append("]]></ref_mode>");
valueXmlString.append("<tran_id><![CDATA[").append(checkNull(rs.getString("tran_id"))).append("]]></tran_id>");
valueXmlString.append("<tran_type><![CDATA[").append(checkNull(rs.getString("tran_type"))).append("]]></tran_type>");
valueXmlString.append("<site_code><![CDATA[").append(siteCode).append("]]></site_code>");
valueXmlString.append("<site_code><![CDATA[").append(checkNull(rs.getString("site_code"))).append("]]></site_code>");//added by nandkumar gadkari
valueXmlString.append("<acct_code><![CDATA[").append(checkNull(rs.getString("acct_code"))).append("]]></acct_code>");
valueXmlString.append("<cctr_code><![CDATA[").append(checkNull(rs.getString("cctr_code"))).append("]]></cctr_code>");
valueXmlString.append("<sundry_code><![CDATA[").append(checkNull(rs.getString("sundry_code"))).append("]]></sundry_code>");
......@@ -905,11 +951,25 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
" 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') " ;
" from bank_statement bs where ";
//conditon added by nandkumar gadkari on 16/05/19 for blank site code
if(siteCode !=null && siteCode.trim().length()> 0)
{
sql = sql + " bs.site_code=? and ";
}
sql = sql +" bs.bank_code=? and status in ('E', 'P') " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
pstmt.setString(2,bankCode);
//conditon added by nandkumar gadkari on 16/05/19 for blank site code
if(siteCode !=null && siteCode.trim().length()> 0)
{
pstmt.setString(1,siteCode);
pstmt.setString(2,bankCode);
}
else
{
pstmt.setString(1,bankCode);
}
rs = pstmt.executeQuery();
while(rs.next())
{
......@@ -952,11 +1012,24 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
//" 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') ";
" banktran_log bt where " ;
//conditon added by nandkumar gadkari on 16/05/19 for blank site code
if(siteCode !=null && siteCode.trim().length()> 0)
{
sql = sql + " bt.site_code=? and ";
}
sql = sql + " bt.bank_code=? and status in ('E', 'P') ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
pstmt.setString(2,bankCode);
//conditon added by nandkumar gadkari on 16/05/19 for blank site code
if(siteCode !=null && siteCode.trim().length()> 0)
{
pstmt.setString(1,siteCode);
pstmt.setString(2,bankCode);
}
else
{
pstmt.setString(1,bankCode);
}
rs = pstmt.executeQuery();
while(rs.next())
......@@ -1009,7 +1082,7 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
rType ="A";
System.out.println("xmlString(Automatically)!!!!!!! :"+stringBuffer.toString());
System.out.println("siteCode:["+siteCode+"]......bankCode:["+bankCode+"]");
System.out.println("siteCode123:["+siteCode+"]......bankCode:["+bankCode+"]");
if(!"REFNO_DATE_AMT".equalsIgnoreCase(autoReconFilter) && !"REFNO_AMT".equalsIgnoreCase(autoReconFilter))
{
......@@ -1031,11 +1104,24 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
" 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')" ;
" from bank_statement bs where ";
//conditon added by nandkumar gadkari on 16/05/19 for blank site code
if(siteCode !=null && siteCode.trim().length()> 0 && !"null".equals(siteCode) )
{
sql = sql + " bs.site_code=? and ";
}
sql = sql + " bs.bank_code=? and status in ('E', 'P')" ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
pstmt.setString(2,bankCode);
//conditon added by nandkumar gadkari on 16/05/19 for blank site code
if(siteCode !=null && siteCode.trim().length()> 0 && !"null".equals(siteCode))
{
pstmt.setString(1,siteCode);
pstmt.setString(2,bankCode);
}
else
{
pstmt.setString(1,bankCode);
}
rs = pstmt.executeQuery();
while(rs.next())
......@@ -1234,11 +1320,24 @@ public class BankRecoWizIC extends ValidatorEJB implements BankRecoWizICLocal, B
//" 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') ";
" banktran_log bt where " ;
//conditon added by nandkumar gadkari on 16/05/19 for blank site code
if(siteCode !=null && siteCode.trim().length()> 0 && !"null".equals(siteCode))
{
sql = sql + " bt.site_code=? and ";
}
sql = sql + " bt.bank_code=? and status in ('E', 'P') ";
pstmt = conn.prepareStatement(sql);
//conditon added by nandkumar gadkari on 16/05/19 for blank site code
if(siteCode !=null && siteCode.trim().length()> 0 && !"null".equals(siteCode))
{
pstmt.setString(1,siteCode);
pstmt.setString(2,bankCode);
}
else
{
pstmt.setString(1,bankCode);
}
rs = pstmt.executeQuery();
while(rs.next())
{
......
webitm-fin/module-resource/Xsl/bank_reconciliation_wiz2_wiz_en_US_A.xsl
View file @ 6e03b31c
......@@ -509,8 +509,9 @@ thead {
<td class="td_leftAlign" align="left"><div id="status{$cnt}" class="dtRANDATE"><xsl:value-of select="status"/></div></td>
<td class="td_leftAlign" align="left"><div id="exch_rate{$cnt}" class="dsUNDRYTYPE"><xsl:value-of select="exch_rate"/></div></td>
<!-- <td class="hide" align="left"><div id="tran_name{$cnt}" class="dsUNDRYTYPE"><xsl:value-of select="tran_name"/></div></td> -->
<td class="td_leftAlign" align="left"><div id="tran_type{$cnt}" class="dcURRCODE"> <xsl:value-of select="/Root/Detail1/site_code"/></div></td>
<!-- <td class="td_leftAlign" align="left"><div id="tran_type{$cnt}" class="dcURRCODE"> <xsl:value-of select="/Root/Detail1/site_code"/></div></td>-->
<!-- commented and added new by nandkumar gadkari on 20/05/19 for site code -->
<td class="td_leftAlign" align="left"><div id="tran_type{$cnt}" class="dcURRCODE"> <xsl:value-of select="site_code"/></div></td>
</tr>
</xsl:if>
......@@ -697,9 +698,9 @@ thead {
<td class="td_leftAlign" align="left"><div id="amt_adj{$cnt}" class="dcRAMT"><xsl:value-of select="amt_adj"/></div></td>
<td class="td_leftAlign" align="left"><div id="status{$cnt}" class="dtRANDATE"><xsl:value-of select="status"/></div></td>
<td class="td_leftAlign" align="left"><div id="exch_rate{$cnt}" class="dcRAMT" ><xsl:value-of select="exch_rate"/></div></td>
<td class="td_leftAlign" align="left"><div id="tran_type{$cnt}" class="dcURRCODE"> <xsl:value-of select="/Root/Detail1/site_code"/></div></td>
<!-- <td class="td_leftAlign" align="left"><div id="tran_type{$cnt}" class="dcURRCODE"> <xsl:value-of select="/Root/Detail1/site_code"/></div></td>-->
<!-- commented and added new by nandkumar gadkari on 20/05/19 for site code -->
<td class="td_leftAlign" align="left"><div id="tran_type{$cnt}" class="dcURRCODE"> <xsl:value-of select="site_code"/></div></td>
</tr>
......
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