Commit fc756186 authored by asikarwar's avatar asikarwar

after solve the amount issue


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91660 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8a793ebc
...@@ -434,7 +434,7 @@ implements ReceiptAdvLocal, ReceiptAdvRemote ...@@ -434,7 +434,7 @@ implements ReceiptAdvLocal, ReceiptAdvRemote
} }
} }
} }
} }
else if (childNodeName.equalsIgnoreCase("cctr_code__cf")) else if (childNodeName.equalsIgnoreCase("cctr_code__cf"))
{ {
cctrCodeCf = this.genericUtility.getColumnValue("cctr_code__cf", dom); cctrCodeCf = this.genericUtility.getColumnValue("cctr_code__cf", dom);
...@@ -464,7 +464,7 @@ implements ReceiptAdvLocal, ReceiptAdvRemote ...@@ -464,7 +464,7 @@ implements ReceiptAdvLocal, ReceiptAdvRemote
} }
effDate = dateFormat2.parse(this.genericUtility.getColumnValue("eff_date", dom)); effDate = dateFormat2.parse(this.genericUtility.getColumnValue("eff_date", dom));
tranType = this.genericUtility.getColumnValue("tran_type", dom); tranType = this.genericUtility.getColumnValue("tran_type", dom);
if(tranType != null || tranType.trim().length() != 0) if(tranType != null && tranType.trim().length() != 0)
{ {
if (tranType.equals("L")) if (tranType.equals("L"))
{ {
...@@ -1094,12 +1094,13 @@ implements ReceiptAdvLocal, ReceiptAdvRemote ...@@ -1094,12 +1094,13 @@ implements ReceiptAdvLocal, ReceiptAdvRemote
if (rs.next()) if (rs.next())
{ {
cnt = rs.getInt(1); cnt = rs.getInt(1);
if (cnt == 0) }
{ if (cnt == 0)
errCode = "VMREF1"; {
errList.add(errCode); errCode = "VMREF1";
errFields.add(childNodeName.toLowerCase()); errList.add(errCode);
} errFields.add(childNodeName.toLowerCase());
}
sql = "select tot_amt, adj_amt, bank_code from misc_payables where tran_ser = ? and ref_no = ?"; sql = "select tot_amt, adj_amt, bank_code from misc_payables where tran_ser = ? and ref_no = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, "E-FUND"); pstmt.setString(1, "E-FUND");
...@@ -1118,19 +1119,12 @@ implements ReceiptAdvLocal, ReceiptAdvRemote ...@@ -1118,19 +1119,12 @@ implements ReceiptAdvLocal, ReceiptAdvRemote
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
if (bankCode.trim().equals(hbankCode.trim())) if (!bankCode.trim().equals(hbankCode.trim()))
{ {
errCode = "VTBNKBD1"; errCode = "VTBNKBD1";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }
}
else
{
errCode = "VMREFNO";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
...@@ -1151,7 +1145,7 @@ implements ReceiptAdvLocal, ReceiptAdvRemote ...@@ -1151,7 +1145,7 @@ implements ReceiptAdvLocal, ReceiptAdvRemote
{ {
hcurrCode = this.genericUtility.getColumnValue("curr_code", dom1); hcurrCode = this.genericUtility.getColumnValue("curr_code", dom1);
exchRate = doublevalue(this.genericUtility.getColumnValue("exch_rate", dom)); exchRate = doublevalue(this.genericUtility.getColumnValue("exch_rate", dom));
if ((currCode.trim().equalsIgnoreCase(hcurrCode.trim())) && (exchRate != 1.0)) if (!currCode.trim().equalsIgnoreCase(hcurrCode.trim()) && (exchRate != 1.0))
{ {
errCode = "VTCUR3"; errCode = "VTCUR3";
errList.add(errCode); errList.add(errCode);
...@@ -1516,7 +1510,7 @@ implements ReceiptAdvLocal, ReceiptAdvRemote ...@@ -1516,7 +1510,7 @@ implements ReceiptAdvLocal, ReceiptAdvRemote
} }
else if ((siteSpec != null) && (!siteSpec.equals("Y"))) else if ((siteSpec != null) && (!siteSpec.equals("Y")))
{ {
sql = "select count(*) from site_account where site_code = ? and acct_code = ?"; sql = "C = ? and acct_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, sitecode); pstmt.setString(1, sitecode);
...@@ -1640,13 +1634,13 @@ implements ReceiptAdvLocal, ReceiptAdvRemote ...@@ -1640,13 +1634,13 @@ implements ReceiptAdvLocal, ReceiptAdvRemote
{ {
cnt = rs.getInt(1); cnt = rs.getInt(1);
} }
if (cnt < 1) if (cnt == 0)
{ {
errCode = "VMBANK1"; errCode = "VMBANK1";
} }
else else
{ {
sql = "select site_code_value from bank where bank_code = ?"; sql = "select site_code from bank where bank_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, bankCode); pstmt.setString(1, bankCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -1654,7 +1648,7 @@ implements ReceiptAdvLocal, ReceiptAdvRemote ...@@ -1654,7 +1648,7 @@ implements ReceiptAdvLocal, ReceiptAdvRemote
{ {
siteCodel = rs.getString(1); siteCodel = rs.getString(1);
} }
if (!siteCodel.trim().equalsIgnoreCase(siteCodel.trim())) if (!siteCodel.trim().equalsIgnoreCase(siteCode.trim()))
{ {
errCode = "VTBANKMIS"; errCode = "VTBANKMIS";
} }
...@@ -3000,11 +2994,11 @@ implements ReceiptAdvLocal, ReceiptAdvRemote ...@@ -3000,11 +2994,11 @@ implements ReceiptAdvLocal, ReceiptAdvRemote
{ {
currDescr = rs.getString(1); currDescr = rs.getString(1);
} }
valueXmlString.append("<curr_code>").append("<![CDATA[" + currCode + "]]>").append("</curr_code>"); valueXmlString.append("<curr_code>").append("<![CDATA[" + currCode + "]]>").append("</curr_code>");
valueXmlString.append("<currency_descr>").append("<![CDATA[" + currDescr + "]]>").append("</currency_descr>"); valueXmlString.append("<currency_descr>").append("<![CDATA[" + currDescr + "]]>").append("</currency_descr>");
valueXmlString.append("<exch_rate>").append("<![CDATA[" + exchRate + "]]>").append("</exch_rate>"); valueXmlString.append("<exch_rate>").append("<![CDATA[" + exchRate + "]]>").append("</exch_rate>");
valueXmlString.append("<tran_date>").append("<![CDATA[" + simpleDateFormat.format(dueDate)+ "]]>").append("</tran_date>"); valueXmlString.append("<tran_date>").append("<![CDATA[" + dueDate == null? "":simpleDateFormat.format(dueDate) + "]]>").append("</tran_date>");
valueXmlString.append("<amount>").append("<![CDATA[" + (adjAmt - totAmt) + "]]>").append("</amount>"); valueXmlString.append("<amount>").append("<![CDATA[" + (adjAmt - totAmt) + "]]>").append("</amount>");
valueXmlString.append("<sundry_type>").append("<![CDATA[" + sundryType + "]]>").append("</sundry_type>"); valueXmlString.append("<sundry_type>").append("<![CDATA[" + sundryType + "]]>").append("</sundry_type>");
valueXmlString.append("<sundry_code>").append("<![CDATA[" + sundryCode + "]]>").append("</sundry_code>"); valueXmlString.append("<sundry_code>").append("<![CDATA[" + sundryCode + "]]>").append("</sundry_code>");
......
/******************************************************** /********************************************************
Title : InsuranceLocal Title : ReceiptAdvLocal
Date : 26/07/2011 Date : 04/03/2012
Developer: Akhilesh Sikarwar Developer: Akhilesh Sikarwar
********************************************************/ ********************************************************/
......
/******************************************************** /********************************************************
Title : InsuranceRemote Title : ReceiptAdvRemote
Date : 04/11/2011 Date : 04/02/2012
Developer: Akhilesh Sikarwar Developer: Akhilesh Sikarwar
********************************************************/ ********************************************************/
package ibase.webitm.ejb.fin; package ibase.webitm.ejb.fin;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import org.w3c.dom.*; import org.w3c.dom.*;
import ibase.webitm.ejb.*; import ibase.webitm.ejb.*;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import javax.ejb.Local;
import javax.ejb.Remote; // added for ejb3 import javax.ejb.Remote; // added for ejb3
@Remote @Remote // added for ejb3
public interface ReceiptAdvRemote extends ValidatorRemote { public interface ReceiptAdvRemote extends ValidatorRemote {
......
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