M16CSUN001: Changes to POD Detail Screen

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

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

@@ -1533,8 +1533,10 @@ public class ProofOfDelivery extends ValidatorEJB implements
 						// VALLABH KADAM 23/DES/14
 						// Change [inv_line_no] to [line_no]
 						// to get proper data in Pop help
-						sql1 = "select rate,quantity,lot_no,lot_sl,item_ser__prom,item_code,inv_line_no,desp_id,discount, desp_line_no "
-								+ "from invoice_trace where invoice_id = ? and line_no = ?";
+						/*sql1 = "select rate,quantity,lot_no,lot_sl,item_ser__prom,item_code,inv_line_no,desp_id,discount, desp_line_no "
+								+ "from invoice_trace where invoice_id = ? and line_no = ?";*/
+						sql1 = "select rate,quantity__stduom,lot_no,lot_sl,item_ser__prom,item_code,inv_line_no,desp_id,discount, desp_line_no "
+							+ "from invoice_trace where invoice_id = ? and line_no = ?";
 						pstmt = conn.prepareStatement(sql1);
 						pstmt.setString(1, invoiceID1);
 						pstmt.setString(2, lineNoTrace);
@@ -1763,8 +1765,10 @@ public class ProofOfDelivery extends ValidatorEJB implements
 						// Change [inv_line_no] to [line_no]
 						// to get proper data in Pop help DESP_LINE_NO NOT NULL
 						// CHAR(3)
-						sql1 = "select quantity,lot_no,lot_sl,item_code,inv_line_no,desp_id, desp_line_no "
-								+ "from invoice_trace where invoice_id = ? and line_no = ?";
+						/*sql1 = "select quantity,lot_no,lot_sl,item_code,inv_line_no,desp_id, desp_line_no "
+								+ "from invoice_trace where invoice_id = ? and line_no = ?";*/
+						sql1 = "select quantity__stduom,lot_no,lot_sl,item_code,inv_line_no,desp_id, desp_line_no "
+							+ "from invoice_trace where invoice_id = ? and line_no = ?";
 						pstmt = conn.prepareStatement(sql1);
 						pstmt.setString(1, invoiceID1);
 						pstmt.setString(2, lineNoTrace);

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

@@ -321,6 +321,15 @@ public class ProofOfDeliveryDefault extends ActionHandlerEJB implements ProofOfD
 			  System.out.println("var value 'D1111'---->>["+apprRate+"]");
 			  apprRate=invRate * 100/varValueD;		  
 			  
+		  }
+		  else if(regPrice.equalsIgnoreCase("O")){
+			 varName="AML_OTC_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 'D1111'---->>["+apprRate+"]");
+			  apprRate=invRate * 100/varValueD;		  
+			  
 		  }
 		  
 		  if(apprRate > 0){