Bug fix

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

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

@@ -200,7 +200,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 		String errString="";
 		Timestamp sanctionDt=null,disburseDt=null,tranDatehdr=null;
 		String tranIdRcp="";
-		Double loanAmthdr=0d,marginAmt=0d,marginAmtDet=0d,loanAmtBcHdr=0d,amountPaid=0d,exchRateDet=0d,TotdetAmt=0d;
+		Double loanAmthdr=0.0,marginAmt=0d,marginAmtDet=0d,loanAmtBcHdr=0d,amountPaid=0d,exchRateDet=0d,TotdetAmt=0.0;
 		int lineInt =0,cnt = 0,loanTenure=0;
 		boolean detailExist=false;
 		SimpleDateFormat sdf = null;
@@ -247,8 +247,10 @@ 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,M.SUNDRY_CODE,M.CURR_CODE,M.EXCH_RATE,M.SUNDRY_TYPE "
-				+ "FROM LOAN_DET L,MISC_PAYABLES M WHERE L.tran_id = ? and M.ref_no=L.ref_no";
+			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 "
+				+ "WHERE L.tran_id = ? and (L.ref_no=M.ref_no) and L.ref_ser=M.tran_ser";
+
 			pstmt=conn.prepareStatement(sql);
 			pstmt.setString(1, tranId);
 			rs=pstmt.executeQuery();
@@ -308,17 +310,25 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 			{
 				errString=new ITMDBAccessEJB().getErrorString("", "DTNOEXT", "", "", conn);
 			}*/
-			/*else
+			if("2".equalsIgnoreCase(loanType))
 			{
 				for(HashMap eachdetAmt: loanDetList)
 				{
 					TotdetAmt+=(double)eachdetAmt.get("AMOUNT_PAID");
+					System.out.println("TOT amtdet"+TotdetAmt);
 				}
-				if(loanAmthdr!=TotdetAmt)
+				System.out.println("HDRAMT["+loanAmthdr+"] DETAMT["+TotdetAmt+"]");
+				
+				int retval = Double.compare(loanAmthdr, TotdetAmt);
+				if(retval > 0 || retval < 0 )
 				{
-					errString=new ITMDBAccessEJB().getErrorString("", "AMTMISM", "", "", conn);
+					errString=new ITMDBAccessEJB().getErrorString("", "VTAMTMIS", "", "", conn);
+					return errString;
 				}
-			}*/
+			}
+			
+			String loginCode=genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
+			System.out.println("Login Code"+loginCode);
 			if("0".equalsIgnoreCase(loanType) || "1".equalsIgnoreCase(loanType))
 			{
 				
@@ -425,7 +435,8 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 				}
 				
 				//--Generating payable against loanParty Start
-				miscPayUpd.put("tran_ser","LCVOUH");
+				miscPayUpd.put("tran_ser","LN-VCH");
+				miscPayUpd.put("ref_no",tranId);
 				miscPayUpd.put("tran_date",tranDate);
 				miscPayUpd.put("bill_no"," ");
 				miscPayUpd.put("curr_code",currCode);
@@ -459,7 +470,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 				//Loan detail list
 				for(HashMap detailmap: loanDetList)
 				{
-					sql="Update misc_payables set adj_amt = ? where ref_no = ? ";
+					sql="Update misc_payables set adj_amt = ?, status = 'A' where ref_no = ? ";
 					pstmt=conn.prepareStatement(sql);
 					pstmt.setDouble(1,(Double) detailmap.get("AMOUNT_PAID"));
 					pstmt.setString(2, detailmap.get("REF_NO").toString());
@@ -469,9 +480,9 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 				
 				
 					//--Negative payables towards detail loan party start
-					miscPayUpd.put("tran_ser","M-VOUC");
+					miscPayUpd.put("tran_ser","LN-VCH");
 					miscPayUpd.put("tran_date",tranDate);
-					miscPayUpd.put("ref_no",refNoDet);
+					miscPayUpd.put("ref_no",tranId);
 					miscPayUpd.put("bill_no"," ");
 					miscPayUpd.put("curr_code",currCode);
 					miscPayUpd.put("exch_rate",exchRate);
@@ -511,6 +522,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 					glTraceUpd.put("exch_rate", exchRateDet);
 					glTraceUpd.put("dr_amt", amountPaid);
 					glTraceUpd.put("cr_amt", 0);
+					glTraceUpd.put( "ref_ser","LN-VCH");
 					//glTraceUpd.put("ref_type", "D");
 					glTraceUpd.put( "ref_id",tranId);
 					errString=Fcommon.glTraceUpdate(glTraceUpd, conn);
@@ -543,9 +555,9 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 				}
 								
 				///Positive payable against loanParty header Start
-				miscPayUpd.put("tran_ser","M-VOUC");//Tran_ser ??
+				miscPayUpd.put("tran_ser","LN-VCH"); //Tran_ser ??
 				miscPayUpd.put("tran_date",tranDate);
-				miscPayUpd.put("ref_no",refNoDet);
+				miscPayUpd.put("ref_no",tranId);
 				miscPayUpd.put("bill_no"," ");
 				miscPayUpd.put("curr_code",currCode);
 				miscPayUpd.put("exch_rate",exchRate);
@@ -584,6 +596,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 				glTraceUpd.put("cr_amt", 0.0);
 				//glTraceUpd.put("ref_type", "D");
 				glTraceUpd.put( "ref_id",tranId);
+				glTraceUpd.put( "ref_ser","LN-VCH");
 				
 				errString=Fcommon.glTraceUpdate(glTraceUpd, conn);
 				if(errString!=null && errString.trim().length()>0)
@@ -616,9 +629,11 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 			
 			if(errString==null || errString.trim().length()==0)
 			{
-				sql="Update loan_hdr set confirmed = 'Y' where tran_id = ? ";
+				sql="Update loan_hdr set confirmed = 'Y',conf_date = ?, emp_code__aprv = ? where tran_id = ?";
 				pstmt=conn.prepareStatement(sql);
-				pstmt.setString(1, tranId);
+				pstmt.setTimestamp(1, tranDate);
+				pstmt.setString(2, loginCode);
+				pstmt.setString(3, tranId);
 				pstmt.executeUpdate();
 				pstmt.close();
 				pstmt=null;