Take unit from stock master and also change the order of loc_phy_row for EorLocationStock

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

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

@@ -202,7 +202,7 @@ public class EORLocationStock extends ValidatorEJB implements EORLocationStockRe
 			//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)";
+			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 DESC, 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);
@@ -246,7 +246,7 @@ public class EORLocationStock extends ValidatorEJB implements EORLocationStockRe
 			
 				//sql = "select  s.item_code, s.site_code, s.loc_code, s.lot_no, s.lot_sl, s.exp_date, s.quantity, s.alloc_qty, s.hold_qty , s.mfg_date, s.exp_date, s.retest_date , i.descr from stock s  ,item i  where s.quantity >0 and s.exp_date <= "+ sysDate +" and s.item_code=i.item_code  and s.loc_code = ? and  s.site_code = ? " + sqlStr.toString();
 				
-				sql = " select  s.item_code, s.site_code, s.loc_code, s.lot_no, s.lot_sl, s.exp_date, s.quantity, s.alloc_qty, s.hold_qty , s.mfg_date, s.exp_date, s.retest_date , i.descr from stock s  ,item i  where s.quantity >0 and  s.item_code=i.item_code  and s.loc_code = ? and  s.site_code = ? " + sqlStr.toString();
+				sql = " select  s.item_code, s.site_code, s.loc_code, s.lot_no, s.lot_sl, s.exp_date, s.quantity, s.alloc_qty, s.hold_qty , s.mfg_date, s.exp_date, s.retest_date , i.descr , s.unit from stock s  ,item i  where s.quantity >0 and  s.item_code=i.item_code  and s.loc_code = ? and  s.site_code = ? " + sqlStr.toString();
 				
 				System.out.println(" site code sql is="+sql);
 				pstmt1 = conn.prepareStatement(sql);
@@ -265,6 +265,7 @@ public class EORLocationStock extends ValidatorEJB implements EORLocationStockRe
 					xmlData.append("<quantity>").append("<![CDATA[" + rs1.getDouble("quantity") + "]]>").append("</quantity>");
 					xmlData.append("<hold_qty>").append("<![CDATA[" + rs1.getDouble("hold_qty") + "]]>").append("</hold_qty>");
 					xmlData.append("<alloc_qty>").append("<![CDATA[" + rs1.getDouble("alloc_qty") + "]]>").append("</alloc_qty>");
+					
 					if (rs1.getDate("mfg_date") != null)
 					{
 						xmlData.append("<mfg_date>").append("<![CDATA[" + rs1.getDate("mfg_date") + "]]>").append("</mfg_date>");
@@ -286,6 +287,7 @@ public class EORLocationStock extends ValidatorEJB implements EORLocationStockRe
 					{
 						xmlData.append("<retest_date>").append("<![CDATA[ ]]>").append("</retest_date>");
 					}
+					xmlData.append("<unit>").append("<![CDATA[" + rs1.getString("unit") + "]]>").append("</unit>");
 					xmlData.append("</stock>");
 				}
 				xmlData.append("</location_code>");