Loan Tracking system

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@187709 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-fin/ibase/webitm/ejb/fin/adv/LoanConf.java

@@ -250,7 +250,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 			rs=null;
 			
 			//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,L.AMOUNT__BC  "
+			sql="SELECT L.TRAN_ID,L.LINE_NO, L.REF_SER,  L.REF_NO, L.ACCT_CODE,L.CCTR_CODE,L.AMOUNT_PAID,L.AMOUNT__BC,L.CURR_CODE,L.EXCH_RATE   "
 				+ " FROM LOAN_DET L"
 				+ " WHERE L.tran_id = ? ";
 
@@ -271,7 +271,8 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 				cctrCodeDet=rs.getString("CCTR_CODE");
 				amountPaid=rs.getDouble("AMOUNT_PAID");
 				amountBC=rs.getDouble("AMOUNT__BC");
-				
+				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);
@@ -281,8 +282,8 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 				{
 					sundryCodeDet=rs1.getString("SUNDRY_CODE");
 					sundryTypeDet=rs1.getString("SUNDRY_TYPE");
-					currCodeDet=rs1.getString("CURR_CODE");
-					exchRateDet=rs1.getDouble("EXCH_RATE");
+					/*currCodeDet=rs1.getString("CURR_CODE");
+					exchRateDet=rs1.getDouble("EXCH_RATE");*/
 				}
 				rs1.close();
 				rs1=null;
@@ -543,8 +544,8 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 					glTraceUpd.put("cctr_code", detailmap.get("CCTR_CODE"));
 					glTraceUpd.put("curr_code",  detailmap.get("CURR_CODE"));
 					glTraceUpd.put("exch_rate", detailmap.get("EXCH_RATE"));
-					//glTraceUpd.put("dr_amt", amountPaid);commented by Nandkumar Gadkari and added amountBC 
-					glTraceUpd.put("dr_amt",detailmap.get("AMOUNT__BC"));
+					//glTraceUpd.put("dr_amt", amountPaid);commented by Nandkumar Gadkari and added AMOUNT_PAID 
+					glTraceUpd.put("dr_amt",detailmap.get("AMOUNT_PAID"));
 					glTraceUpd.put("cr_amt", 0.0);
 					glTraceUpd.put( "ref_ser","LN-VCH");
 					//glTraceUpd.put("ref_type", "D");
@@ -566,8 +567,8 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 					sundryBalUpd.put("cctr_code", detailmap.get("CCTR_CODE"));
 					sundryBalUpd.put("curr_code",  detailmap.get("CURR_CODE"));
 					sundryBalUpd.put("exch_rate",detailmap.get("EXCH_RATE"));
-					//sundryBalUpd.put("dr_amt", amountPaid);commented by Nandkumar Gadkari and added amountBC 
-					sundryBalUpd.put("dr_amt",detailmap.get("AMOUNT__BC"));
+					//sundryBalUpd.put("dr_amt", amountPaid);commented by Nandkumar Gadkari and added AMOUNT_PAID 
+					sundryBalUpd.put("dr_amt",detailmap.get("AMOUNT_PAID"));
 					sundryBalUpd.put("cr_amt", 0.0);
 					sundryBalUpd.put("adv_amt", 0.0);
 					
@@ -618,8 +619,8 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 				glTraceUpd.put("curr_code", currCode);
 				glTraceUpd.put("exch_rate", exchRate);
 				glTraceUpd.put("dr_amt", 0.0);
-				//glTraceUpd.put("cr_amt", amountPaid);commented by Nandkumar Gadkari and added loanAmtBcHdr 
-				glTraceUpd.put("cr_amt", loanAmtBcHdr);
+				//glTraceUpd.put("cr_amt", amountPaid);commented by Nandkumar Gadkari and added loanAmthdr 
+				glTraceUpd.put("cr_amt", loanAmthdr);
 				//glTraceUpd.put("ref_type", "D");
 				glTraceUpd.put( "ref_id",tranId);
 				glTraceUpd.put( "ref_ser","LN-VCH");
@@ -650,7 +651,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 					glTraceMap.put("emp_code", "");
 					glTraceMap.put("anal_code", "");
 					glTraceMap.put("curr_code", currCode);
-					glTraceMap.put("exch_rate",exchRate);
+					glTraceMap.put("exch_rate",1.0);
 					if(diffAmtExch > 0)
 					{
 						glTraceMap.put("dr_amt",diffAmtExch);
@@ -685,8 +686,8 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 				sundryBalUpd.put("curr_code", currCode);
 				sundryBalUpd.put("exch_rate", exchRate);
 				sundryBalUpd.put("dr_amt", 0.0);
-			//	sundryBalUpd.put("cr_amt", amountPaid); commented by Nandkumar Gadkari and added loanAmtBcHdr 
-				sundryBalUpd.put("cr_amt", loanAmtBcHdr);
+			//	sundryBalUpd.put("cr_amt", amountPaid); commented by Nandkumar Gadkari and added loanAmthdr 
+				sundryBalUpd.put("cr_amt", loanAmthdr);
 				sundryBalUpd.put("adv_amt", 0.0);
 				
 				errString=Fcommon.gbf_sundrybal_upd(sundryBalUpd, conn);