Cost rate setting as -1 added line_no_invtrace ref to get cost rate

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

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

@@ -1354,7 +1354,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 						infoMap.put("lot_sl", lotSl);
 						infoMap.put("tran_date", tranDate);
 						infoMap.put("invoice_id", invoiceId);
-						//infoMap.put( "line_no__invtrace", genericUtility.getColumnValue( "line_no__invtrace", dom ) );
+						infoMap.put( "line_no__invtrace", genericUtility.getColumnValue( "line_no__invtrace", dom ) );
 						infoMap.put( "quantity__stduom", new Double( -1 * qtyStdUom ) );
 						priceList=getPriceList(dom1,dom,conn);//Getting PriceList Value, method added by sagar on 19/08/14..
 						System.out.println(">>>>>>>>>>Check priceList for getCost Rate 1:"+priceList);
@@ -2962,11 +2962,16 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 							tranDate = genericUtility.getColumnValue("tran_date", dom1);
 							siteCode = genericUtility.getColumnValue("site_code", dom1);
 							invoiceId = genericUtility.getColumnValue("invoice_id", dom1);
+							if(invoiceId==null || invoiceId.trim().length()==0)
+							{
+								invoiceId = genericUtility.getColumnValue("invoice_id", dom);
+							}
 							unitRate = genericUtility.getColumnValue("unit__rate", dom);
 							unitRate = unitRate == null ? "" : unitRate;
 							unitStd = genericUtility.getColumnValue("unit__std", dom);
 							retReplFlag = genericUtility.getColumnValue("ret_rep_flag", dom);
 							String iValStr = genericUtility.getColumnValue("line_no__inv", dom);
+							lineNoTrace=genericUtility.getColumnValue("line_no__invtrace", dom);
 							if (iValStr != null && iValStr.indexOf(".") > 0)
 							{
 								iValStr = iValStr.substring(0,iValStr.indexOf("."));
@@ -2991,7 +2996,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 							infoMap.put("lot_sl", lotSl);
 							infoMap.put("tran_date", tranDate);
 							infoMap.put("invoice_id", invoiceId);
-							//infoMap.put("line_no__invtrace",lineNoTrace);
+							infoMap.put("line_no__invtrace",lineNoTrace);
 							infoMap.put( "quantity__stduom", new Double( -1 * quantity ) );
 							priceList=getPriceList(dom1,dom,conn);//Getting PriceList Value, method added by sagar on 18/08/14..
 							System.out.println(">>>>>>>>>>Check priceList for getCost Rate 2:"+priceList);
@@ -6617,7 +6622,7 @@ public class SReturnForm extends ValidatorEJB implements SReturnFormLocal, SRetu
 			lotSl = ( infoMap.get("lot_sl") == null ? null : infoMap.get("lot_sl").toString() );
 			tranDate = ( infoMap.get("tran_date") == null ? null : infoMap.get("tran_date").toString() ); 
 			invoiceId = ( infoMap.get("invoice_id") == null ? null : infoMap.get("invoice_id").toString() ); 
-			//lineNoTrace = ( infoMap.get("line_no__invtrace") == null ? null : infoMap.get("line_no__invtrace").toString() );  
+			lineNoTrace = ( infoMap.get("line_no__invtrace") == null ? null : infoMap.get("line_no__invtrace").toString() );  
 			qtyStdUom = Double.parseDouble( ( infoMap.get("quantity__stduom") == null ? "0" : infoMap.get("quantity__stduom").toString() ) );
 			
 			if ("P".equals(retReplFlag))