Bug fix

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

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

@@ -18,8 +18,6 @@ import org.apache.axis.client.Service;
 import org.apache.axis.encoding.XMLType;
 
 import ibase.webitm.ejb.fin.FinCommon;
-import ibase.webitm.ejb.fin.adv.JvConfirm;
-import ibase.webitm.ejb.fin.adv.PayIbcaConf;
 import ibase.webitm.ejb.dis.DistCommon;
 import ibase.utility.CommonConstants;
 import ibase.utility.E12GenericUtility;
@@ -182,11 +180,10 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 		java.sql.Timestamp dueDate = null;
 		java.sql.Timestamp resiDate = null;
 		java.sql.Timestamp relieveDate = null;
-		HashMap mischdrMap=null,miscdetMap=null,miscAdvMap=null,miscAcctMap	=null,miscdetListMap=null;
+		HashMap loanDetMap=null;
+		
+		ArrayList<HashMap> loanDetList = new ArrayList<HashMap>();	
 			
-		ArrayList miscdetList = new ArrayList();	
-		ArrayList miscAcctList = new ArrayList();	
-		ArrayList miscAdvList = new ArrayList();	
 		double taxAmt=0,rndTo=0,totAmt=0,netAmt=0,advAmt=0,netAmtBc=0,diffAmtExch=0,suppBillAmt=0,exchRate=0,rndAmt=0,billAmt=0;
 		
 		String siteCodehdr="",loanType="",tranType="",loanPartyhdr="",bankCode="",
@@ -241,7 +238,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 				+ "FROM LOAN_DET L,MISC_VOUCHER M WHERE L.tran_id = ? and M.tran_id=L.ref_no";
 			pstmt=conn.prepareStatement(sql);
 			rs=pstmt.executeQuery();
-			if(rs.next())
+			while(rs.next())
 			{
 				lineNoDet=rs.getString("LINE_NO");
 				refSerDet=rs.getString("REF_SER");
@@ -253,6 +250,19 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 				sundryTypeDet=rs.getString("SUNDRY_TYPE");
 				currCodeDet=rs.getString("CURR_CODE");
 				exchRateDet=rs.getString("EXCH_RATE");
+				
+				loanDetMap=new HashMap();
+				loanDetMap.put("LINE_NO", lineNoDet);
+				loanDetMap.put("REF_SER", refSerDet);
+				loanDetMap.put("REF_NO", refNoDet);
+				loanDetMap.put("ACCT_CODE", AcctCodeDet);
+				loanDetMap.put("CCTR_CODE", cctrCodeDet);
+				loanDetMap.put("AMOUNT_PAID", amountPaid);
+				loanDetMap.put("SUNDRY_CODE", sundryCodeDet);
+				loanDetMap.put("CURR_CODE", currCodeDet);
+				loanDetMap.put("EXCH_RATE", exchRateDet);
+				loanDetList.add(loanDetMap);
+				
 			}
 			pstmt.close();
 			pstmt=null;
@@ -274,10 +284,11 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 			rs=null;
 			HashMap sundryBalUpd=new HashMap();
 			HashMap miscPayUpd= new HashMap();
