site_code__mfg "null" value avoided also rate validation both site rounded to 4 decimals

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

webitm-dis/ibase/webitm/ejb/dis/SalesReturn.java

@@ -2492,6 +2492,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 									//tempNode.getFirstChild().setNodeValue(retReplFlag);
 								}
 								siteCodeMfg = rs.getString("site_code__mfg");
+								siteCodeMfg = getAbsString( siteCodeMfg ); 
 								mfgDate = rs.getTimestamp("mfg_date");
 								expDate = rs.getTimestamp("exp_date");
 								lotNo = rs.getString("lot_no");
@@ -3469,7 +3470,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 						{
 							packCode = getMfgSitePackCode(itemCode, siteCode, locCode,  lotNo,  lotSl, "P",  conn);
 						}
-
+						siteCodeMfg = getAbsString( siteCodeMfg ); 
 						sql = "select count(1) "
 							+ " from stock a, invstat b "
 							+ " where a.inv_stat  = b.inv_stat "
@@ -6041,6 +6042,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 							{
 								if( lsInvoiceId == null || lsInvoiceId.trim().length() == 0 )
 								{
+									lcRate = getReqDecimal(lcRate, 4);
+									lcRateInv = getReqDecimal(lcRateInv, 4);
 									if ( lcRate == 0 && lcRateInv != 0 )
 									{
 										errCode = "VTRATE2";
@@ -6118,6 +6121,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 									lcInvRate = getRequiredDecimal(lcInvRate, 3);
 									lcRate = getRequiredDecimal(lcRate, 3);
 									System.out.println("manohar lcRateStr [" + lcRateStr + "] lcRate [" + lcRate + "] > lcInvRate [" + lcInvRate + "]");
+									lcInvRate = getReqDecimal(lcInvRate, 4);
+									lcRate = getReqDecimal(lcRate, 4);
 									if ( lcRate > lcInvRate && lcInvRate > 0 )
 									{
 										errCode = "VTINVRATE1";
@@ -8610,6 +8615,23 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 		
 		return value;
 	}
+	private double getReqDecimal(double actVal, int prec)
+	{
+		String fmtStr = "############0";
+		String strValue = null;
+		double retVal = 0;
+		if (prec > 0)
+		{
+			fmtStr = fmtStr + "." + "000000000".substring(0, prec);
+		}
+		DecimalFormat decFormat = new DecimalFormat(fmtStr);
+		retVal = Double.parseDouble(decFormat.format(actVal));
+		if (Math.abs(retVal) == 0)
+		{
+			retVal = 0;
+		}
+		return retVal;
+	}
 	private String checkNull(String input)	
 	{
 		if (input == null)