loan changes

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

webitm-fin/src/ibase/webitm/ejb/fin/LoanIC.java

@@ -1116,6 +1116,7 @@ public class LoanIC extends ValidatorEJB implements LoanICLocal, LoanICRemote
 		String tranDateStr="",disbursDateStr="",santionDateStr="",loanAmountStr="",loanTenureStr="",intRateStr="",exchRateStr="";
 		double loanAmount=0.0,loanTenure=0.0,intRate=0.0,exchRate=0.0,repayDaysInt=0.0,moratoriumPrdInt=0.0;
 		StringBuffer errStringXml = new StringBuffer("<?xml version = \"1.0\"?> \r\n <Root> <Errors>"); 
+		String tranId="";
 		try
 		{
 			SimpleDateFormat sdf1= new SimpleDateFormat(genericUtility.getDBDateFormat());
@@ -1642,6 +1643,41 @@ public class LoanIC extends ValidatorEJB implements LoanICLocal, LoanICRemote
 									errList.add(errCode);
 									errFields.add(childNodeName.toLowerCase());
 								}
+								//else added by nandkumar gadkari on 06/11/19
+								else
+								{
+									tranId = checkNull(genericUtility.getColumnValue("tran_id", dom));
+									tranId = tranId.trim().length() == 0 ? " " : tranId;
+									refSer = checkNull(genericUtility.getColumnValue("ref_ser",dom));
+									sql = "select count(*) as cnt from loan_det loan_det ,loan_hdr loan_hdr where "
+										+ "loan_hdr.tran_id= loan_det.tran_id and loan_det.ref_no = ?  "
+										+ "and loan_det.ref_ser= ? and loan_hdr.confirmed='N' and loan_hdr.tran_id <> ? ";
+									pstmt = conn.prepareStatement(sql);
+									pstmt.setString(1,refNo);
+									pstmt.setString(2,refSer);
+									pstmt.setString(3,tranId);
+									rs = pstmt.executeQuery();
+									if(rs.next())
+									{
+										cnt = rs.getInt("cnt");
+									}
+									if(pstmt != null)
+									{
+										pstmt.close(); 
+										pstmt = null;
+									}
+									if(rs != null)
+									{
+										rs.close();
+										rs = null;
+									}
+									if(cnt > 0)
+									{
+										errCode = "VTVOUCADJ";  
+										errList.add(errCode);
+										errFields.add(childNodeName.toLowerCase());
+									}
+								}
 							}
 						}// end of if block 
 						else if("ref_ser".equalsIgnoreCase(childNodeName))
@@ -1934,6 +1970,41 @@ public class LoanIC extends ValidatorEJB implements LoanICLocal, LoanICRemote
 								errList.add(errCode);
 								errFields.add(childNodeName.toLowerCase());
 							}
+							//else added by nandkumar gadkari on 06/11/19
+							else
+							{
+								tranId = checkNull(genericUtility.getColumnValue("tran_id", dom));
+								tranId = tranId.trim().length() == 0 ? " " : tranId;
+								refSer = checkNull(genericUtility.getColumnValue("ref_ser",dom));
+								sql = "select count(*) as cnt from loan_mmoney loan_mmoney ,loan_hdr loan_hdr where "
+									+ "loan_hdr.tran_id= loan_mmoney.tran_id and loan_mmoney.ref_no = ?  "
+									+ "and loan_mmoney.ref_ser= ? and loan_hdr.confirmed='N' and loan_hdr.tran_id <> ? ";
+								pstmt = conn.prepareStatement(sql);
+								pstmt.setString(1,refNo);
+								pstmt.setString(2,refSer);
+								pstmt.setString(3,tranId);
+								rs = pstmt.executeQuery();
+								if(rs.next())
+								{
+									cnt = rs.getInt("cnt");
+								}
+								if(pstmt != null)
+								{
+									pstmt.close(); 
+									pstmt = null;
+								}
+								if(rs != null)
+								{
+									rs.close();
+									rs = null;
+								}
+								if(cnt > 0)
+								{
+									errCode = "VTVOUCADJ";  
+									errList.add(errCode);
+									errFields.add(childNodeName.toLowerCase());
+								}
+							}
 						}
 					}// end of if block 
 					else if("ref_ser".equalsIgnoreCase(childNodeName))

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

@@ -514,16 +514,17 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 				//Loan detail list
 				for(HashMap detailmap: loanDetList)
 				{
-					sql="Update misc_payables set adj_amt = ?, status = 'A' where ref_no = ? ";
+					sql="Update misc_payables set adj_amt = ?, status = 'A' where ref_no = ? and tran_ser= ?  ";
 					pstmt=conn.prepareStatement(sql);
 					pstmt.setDouble(1,(Double) detailmap.get("AMOUNT_PAID"));
 					pstmt.setString(2, detailmap.get("REF_NO").toString());
+					pstmt.setString(3, detailmap.get("REF_SER").toString());
 					pstmt.executeUpdate();
 					pstmt.close();
 					pstmt=null;
 				
 					//--Negative payables towards detail loan party start
-					miscPayUpd.put("tran_ser","LN-VCH");
+					miscPayUpd.put("tran_ser","LN-VC1");// added 1 in tran ser by nandkumar gadkari  on nandkumar gadkari on 08/11/19
 					miscPayUpd.put("tran_date",tranDatehdr);
 					miscPayUpd.put("ref_no",tranId);
 					miscPayUpd.put("bill_no"," ");
@@ -541,7 +542,7 @@ 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("adj_amt",detailmap.get("AMOUNT_PAID")); //Adjusting negative payable
+					miscPayUpd.put("adj_amt",-(Double)(detailmap.get("AMOUNT_PAID"))); //Adjusting negative payable added negative sine by nandkumar gadkari on 08/11/19
 					miscPayUpd.put("hold_amt",0);
 					miscPayUpd.put("adv_amt",0);
 					
@@ -1117,7 +1118,7 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
 			pstmt.setString(8,sundryType.trim());
 			pstmt.setString(9,sundryCode.trim());
 			pstmt.setString(10,acctCode.trim());
-			pstmt.setString(11,cctrCode.trim());
+			pstmt.setString(11,cctrCode);
 			pstmt.setTimestamp(12,dueDate);
 			pstmt.setString(13,finEntity.trim());
 			pstmt.setString(14,siteCode.trim());