+			HashMap glTraceUpd=new HashMap();
 			
 			
-			//New buyers Credit
-			if("0".equalsIgnoreCase(loanType))
+			//New buyers Credit OR New Term Loan
+			if("0".equalsIgnoreCase(loanType) || "1".equalsIgnoreCase(loanType))
 			{
 				//creating misc receipt entry
 				StringBuffer xmlBuff= new StringBuffer();
@@ -318,7 +329,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 				xmlBuff.append("<sundry_type><![CDATA[" + ("L") + "]]></sundry_type>");
 				xmlBuff.append("</Detail1>");
 				
-				xmlBuff.append("<Detail2 dbID=\"\" domID=\'1\' objName=\"misc_rcp\" objContext=\"3\">");
+				xmlBuff.append("<Detail2 dbID=\"\" domID=\'1\' objName=\"misc_rcp\" objContext=\"2\">");
 				xmlBuff.append("<attribute pkNames=\"\" selected=\"N\" updateFlag=\"A\" status=\"N\" />");
 				xmlBuff.append("<tran_id/>");
 				xmlBuff.append("<line_no>"+("1")+"</line_no>");
@@ -328,7 +339,6 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 				xmlBuff.append("<anal_code><![CDATA[" +null+ "]]></anal_code>");
 				xmlBuff.append("</Detail2>");
 				
-				//save data 
 				errString=saveData(xtraParams,siteCodehdr, xmlBuff.toString(), conn);
 				if( errString.indexOf("Success") == -1 )
 				{
@@ -360,8 +370,8 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 				miscPayUpd.put("exchrate",exchRate);
 				miscPayUpd.put("sundry_type","L");
 				miscPayUpd.put("sundry_code",loanPartyhdr);
-				miscPayUpd.put("acct_code",acctCodePay);
-				miscPayUpd.put("cctr_code",cctrCodePay);
+				miscPayUpd.put("acct_code_lc",acctCodePay);
+				miscPayUpd.put("cctr_code_lc",cctrCodePay);
 				//miscPayUpd.put("due_date",dueDate);
 				miscPayUpd.put("site_code",siteCodehdr);
 				miscPayUpd.put("tot_amt",loanAmthdr);
@@ -379,21 +389,26 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 				}
 				//--Generating payable against loanParty end
 		
-			}
-			else if("1".equalsIgnoreCase(loanType)) //New TermLoan
-			{
-				
 			}
 			else //convert buyers credit to Term Loan(Type 2)
 			{
-				//--Negative payables towards detail loan party start
+				//Loan detail list
+				for(HashMap detailmap: loanDetList)
+				{
+					sql="Update misc_payables set adj_amt = ? where ref_no = ? ";
+					pstmt=conn.prepareStatement(sql);
+					pstmt.setDouble(1,(Double) detailmap.get("AMOUNT_PAID"));
+					pstmt.setString(2, detailmap.get("REF_NO").toString());
+					pstmt.executeUpdate();
+				
 				
+					//--Negative payables towards detail loan party start
 					miscPayUpd.put("tran_ser","");
 					miscPayUpd.put("tran_date",tranDate);
 					miscPayUpd.put("ref_no",refNoDet);
 					miscPayUpd.put("bill_no"," ");
-				miscPayUpd.put("curr_code",currCodeDet);
-				miscPayUpd.put("exchrate",exchRateDet);
+					miscPayUpd.put("curr_code",currCode);
+					miscPayUpd.put("exchrate",exchRate);
 					miscPayUpd.put("sundry_type",sundryTypeDet);
 					miscPayUpd.put("sundry_code",sundryCodeDet);
 					miscPayUpd.put("acct_code",AcctCodeDet);
@@ -405,16 +420,16 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 					miscPayUpd.put("auto_pay","N");
 					miscPayUpd.put("pay_mode","T");
 					miscPayUpd.put("paid","N");
-				miscPayUpd.put("adv_amt",0);
+					miscPayUpd.put("adj_amt",amountPaid); //Adjusting negative payable
 					
 					errString=Fcommon.gbfMiscPayUpd(miscPayUpd, conn);
 					if(errString!=null && errString.trim().length()>0)
 					{
 						return errString;
 					}
-				
+					//--negative payables towards detail loan party End
 					//Gltrace debit note to sundry code
-				HashMap glTraceUpd=new HashMap();
+					
 					glTraceUpd.put("tran_date", tranDate);
 					glTraceUpd.put("eff_date", tranDate);
 					glTraceUpd.put("fin_entity", "");
@@ -442,7 +457,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 					sundryBalUpd.put("site_code", siteCodehdr);
 					sundryBalUpd.put("sundry_type", sundryTypeDet);
 					sundryBalUpd.put("sundry_code", sundryCodeDet);
-				sundryBalUpd.put("acct_code", AcctCodeDet);
+					sundryBalUpd.put("acct_code", acctCodePay);
 					sundryBalUpd.put("cctr_code", cctrCodeDet);
 					sundryBalUpd.put("curr_code", currCodeDet);
 					sundryBalUpd.put("exch_rate", exchRateDet);
@@ -455,10 +470,11 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 					{
 						return errString;
 					}
-				//--negative payables towards detail loan party start
+				
+				}
 								
 				///Positive payable against loanParty header Start
-				miscPayUpd.put("tran_ser","");//Tran_ser ??
+				miscPayUpd.put("tran_ser","MVOUC");//Tran_ser ??
 				miscPayUpd.put("tran_date",tranDate);
 				miscPayUpd.put("ref_no",refNoDet);
 				miscPayUpd.put("bill_no"," ");
@@ -467,7 +483,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 				miscPayUpd.put("sundry_type",sundryTypeDet);
 				miscPayUpd.put("sundry_code",sundryCodeDet);
 				miscPayUpd.put("acct_code",acctCodePay);
-				miscPayUpd.put("cctr_code_lc",cctrCodePay);
+				miscPayUpd.put("cctr_code",cctrCodePay);
 				miscPayUpd.put("due_date",dueDate);
 				miscPayUpd.put("site_code",siteCodehdr);
 				miscPayUpd.put("tot_amt",loanAmthdr);
@@ -726,7 +742,4 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 		return retString;
 	}
 
-	
-
-	
 } //class