CHANGES IN VALIDATION

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

webitm-fin/ibase/webitm/ejb/fin/PayRecXfrPrc.java

@@ -181,9 +181,9 @@ public class PayRecXfrPrc extends ProcessEJB implements PayRecXfrPrcLocal , PayR
 			
 			if ( payableV == null || payableV.equals("null") || payableV.trim().length() == 0 )
 			{
-				payableV = "";
-				errString = itmDBAccessEJB.getErrorString("","VMATYPENL","","",conn);
-				return errString;
+				payableV = "N";
+				/*errString = itmDBAccessEJB.getErrorString("","VMATYPENL","","",conn);
+				return errString;*/
 			}
 
 			try

webitm-fin/ibase/webitm/ejb/fin/RecPayTrfIC.java

@@ -83,6 +83,7 @@ public class RecPayTrfIC extends ValidatorEJB implements RecPayTrfICLocal,RecPay
 		String columnValue="",loginSite="";
 		int childNodeListLength = 0;
 		SimpleDateFormat sdf = null;
+		String  lineNo = "", currLineNo = "";
 	
 		try
 		{  
@@ -422,11 +423,12 @@ public class RecPayTrfIC extends ValidatorEJB implements RecPayTrfICLocal,RecPay
 		PreparedStatement pstmt = null ;
 		ResultSet rs = null;
 		String existFlag = "";
-		String sundryCode = "",trfType="",refNo="",refSer="",reasCode="",sDueDateTo="",sundryType="";
+		String sundryCode = "",trfType="",refNo="",refSer="",reasCode="",sDueDateTo="",sundryType="",tranId="";
 		String site_code="",loginSiteCode="";
 		Timestamp dueDateTo = null, dueDateFr = null, TranDate =null;
 		String tranDateStr="";
 		double trfAmt=0.0;
+		String  lineNo = "", refNoDet = "",	currLineNo = "",refSerDet="";
 		StringBuffer errStringXml = new StringBuffer("<?xml version = \"1.0\"?> \r\n <Root> <Errors>"); 
 		try
 		{
@@ -540,7 +542,7 @@ public class RecPayTrfIC extends ValidatorEJB implements RecPayTrfICLocal,RecPay
 						}// end of if block 
 						else if ("reas_code".equalsIgnoreCase(childNodeName)) 
 						{
-							reasCode = checkNull(genericUtility.getColumnValue("reas_code", dom)); 
+							reasCode = checkNullAndTrim(genericUtility.getColumnValue("reas_code", dom)); 
 							System.out.println("in reas_code.........");
 							if(reasCode != null && reasCode.trim().length() > 0)
 							{
@@ -582,6 +584,11 @@ public class RecPayTrfIC extends ValidatorEJB implements RecPayTrfICLocal,RecPay
 							trfType = checkNull(genericUtility.getColumnValue("trf_type", dom1)); 
 							sundryCode = checkNull(genericUtility.getColumnValue("sundry_code", dom1));
 							refSer = checkNull(genericUtility.getColumnValue("tran_ser",dom));
+							tranId = checkNullAndTrim(genericUtility.getColumnValue("tran_id",dom));
+							if(tranId == null || tranId.trim().length() ==0)
+							{
+								tranId=" ";
+							}
 							if(refNo == null || refNo.trim().length() ==0)
 							{
 								errCode = "VTREFRNO";  
@@ -619,6 +626,7 @@ public class RecPayTrfIC extends ValidatorEJB implements RecPayTrfICLocal,RecPay
 										errList.add(errCode);
 										errFields.add(childNodeName.toLowerCase());
 									}
+									
 							    }
 								else
 								{
@@ -649,6 +657,64 @@ public class RecPayTrfIC extends ValidatorEJB implements RecPayTrfICLocal,RecPay
 										errFields.add(childNodeName.toLowerCase());
 									}
 								}
+								
+								sql = "select count(*) as cnt from rec_pay_trf_det where ref_no = ? and tran_ser= ? and 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 = "VTRETREF2";  
+									errList.add(errCode);
+									errFields.add(childNodeName.toLowerCase());
+								}
+								
+								Node currDetail1 = null;
+							
+								int count = 0;
+								currLineNo = checkNullAndTrim(genericUtility.getColumnValue("line_no", dom));
+								refNo = checkNullAndTrim(genericUtility.getColumnValue("ref_no", dom));
+								refSer = checkNullAndTrim(genericUtility.getColumnValue("tran_ser",dom));
+								NodeList detailList1 = dom2.getElementsByTagName("Detail2");
+								
+								int noOfDetails = detailList1.getLength();
+								
+								for (int ctr1 = 0; ctr1 < noOfDetails; ctr1++)
+								{
+
+									currDetail1 = detailList1.item(ctr1);
+									lineNo = checkNullAndTrim(genericUtility.getColumnValueFromNode("line_no", currDetail1));
+									refNoDet = checkNullAndTrim(genericUtility.getColumnValueFromNode("ref_no", currDetail1));
+									refSerDet = checkNullAndTrim(genericUtility.getColumnValueFromNode("tran_ser", currDetail1));
+									if (!currLineNo.trim().equalsIgnoreCase(lineNo.trim())) 
+									{
+										if(refNoDet.equalsIgnoreCase(refNo) && refSerDet.equalsIgnoreCase(refSer) )
+										{
+											errCode = "VTDUPREFNO";
+											errList.add(errCode);
+											errFields.add(childNodeName.toLowerCase());
+										}
+									}
+								}
+								
+								
 						}
 					}// end of if block 
 					else if("tran_ser".equalsIgnoreCase(childNodeName))