Format values

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

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

@@ -10,6 +10,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.text.DecimalFormat;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
@@ -70,8 +71,8 @@ public class ProofOfDeliveryDefault extends ActionHandlerEJB implements ProofOfD
 			Node parentNode = null, childNode = null;
 			String retString="",sql="",invoiceID="",lotNo="",lotSl="",itemSerPorm="",itemCode="",itemCodeDesc="",locCode="";
 			int invLineNo=0;
-			double rate=0.0,quantity=0.0,discount=0.0,approveRate=0,pendQty=0;
-			String errString="",childNodeName="",lineNo1="",despachID="";
+			double rate=0.0,quantity=0.0,discount=0.0,pendQty=0;
+			String errString="",childNodeName="",lineNo1="",despachID="",approveRate="";
 			int updCnt=0;
 			HashMap<String,String> domDetail=new HashMap<String,String>();
 		  	StringBuffer valueXmlBuff = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root>\r\n");
@@ -279,9 +280,9 @@ public class ProofOfDeliveryDefault extends ActionHandlerEJB implements ProofOfD
 			  return retString;
 		
 	  }
-	  private double getApprovedRate(Connection conn,String itemCode,double invRate)
+	  private String getApprovedRate(Connection conn,String itemCode,double invRate)
 	  {
-		  String regPrice="",varValue="",varName;
+		  String regPrice="",varValue="",varName="",apprRateS="";
 		  double varValueD=0.0,apprRate=0.0;
 		  regPrice=getNameOrDescrForCode(conn,"item","regulated_price","item_code",itemCode);
 		  regPrice=regPrice==null ? "" : regPrice.trim();
@@ -292,38 +293,32 @@ public class ProofOfDeliveryDefault extends ActionHandlerEJB implements ProofOfD
 			  varValue=varValue==null ? "" : varValue.trim();
 			  varValueD=Double.parseDouble(varValue);
 			  System.out.println("var Value---->>["+varValueD+"]");		  
-			  
-			  //apprRate=invRate * varValueD/100;
 			  apprRate=invRate * 100/varValueD;				  
-			  System.out.println("Approved Rate 'Y'---->>["+apprRate+"]");
-			  return apprRate;		  
-			  
 		  }
 		  else if(regPrice.equalsIgnoreCase("N")){
 			  varName="AML_NONREG_PER";
 			  varValue=getNameOrDescrForCode(conn,"disparm","var_value","var_name",varName);
 			  varValue=varValue==null ? "0" : varValue.trim();			  
 			  varValueD=Double.parseDouble(varValue);			 		
-			  System.out.println("var Value---->>["+varValueD+"]");
-			  
-			  //apprRate=invRate * varValueD/100;
 			  apprRate=invRate * 100/varValueD;	
-			  System.out.println("Approved Rate 'N'---->>["+apprRate+"]");
-			  return apprRate;
+			  
 		  }
 		  else if(regPrice.equalsIgnoreCase("D")){
 			 varName="AML_DPCO_PER";
 			  varValue=getNameOrDescrForCode(conn,"disparm","var_value","var_name",varName);		
-			  //apprRate=invRate;
-			  System.out.println("var value 'D'---->>["+apprRate+"]");
 			  varValue=varValue==null ? "0" : varValue.trim();	
 			  varValueD=Double.parseDouble(varValue);
 			  System.out.println("var value 'D1111'---->>["+apprRate+"]");
 			  apprRate=invRate * 100/varValueD;		  
-			  System.out.println("Approved Rate 'D'---->>["+apprRate+"]");
-			  return apprRate;
+			  
+		  }
+		  
+		  if(apprRate > 0){
+			  DecimalFormat df=new DecimalFormat("#.###");
+			  apprRateS=df.format(apprRate);
+			  System.out.println("Formated Approved Rate---->>["+apprRateS+"]");			 
 		  }
-		  return apprRate;
+		  return apprRateS;
 		 
 	  }