Sarita: Done changes to resolve scheme issues on 19JAN2018

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

webitm-dis/ibase/webitm/ejb/dis/adv/SorderAct.java

@@ -256,12 +256,15 @@ public class SorderAct extends ActionHandlerEJB implements SorderActLocal, Sorde
 			{
 				currDetail = detailList.item(ctr);
 				
-				itemCode = genericUtility.getColumnValueFromNode("item_code__ord", currDetail);
-				quantity = genericUtility.getColumnValueFromNode("quantity", currDetail);	
-				siteCode = genericUtility.getColumnValueFromNode("site_code", currDetail);
-				rate = genericUtility.getColumnValueFromNode("rate", currDetail);
-				qty = Double.valueOf(checkDouble(quantity));
-				purRate = Double.valueOf(checkDouble(rate));
+				itemCode = checkNull(genericUtility.getColumnValueFromNode("item_code__ord", currDetail));
+				quantity = checkNull(genericUtility.getColumnValueFromNode("quantity", currDetail));	
+				siteCode = checkNull(genericUtility.getColumnValueFromNode("site_code", currDetail));
+				rate = checkNull(genericUtility.getColumnValueFromNode("rate", currDetail));
+				//Added by sarita on 19/JAN/2018
+				if(quantity != null && quantity.trim().length() > 0){
+				qty = Double.valueOf(checkDouble(quantity));}
+				if(rate != null && rate.trim().length() > 0){
+				purRate = Double.valueOf(checkDouble(rate));}
 				itemList.add(itemCode);
 				
 				if(itemQuantityMap.containsKey(itemCode))
@@ -771,14 +774,14 @@ public class SorderAct extends ActionHandlerEJB implements SorderActLocal, Sorde
 		}
 		catch(Exception e)
 		{
-			System.out.println("Exception in returnFinalDataUsingList is:::"+e);
+			System.out.println("Exception in returnFinalFreeItemDataUsingList is:::"+e);
 			e.printStackTrace();
 		}
 		return valueXmlString.toString();
 	}
 	
-	
-	public String returnFinalDataUsingList(List<String> list,Connection conn,String siteCode)
+	//Commented by sarita on 19/JAN/2018
+/*	public String returnFinalDataUsingList(List<String> list,Connection conn,String siteCode)
 	{
 		System.out.println("finalFreeItems :::"+list);
 		System.out.println("finalFreeItems :::"+list.size());
@@ -810,7 +813,7 @@ public class SorderAct extends ActionHandlerEJB implements SorderActLocal, Sorde
 			e.printStackTrace();
 		}
 		return valueXmlString.toString();
-	}
+	}*/
 	
 	public String getItemCode(List<String> itemCodeListScheme)
 	{
@@ -846,4 +849,16 @@ public class SorderAct extends ActionHandlerEJB implements SorderActLocal, Sorde
 		}
 		return input;
 	}
+	//Added by sarita on 19/JAN/2018
+	private String checkNull(String str)
+	{
+		if(str == null)
+		{
+			return "";
+		}
+		else
+		{
+			return str.trim() ;
+		}
+	}
 }
\ No newline at end of file