detail screen receipt amount set time site code condition

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

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

@@ -351,6 +351,7 @@ public class EcollectionIC extends ValidatorEJB implements EcollectionICLocal, E
 								refNo = genericUtility.getColumnValue("ref_no",dom);
 								lineNo = genericUtility.getColumnValue("line_no",dom);
 								custCode = this.genericUtility.getColumnValue("cust_code", dom1);
+								siteCode = this.genericUtility.getColumnValue("site_code", dom1);
 								if (rcpAmtStr != null && rcpAmtStr.trim().length() > 0)
 								{
 									try
@@ -369,11 +370,12 @@ public class EcollectionIC extends ValidatorEJB implements EcollectionICLocal, E
 									errFields.add(childNodeName.toLowerCase());
 								}
 								
-								sql = "SELECT (TOT_AMT - ADJ_AMT) AS AMT FROM RECEIVABLES WHERE TRAN_SER = ? AND REF_NO = ?  AND cust_code = ? " ;
+								sql = "SELECT (TOT_AMT - ADJ_AMT) AS AMT FROM RECEIVABLES WHERE TRAN_SER = ? AND REF_NO = ?  AND cust_code = ?  and 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())
 								{
@@ -682,20 +684,19 @@ 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" ) )
 			{
 				refNo = checkNull(genericUtility.getColumnValue("ref_no",dom));
 				refSer = checkNull(genericUtility.getColumnValue("ref_ser",dom));
 				custCode = this.genericUtility.getColumnValue("cust_code", dom1);
-				System.out.println("custCode>>>>>>>>"+custCode);
-				sql = "SELECT (TOT_AMT - ADJ_AMT) AS AMT FROM RECEIVABLES  WHERE TRAN_SER = ? AND REF_NO = ? and cust_code= ? ";
+				siteCode = this.genericUtility.getColumnValue("site_code", dom1);
+				sql = "SELECT (TOT_AMT - ADJ_AMT) AS AMT FROM RECEIVABLES  WHERE TRAN_SER = ? AND REF_NO = ? and cust_code= ? and site_code = ?  ";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, refSer);
 				pstmt.setString(2, refNo);
 				pstmt.setString(3, custCode);
+				pstmt.setString(4, siteCode);
 				rs = pstmt.executeQuery();
 				
 				if( rs.next() )
@@ -758,7 +759,7 @@ public class EcollectionIC extends ValidatorEJB implements EcollectionICLocal, E
 		}
 		return input;
 	}
-	public String getRequiredDecimal(double actVal, int prec)
+	public String getRequiredDecimal(double actVal, int prec)//Added by chandrashekar on 11-08-14
 	{
 		String fmtStr = "############0";
 		if (prec > 0)