Changes have been made in Sales Return for unit rate to be set from...

Changes have been made in Sales Return for unit rate to be set from invoice_trace for mail by C.Raja


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

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

@@ -2488,7 +2488,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 							sql = " select inv_line_no,site_code__mfg, mfg_date, exp_date, lot_no, "
 							 + " lot_sl, desp_id, desp_line_no, rate__std, cost_rate, item_code, quantity, "
 							 + " tax_class, tax_chap, tax_env, rate, rate__clg, sord_no, sord_line_no,	"
-							 + " item_code__ord, line_type "
+							 + " item_code__ord, line_type,unit__rate "
 							 + " from invoice_trace where invoice_id	= ? and line_no = ? ";	
 							pstmt= conn.prepareStatement( sql );
 							pstmt.setString( 1, invoiceId );
@@ -2499,6 +2499,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 
 
 								//lineNoInv = Integer.parseInt( getNumString( rs.getString("inv_line_no") ) );
+								
 								lineNoInvStr  = getNumString( rs.getString("inv_line_no") ) ;
 								lineNoInvStr = lineNoInvStr == null || lineNoInvStr.trim().length() == 0 ? "0" : lineNoInvStr.trim();
 								if( lineNoInvStr != null )
@@ -2553,6 +2554,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 								sordLineNo = rs.getString("sord_line_no");
 								itemCodeOrd = rs.getString("item_code__ord");
 								lineType = rs.getString("line_type");
+								unitRate = rs.getString("unit__rate");
 								System.out.println( "taxClasss :1: " + taxClasss ); 
 								
 								taxClasss = getAbsString(taxClasss);
@@ -2636,7 +2638,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 										custCode,"C",conn);
 								valueXmlString.append("<item_ser>").append("<![CDATA[" + itemSer + "]]>").append("</item_ser>");
 								setNodeValue( dom, "item_ser", itemSer );
-								sql = " select descr, unit, unit__rate from item where item_code = ? ";	
+								sql = " select descr, unit from item where item_code = ? ";	
 								pstmt= conn.prepareStatement( sql );
 								pstmt.setString( 1, itemCode );
 								rs = pstmt.executeQuery(); 
@@ -2644,7 +2646,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 								{
 									descr = rs.getString(1);
 									unit = rs.getString(2);
-									unitRate = rs.getString(3);
+								//	unitRate = rs.getString(3);
 									unitStd = unit;
 									valueXmlString.append("<item_descr>").append("<![CDATA[" + descr + "]]>").append("</item_descr>");
 									setNodeValue( dom, "item_descr", descr );
@@ -8095,7 +8097,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 			lotNo = genericUtility.getColumnValue("lot_no",dom);
 			tranDate = genericUtility.getColumnValue("tran_date",dom1);
 			qtyStdUom = Double.parseDouble(genericUtility.getColumnValue("quantity__stduom",dom));
-			unitRate = genericUtility.getColumnValue("unit__rate",dom);
+			unitRate = genericUtility.getColumnValue("unit__rate",dom);//Changed by Priyanka Das for unit to be set from invoice_trace
 			unitStd = genericUtility.getColumnValue("unit__std",dom);
 			
 			unitRate = unitRate == null ?"" : unitRate.trim();