udf_str1,udf_str2 columns sitecode customer code added

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

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

@@ -87,7 +87,7 @@ public class EcollectionIC extends ValidatorEJB implements EcollectionICLocal, E
 			int currentFormNo =0;
 			String siteCode="",rcpAmtStr="",refSer="",refNo="",prdCode="";
 			java.util.Date tranDate = null;
-			double rcpAmt=0,rcpAmtNew=0;
+			double rcpAmt=0,rcpAmtNew=0,rcpAmtStatus=0.0;
 			double  isInvAmt=0;
 			SimpleDateFormat dateFormat2 = null;
 			try
@@ -386,7 +386,28 @@ public class EcollectionIC extends ValidatorEJB implements EcollectionICLocal, E
 								pstmt.close();
 								pstmt = null;
 								System.out.println("rcpAmtNew>>>["+rcpAmtNew+"]rcpAmt["+rcpAmt+"]");
-								if(rcpAmt < rcpAmtNew)
+								//Start added by chandr shekar on 21-mar-2016
+								sql = "select sum(rcpdet.rcp_amt) as amt from rcpdet_form rcpdet,receipt_form rcpform " +
+										"where rcpform.tran_id=rcpdet.tran_id and rcpdet.ref_ser=?  " +
+										"and rcpdet.rcp_amt>0 and rcpform.status !='X' and rcpdet.ref_no=? " +
+										"AND rcpform.cust_code = ? and rcpform.site_code= ? " ;
+								pstmt = conn.prepareStatement(sql);
+								pstmt.setString(1,checkNull(genericUtility.getColumnValue("ref_ser",dom)));
+								pstmt.setString(2,checkNull(genericUtility.getColumnValue("ref_no",dom)));
+								pstmt.setString(3,custCode);
+								pstmt.setString(4,siteCode);
+								rs = pstmt.executeQuery();
+								if( rs.next())
+								{
+									rcpAmtStatus=rs.getDouble(1);
+								}
+								rs.close();
+								rs = null;
+								pstmt.close();
+								pstmt = null;
+								System.out.println("rcpAmtStatus>>>"+rcpAmtStatus);
+								//End added by chandrashekar on 21-mar-2016
+								if(rcpAmt-rcpAmtStatus < rcpAmtNew)
 								{
 									errCode = "VTINVTLAMT";
 									errList.add(errCode);
@@ -707,6 +728,8 @@ public class EcollectionIC extends ValidatorEJB implements EcollectionICLocal, E
 				hdrCustCode = this.genericUtility.getColumnValue("cust_code", dom1);
 				hdrSiteCode = this.genericUtility.getColumnValue("site_code", dom1);
 				valueXmlString.append("<line_no__ref><![CDATA[" ).append("1").append( "]]></line_no__ref>\r\n");
+				valueXmlString.append("<udf_str1><![CDATA[").append(hdrSiteCode).append("]]></udf_str1>\r\n");
+				valueXmlString.append("<udf_str2><![CDATA[").append(hdrCustCode).append("]]></udf_str2>\r\n");
 				
 			}else if( currentColumn.trim().equalsIgnoreCase( "ref_no" ) ||currentColumn.trim().equalsIgnoreCase( "ref_ser" ) )
 			{