added new 2 display columns

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

webitm-dis/src/ibase/webitm/ejb/dis/adv/SalesReturnAct.java

@@ -1182,12 +1182,13 @@ public class SalesReturnAct extends ActionHandlerEJB implements SalesReturnActLo
 		StringBuffer valueXmlString = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root>\r\n");
 		int domID = 0,domID1=0;
 		java.util.Date invoiceDate= null;
+		double invTraceRate=0,avgRate=0;
 		try
 		{
 			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
 			conn = getConnection();
 				
-				System.out.println("\n******************** S T A R T   *******getInvoicePickBtn*********************");
+				System.out.println("\n******************** S T A R T   *******getInvoicePickBtn*********************TEST");
 				
 					siteCode = genericUtility.getColumnValue("site_code",dom1);
 					itemCode = genericUtility.getColumnValue("item_code",dom);
@@ -1254,6 +1255,36 @@ public class SalesReturnAct extends ActionHandlerEJB implements SalesReturnActLo
 									if( docKey.indexOf(invoiceId) != -1)
 									{
 										
+										//-----added by nandkumar gadkari on 24/05/19---------start------------
+										sql = "select rate from invoice_trace where invoice_id = ?  and item_code = ? and lot_no=? and rate > 0 ";
+										 pstmt2 = conn.prepareStatement(sql);
+				                         pstmt2.setString(1, invoiceId);
+				                         pstmt2.setString(2, itemCode);
+				                         pstmt2.setString(3, lotNo);
+	                                     rs2 = pstmt2.executeQuery();
+				                         if (rs2.next())
+				                         {
+				                        	 invTraceRate = rs2.getDouble(1);
+				                         }
+				                         pstmt2.close();
+				                         pstmt2 = null;
+				                         rs2.close();
+				                         rs2 = null;
+				                         
+				                         sql = "select Round(sum((quantity * rate) - ( ((quantity * rate)*discount)/100)) / sum(quantity),2)  	from invoice_trace where invoice_id = ?  and item_code = ? ";
+										 pstmt2 = conn.prepareStatement(sql);
+				                         pstmt2.setString(1, invoiceId);
+				                         pstmt2.setString(2, itemCode);
+				                         rs2 = pstmt2.executeQuery();
+				                         if (rs2.next())
+				                         {
+				                         	avgRate = rs2.getInt(1);
+				                         }
+				                         pstmt2.close();
+				                         pstmt2 = null;
+				                         rs2.close();
+				                         rs2 = null;
+				                       //-----added by nandkumar gadkari on 24/05/19---------end------------
 										sql = "select count(*) from invoice_trace where invoice_id = ?  and item_code = ? and lot_no = ? ";
 										 pstmt2 = conn.prepareStatement(sql);
 				                         pstmt2.setString(1, invoiceId);
@@ -1271,7 +1302,7 @@ public class SalesReturnAct extends ActionHandlerEJB implements SalesReturnActLo
 										
 										if(lotCnt > 1 && adjQty == 0)
 										{
-											sql = "select quantity from invoice_trace where invoice_id = ?  and item_code = ? and lot_no = ? ";
+											sql = "select quantity,rate from invoice_trace where invoice_id = ?  and item_code = ? and lot_no = ? ";// rate added by nanadkumar gadkari on 26/09/19
 					                    	 pstmt2 = conn.prepareStatement(sql);
 					                         pstmt2.setString(1, invoiceId);
 					                         pstmt2.setString(2, itemCode);
@@ -1280,6 +1311,7 @@ public class SalesReturnAct extends ActionHandlerEJB implements SalesReturnActLo
 					                         while (rs2.next())
 					                         {
 					                         	lotQty = rs2.getDouble(1);
+					                         	invTraceRate = rs2.getDouble(2);
 					                         	domID++;
 					                         	valueXmlString.append("<Detail>\r\n");	
 					                         	
@@ -1299,6 +1331,9 @@ public class SalesReturnAct extends ActionHandlerEJB implements SalesReturnActLo
 					                         	valueXmlString.append("<effective_cost>").append("<![CDATA[").append(rate).append("]]>").append("</effective_cost>\r\n");
 					                         	valueXmlString.append("<invoice_quantity>").append("<![CDATA[").append(lotQty).append("]]>").append("</invoice_quantity>\r\n");
 					                         	valueXmlString.append("<used_quantity>").append("<![CDATA[").append(0.0).append("]]>").append("</used_quantity>\r\n");
+					                         //  added by nanadkumar gadkari on 26/09/19
+					                         	valueXmlString.append("<invoice_trace_rate>").append("<![CDATA[").append(invTraceRate).append("]]>").append("</invoice_trace_rate>\r\n");
+					                         	valueXmlString.append("<average_rate>").append("<![CDATA[").append(avgRate).append("]]>").append("</average_rate>\r\n");
 					                         	valueXmlString.append("</Detail>\r\n");
 												
 					                         	
@@ -1335,7 +1370,10 @@ public class SalesReturnAct extends ActionHandlerEJB implements SalesReturnActLo
 						                         	valueXmlString.append("<effective_cost>").append("<![CDATA[").append(rate).append("]]>").append("</effective_cost>\r\n");
 						                         	valueXmlString.append("<invoice_quantity>").append("<![CDATA[").append(invoiceQty).append("]]>").append("</invoice_quantity>\r\n");
 						                         	valueXmlString.append("<used_quantity>").append("<![CDATA[").append(adjQty).append("]]>").append("</used_quantity>\r\n");
-													valueXmlString.append("</Detail>\r\n");
+						                         	 //  added by nanadkumar gadkari on 26/09/19
+						                         	valueXmlString.append("<invoice_trace_rate>").append("<![CDATA[").append(invTraceRate).append("]]>").append("</invoice_trace_rate>\r\n");
+						                         	valueXmlString.append("<average_rate>").append("<![CDATA[").append(avgRate).append("]]>").append("</average_rate>\r\n");
+						                         	valueXmlString.append("</Detail>\r\n");
 													
 											}
 										}