Skip to content

B
business-java
Commit 8e8c0a08 authored by kshinde's avatar kshinde
Browse files
Options

Bug fix 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@186922 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e70a3f5c
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 23 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/LoanConf.java
View file @ 8e8c0a08
...@@ -171,9 +171,9 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -171,9 +171,9 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
private String loanConfirm(String tranId,String xtraParams,String forcedFlag, Connection conn)throws RemoteException,ITMException private String loanConfirm(String tranId,String xtraParams,String forcedFlag, Connection conn)throws RemoteException,ITMException
{ {
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
PreparedStatement pstmtInsert = null; PreparedStatement pstmt1 = null;
PreparedStatement pstmtInner = null; PreparedStatement pstmtInner = null;
ResultSet rs = null; ResultSet rs = null,rs1=null;
ResultSet rsInner = null; ResultSet rsInner = null;
String sql = "",sqlInsert = "",sqlInner=""; String sql = "",sqlInsert = "",sqlInner="";
String loginEmpCode = "" ; String loginEmpCode = "" ;
...@@ -206,8 +206,8 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -206,8 +206,8 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
SimpleDateFormat sdf = null; SimpleDateFormat sdf = null;
try try
{ {
sdf=new SimpleDateFormat(new E12GenericUtility().getApplDateFormat()); /*sdf=new SimpleDateFormat(new E12GenericUtility().getApplDateFormat());
tranDate=new Timestamp(System.currentTimeMillis()); tranDate=new Timestamp(System.currentTimeMillis());*/
//Getting Data from loan header //Getting Data from loan header
...@@ -247,15 +247,19 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -247,15 +247,19 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
rs=null; rs=null;
//Getting data from loan_detail //Getting data from loan_detail
sql="SELECT L.TRAN_ID,L.LINE_NO, L.REF_SER, L.REF_NO, L.ACCT_CODE,L.CCTR_CODE,L.AMOUNT_PAID," sql="SELECT L.TRAN_ID,L.LINE_NO, L.REF_SER, L.REF_NO, L.ACCT_CODE,L.CCTR_CODE,L.AMOUNT_PAID "
+ "M.SUNDRY_CODE,M.CURR_CODE,M.EXCH_RATE,M.SUNDRY_TYPE FROM LOAN_DET L,MISC_PAYABLES M " + " FROM LOAN_DET L"
+ "WHERE L.tran_id = ? and (L.ref_no=M.ref_no) and L.ref_ser=M.tran_ser"; + " WHERE L.tran_id = ? ";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1, tranId); pstmt.setString(1, tranId);
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
//M.SUNDRY_CODE,M.CURR_CODE,M.EXCH_RATE,M.SUNDRY_TYPE where and (L.ref_no=M.ref_no) and L.ref_ser=M.tran_ser
detailExist=true; detailExist=true;
lineNoDet=rs.getString("LINE_NO"); lineNoDet=rs.getString("LINE_NO");
refSerDet=rs.getString("REF_SER"); refSerDet=rs.getString("REF_SER");
...@@ -263,10 +267,24 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -263,10 +267,24 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
AcctCodeDet=rs.getString("ACCT_CODE"); AcctCodeDet=rs.getString("ACCT_CODE");
cctrCodeDet=rs.getString("CCTR_CODE"); cctrCodeDet=rs.getString("CCTR_CODE");
amountPaid=rs.getDouble("AMOUNT_PAID"); amountPaid=rs.getDouble("AMOUNT_PAID");
sundryCodeDet=rs.getString("SUNDRY_CODE");
sundryTypeDet=rs.getString("SUNDRY_TYPE");
currCodeDet=rs.getString("CURR_CODE");
exchRateDet=rs.getDouble("EXCH_RATE"); String sql2="select SUNDRY_CODE,SUNDRY_TYPE,CURR_CODE,EXCH_RATE from misc_payables where ref_no = ? ";
pstmt1=conn.prepareStatement(sql2);
pstmt1.setString(1, refNoDet);
rs1=pstmt1.executeQuery();
if(rs1.next())
{
sundryCodeDet=rs1.getString("SUNDRY_CODE");
sundryTypeDet=rs1.getString("SUNDRY_TYPE");
currCodeDet=rs1.getString("CURR_CODE");
exchRateDet=rs1.getDouble("EXCH_RATE");
}
rs1.close();
rs1=null;
pstmt1.close();
pstmt1=null;
loanDetMap=new HashMap(); loanDetMap=new HashMap();
loanDetMap.put("LINE_NO", lineNoDet); loanDetMap.put("LINE_NO", lineNoDet);
...@@ -314,7 +332,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -314,7 +332,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
{ {
for(HashMap eachdetAmt: loanDetList) for(HashMap eachdetAmt: loanDetList)
{ {
TotdetAmt+=(Double)eachdetAmt.get("AMOUNT_PAID"); TotdetAmt+=(double)eachdetAmt.get("AMOUNT_PAID");
System.out.println("TOT amtdet"+TotdetAmt); System.out.println("TOT amtdet"+TotdetAmt);
} }
System.out.println("HDRAMT["+loanAmthdr+"] DETAMT["+TotdetAmt+"]"); System.out.println("HDRAMT["+loanAmthdr+"] DETAMT["+TotdetAmt+"]");
...@@ -445,7 +463,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -445,7 +463,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
miscPayUpd.put("sundry_code",loanPartyhdr); miscPayUpd.put("sundry_code",loanPartyhdr);
miscPayUpd.put("acct_code",acctCodePay); miscPayUpd.put("acct_code",acctCodePay);
miscPayUpd.put("cctr_code",cctrCodePay); miscPayUpd.put("cctr_code",cctrCodePay);
miscPayUpd.put("due_date",getDueDate(tranDate, loanTenureUnit, loanTenure)); miscPayUpd.put("due_date",getDueDate(tranDatehdr, loanTenureUnit, loanTenure));
miscPayUpd.put("site_code",siteCodehdr); miscPayUpd.put("site_code",siteCodehdr);
miscPayUpd.put("tot_amt",loanAmthdr); miscPayUpd.put("tot_amt",loanAmthdr);
miscPayUpd.put("bank_code",bankCode); miscPayUpd.put("bank_code",bankCode);
...@@ -481,7 +499,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -481,7 +499,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
//--Negative payables towards detail loan party start //--Negative payables towards detail loan party start
miscPayUpd.put("tran_ser","LN-VCH"); miscPayUpd.put("tran_ser","LN-VCH");
miscPayUpd.put("tran_date",tranDate); miscPayUpd.put("tran_date",tranDatehdr);
miscPayUpd.put("ref_no",tranId); miscPayUpd.put("ref_no",tranId);
miscPayUpd.put("bill_no"," "); miscPayUpd.put("bill_no"," ");
miscPayUpd.put("curr_code",currCode); miscPayUpd.put("curr_code",currCode);
...@@ -490,7 +508,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -490,7 +508,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
miscPayUpd.put("sundry_code",sundryCodeDet); miscPayUpd.put("sundry_code",sundryCodeDet);
miscPayUpd.put("acct_code",AcctCodeDet); miscPayUpd.put("acct_code",AcctCodeDet);
miscPayUpd.put("cctr_code",cctrCodeDet); miscPayUpd.put("cctr_code",cctrCodeDet);
miscPayUpd.put("due_date",getDueDate(tranDate, loanTenureUnit, loanTenure)); miscPayUpd.put("due_date",getDueDate(tranDatehdr, loanTenureUnit, loanTenure));
miscPayUpd.put("site_code",siteCodehdr); miscPayUpd.put("site_code",siteCodehdr);
miscPayUpd.put("tot_amt",-amountPaid); miscPayUpd.put("tot_amt",-amountPaid);
miscPayUpd.put("fin_entity",finEnt); miscPayUpd.put("fin_entity",finEnt);
...@@ -510,8 +528,8 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -510,8 +528,8 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
//--negative payables towards detail loan party End //--negative payables towards detail loan party End
//Gltrace debit note to sundry code //Gltrace debit note to sundry code
glTraceUpd.put("tran_date", tranDate); glTraceUpd.put("tran_date", tranDatehdr);
glTraceUpd.put("eff_date", tranDate); glTraceUpd.put("eff_date", tranDatehdr);
glTraceUpd.put("fin_entity", finEnt); glTraceUpd.put("fin_entity", finEnt);
glTraceUpd.put("site_code", siteCodehdr); glTraceUpd.put("site_code", siteCodehdr);
glTraceUpd.put("sundry_type", sundryTypeDet); glTraceUpd.put("sundry_type", sundryTypeDet);
...@@ -532,7 +550,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -532,7 +550,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
} }
//SundryBal debit to sundry code //SundryBal debit to sundry code
sundryBalUpd.put("tran_date", tranDate); sundryBalUpd.put("tran_date", tranDatehdr);
//sundryBalUpd.put("eff_date", effDate); //sundryBalUpd.put("eff_date", effDate);
sundryBalUpd.put("fin_entity", finEnt); sundryBalUpd.put("fin_entity", finEnt);
sundryBalUpd.put("site_code", siteCodehdr); sundryBalUpd.put("site_code", siteCodehdr);
...@@ -556,7 +574,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -556,7 +574,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
///Positive payable against loanParty header Start ///Positive payable against loanParty header Start
miscPayUpd.put("tran_ser","LN-VCH"); //Tran_ser ?? miscPayUpd.put("tran_ser","LN-VCH"); //Tran_ser ??
miscPayUpd.put("tran_date",tranDate); miscPayUpd.put("tran_date",tranDatehdr);
miscPayUpd.put("ref_no",tranId); miscPayUpd.put("ref_no",tranId);
miscPayUpd.put("bill_no"," "); miscPayUpd.put("bill_no"," ");
miscPayUpd.put("curr_code",currCode); miscPayUpd.put("curr_code",currCode);
...@@ -565,7 +583,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -565,7 +583,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
miscPayUpd.put("sundry_code",loanPartyhdr); miscPayUpd.put("sundry_code",loanPartyhdr);
miscPayUpd.put("acct_code",acctCodePay); miscPayUpd.put("acct_code",acctCodePay);
miscPayUpd.put("cctr_code",cctrCodePay); miscPayUpd.put("cctr_code",cctrCodePay);
miscPayUpd.put("due_date",getDueDate(tranDate, loanTenureUnit, loanTenure)); miscPayUpd.put("due_date",getDueDate(tranDatehdr, loanTenureUnit, loanTenure));
miscPayUpd.put("site_code",siteCodehdr); miscPayUpd.put("site_code",siteCodehdr);
miscPayUpd.put("tot_amt",loanAmthdr); miscPayUpd.put("tot_amt",loanAmthdr);
miscPayUpd.put("bank_code",bankCode); miscPayUpd.put("bank_code",bankCode);
...@@ -582,8 +600,8 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -582,8 +600,8 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
{ {
return errString; return errString;
} }
glTraceUpd.put("tran_date", tranDate); glTraceUpd.put("tran_date", tranDatehdr);
glTraceUpd.put("eff_date", tranDate); glTraceUpd.put("eff_date", tranDatehdr);
glTraceUpd.put("fin_entity", finEnt); glTraceUpd.put("fin_entity", finEnt);
glTraceUpd.put("site_code", siteCodehdr); glTraceUpd.put("site_code", siteCodehdr);
glTraceUpd.put("sundry_type", "L"); glTraceUpd.put("sundry_type", "L");
...@@ -605,7 +623,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws ...@@ -605,7 +623,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
} }
sundryBalUpd.put("tran_date", tranDate); sundryBalUpd.put("tran_date", tranDatehdr);
//sundryBalUpd.put("eff_date", effDate); //sundryBalUpd.put("eff_date", effDate);
sundryBalUpd.put("fin_entity", finEnt); sundryBalUpd.put("fin_entity", finEnt);
sundryBalUpd.put("site_code", siteCodehdr); sundryBalUpd.put("site_code", siteCodehdr);
......
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