Change the theme of location occupancy , modify Ejb for loc_phy_col

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

webitm-dashboard/ibase/dashboard/wms/ejb/EORLocationStock.java

@@ -40,7 +40,6 @@ public class EORLocationStock extends ValidatorEJB implements EORLocationStockRe
 
 			pstmt = conn.prepareStatement(sql);
 			rs = pstmt.executeQuery();
-
 			xmlData = new StringBuffer("<?xml version='1.0'?> <Root>");
 			while (rs.next())
 			{
@@ -87,7 +86,6 @@ public class EORLocationStock extends ValidatorEJB implements EORLocationStockRe
 
 	public String getSelectedArea() throws RemoteException, ITMException
 	{
-
 		String sql = "";
 		ResultSet rs = null;
 		Connection conn = null;
@@ -192,7 +190,6 @@ public class EORLocationStock extends ValidatorEJB implements EORLocationStockRe
 				//sqlStr.append("  and  s.exp_date > " + sysDate);
 			}
 			
-			
 		/*	if (reTestDate != null && reTestDate.trim().length() != 0 && reTestDate.equalsIgnoreCase(yseString))
 			{
 				sqlStr.append(" and  s.retest_date < " + sysDate);
@@ -202,7 +199,12 @@ public class EORLocationStock extends ValidatorEJB implements EORLocationStockRe
 				sqlStr.append("  and  s.retest_date > " + sysDate);
 			}*/
 			
-			sql = "select  loc_code,loc_phy_row,loc_phy_col,loc_phy_stack  from location  where loc_phy_area = ? and site_code = ? " + locCode + "  order by loc_phy_row, loc_phy_stack ,loc_phy_col";
+			//sql = "select  loc_code,loc_phy_row,loc_phy_col,loc_phy_stack  from location  where loc_phy_area = ? and site_code = ? " + locCode + "  order by loc_phy_row, loc_phy_stack ,loc_phy_col";
+			
+			//*Change query for alphanumeric sorting **/
+			sql = "select  loc_code,loc_phy_row,loc_phy_col,loc_phy_stack  from location  where loc_phy_area = ? and site_code = ? " + locCode + "  order by loc_phy_row, loc_phy_stack ,substr(loc_phy_col,1,1), cast(substr(loc_phy_col,2) as int)";
+			//* End Change query for alphanumeric sorting **/
+			
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, locPhyArea);
 			pstmt.setString(2, siteCode);
@@ -344,7 +346,6 @@ public class EORLocationStock extends ValidatorEJB implements EORLocationStockRe
 		System.out.println("Final XML===" + xmlData.toString());
 		return xmlData.toString();
 	}
-
 	private String checkNull(String input)
 	{
 		if (input == null)