add rate column

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

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

@@ -68,7 +68,7 @@ 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;
+			double rate=0.0,quantity=0.0,discount=0.0,approveRate=0;
 			String errString="",childNodeName="",lineNo1="",despachID="";
 			int updCnt=0;
 		  	StringBuffer valueXmlBuff = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root>\r\n");
@@ -119,7 +119,8 @@ public class ProofOfDeliveryDefault extends ActionHandlerEJB implements ProofOfD
 				
 				if(objContext !=null)
 				{
-					sql="select rate,quantity,lot_no,lot_sl,item_ser__prom,item_code,inv_line_no,desp_id from invoice_trace where invoice_id = ?";
+					sql="select rate,quantity,lot_no,lot_sl,item_ser__prom,item_code,inv_line_no,desp_id,discount " +
+							"from invoice_trace where invoice_id = ? order by line_no";
 					pstmt=conn.prepareStatement(sql);
 					pstmt.setString(1, invoiceID);
 					rs=pstmt.executeQuery();
@@ -129,21 +130,36 @@ public class ProofOfDeliveryDefault extends ActionHandlerEJB implements ProofOfD
 						lineNo++;
 						rate=rs.getDouble(1);
 						quantity=rs.getDouble(2);
-						lotNo=rs.getString(3)==null ? "" :rs.getString(3);
-						lotSl=rs.getString(4)==null ? "" :rs.getString(4);
-						itemSerPorm=rs.getString(5)==null ? "" :rs.getString(5);
-						itemCode=rs.getString(6)==null ? "" : rs.getString(6);
+						lotNo=rs.getString(3);
+						lotSl=rs.getString(4);
+						itemSerPorm=rs.getString(5);
+						itemCode=rs.getString(6);
 						invLineNo=rs.getInt(7);
-						despachID=rs.getString(8)==null ? "" : rs.getString(8);
+						despachID=rs.getString(8);
+						discount=rs.getDouble(9);
+						lotNo=lotNo ==null ? "" : lotNo.trim();
+						lotSl=lotSl ==null ? "" : lotSl.trim();
+						itemSerPorm=itemSerPorm ==null ? "" : itemSerPorm.trim();
+						itemCode=itemCode ==null ? "" : itemCode.trim();
+						despachID=despachID ==null ? "" : despachID.trim();
 						System.out.println("Line No in while ----->> "+lineNo);
 						System.out.println("despachID ------>> "+despachID);
+						System.out.println("discount ------>> "+discount);
 						if(!(lineNoSet.contains(lineNo1)))
 						{
 							System.out.println("lineNo Set condition true----------");
 							valueXmlBuff.append("<Detail>\r\n");					
 							valueXmlBuff.append("<line_no>").append("<![CDATA["+lineNo+"]]>").append("</line_no>");
 							valueXmlBuff.append("<line_no__trace>").append("<![CDATA["+invLineNo+"]]>").append("</line_no__trace>");
+							if(discount > 0){
+								rate=rate - (rate * discount/100);
+								System.out.println("New rate after discount------>> "+rate+"]");
+							}
 							valueXmlBuff.append("<rate__inv>").append("<![CDATA["+rate+"]]>").append("</rate__inv>");
+							approveRate=getApprovedRate(conn,itemCode,rate);
+							System.out.println("approveRate final ------>> "+approveRate);
+							
+							valueXmlBuff.append("<aprv_rate>").append("<![CDATA["+approveRate+"]]>").append("</aprv_rate>");
 							valueXmlBuff.append("<quantity__inv>").append("<![CDATA["+quantity+"]]>").append("</quantity__inv>");
 							
 							valueXmlBuff.append("<lot_no>").append("<![CDATA["+lotNo+"]]>").append("</lot_no>");
@@ -162,6 +178,7 @@ public class ProofOfDeliveryDefault extends ActionHandlerEJB implements ProofOfD
 							{
 								locCode = rs1.getString(1)==null ? "" :rs1.getString(1); 
 							}
+							locCode=locCode ==null ? "" : locCode.trim();
 							System.out.println("Location code -------->> : "+locCode);							
 							
 							valueXmlBuff.append("<descr>").append("<![CDATA["+itemCodeDesc+"]]>").append("</descr>");
@@ -245,7 +262,45 @@ public class ProofOfDeliveryDefault extends ActionHandlerEJB implements ProofOfD
 			  return retString;
 		
 	  }
-	  
+	  private double getApprovedRate(Connection conn,String itemCode,double invRate)
+	  {
+		  String regPrice="",varValue="",varName;
+		  double varValueD=0.0,apprRate=0.0;
+		  regPrice=getNameOrDescrForCode(conn,"item","regulated_price","item_code",itemCode);
+		  regPrice=regPrice==null ? "" : regPrice.trim();
+		  System.out.println("Regulated Price---->>["+regPrice+"]");
+		  if(regPrice.equalsIgnoreCase("Y")){
+			  varName="AML_REG_PER";
+			  varValue=getNameOrDescrForCode(conn,"disparm","var_value","var_name",varName);
+			  varValue=varValue==null ? "" : varValue.trim();
+			  varValueD=Double.parseDouble(varValue);
+			  System.out.println("var Value---->>["+varValueD+"]");
+			  
+			  apprRate=invRate * varValueD/100;
+			  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;
+			  System.out.println("Approved Rate 'N'---->>["+apprRate+"]");
+			  return apprRate;
+		  }
+		  else{
+			 // varName="AML_DPCO_PER";
+			 // varValue=getNameOrDescrForCode(conn,"disparm","var_value","var_name",varName);
+			  apprRate=invRate;
+			  return apprRate;
+		  }
+		  
+		  
+	  }
 	  
 	  private String getNameOrDescrForCode(Connection conn, String table_name, String descr_col_name,String whrCondCol, String whrCondVal)
 		{