Add Drop Down For EOR Location TO See Those Location which hav eStock

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

webitm-dashboard/ibase/dashboard/wms/bean/EORLocationStockBean.java

@@ -61,12 +61,12 @@ public class EORLocationStockBean implements Serializable
 		return selectedEntity;
 	}
 	
-	public String getEORLocDtl(String locPhyArea, String siteCode,String locationRange, String expDate,String reTestDate) throws RemoteException, ITMException
+	public String getEORLocDtl(String locPhyArea, String siteCode,String locationRange, String expDate,String reTestDate ,String occupiedRack) throws RemoteException, ITMException
 	{
 		String xmlData ="";		
 		try
 		{			
-			xmlData = eORLocationStockRemote.getEORLocDtl(locPhyArea,siteCode,locationRange,expDate,reTestDate);
+			xmlData = eORLocationStockRemote.getEORLocDtl(locPhyArea,siteCode,locationRange,expDate,reTestDate,occupiedRack);
 		}
 		catch(Exception e)
 		{

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

@@ -142,7 +142,7 @@ public class EORLocationStock extends ValidatorEJB implements EORLocationStockRe
 		return selectedArea;
 	}
 
-	public String getEORLocDtl(String locPhyArea, String siteCode, String locationRange, String expDate, String reTestDate) throws RemoteException, ITMException
+	public String getEORLocDtl(String locPhyArea, String siteCode, String locationRange, String expDate, String reTestDate,String occupiedRack) throws RemoteException, ITMException
 	{
 		String sql = "";
 		ResultSet rs = null, rs1 = null;
@@ -163,6 +163,8 @@ public class EORLocationStock extends ValidatorEJB implements EORLocationStockRe
 		final String noString = "No";
 		try
 		{
+			
+			System.out.println(" occupiedRack ="+occupiedRack);
 			//sysDate = "sysdate";
 			sqlStr = new StringBuffer();
 			conn = connDriver.getConnectDB("DriverITM");
@@ -181,14 +183,24 @@ public class EORLocationStock extends ValidatorEJB implements EORLocationStockRe
 				sqlStr.append("  and  s.exp_date > " + sysDate);
 			}
 			
-			if (reTestDate != null && reTestDate.trim().length() != 0 && reTestDate.equalsIgnoreCase(yseString))
+			if (occupiedRack != null && occupiedRack.trim().length() != 0 && occupiedRack.equalsIgnoreCase(yseString))
+			{
+				//sqlStr.append("  and  s.exp_date <= " + sysDate);
+			}
+			else if(occupiedRack != null && occupiedRack.trim().length() != 0 && occupiedRack.equalsIgnoreCase(noString))
+			{
+				//sqlStr.append("  and  s.exp_date > " + sysDate);
+			}
+			
+			
+		/*	if (reTestDate != null && reTestDate.trim().length() != 0 && reTestDate.equalsIgnoreCase(yseString))
 			{
 				sqlStr.append(" and  s.retest_date < " + sysDate);
 			}
 			else if(reTestDate != null && reTestDate.trim().length() != 0 && reTestDate.equalsIgnoreCase(noString))
 			{
 				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";
 			pstmt = conn.prepareStatement(sql);
@@ -229,7 +241,11 @@ public class EORLocationStock extends ValidatorEJB implements EORLocationStockRe
 				}
 				xmlData.append("<loc_phy_col col=\"" + checkNull(rs.getString("loc_phy_col")) + "\">");
 				System.out.println(" before generating sql=");
-				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.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();
+				
 				System.out.println(" site code sql is="+sql);
 				pstmt1 = conn.prepareStatement(sql);
 				pstmt1.setString(1, locationCode);

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

@@ -11,6 +11,6 @@ import javax.ejb.Local;
 public interface EORLocationStockLocal  extends ValidatorLocal
 {
 	public String getEORLocPhyArea() throws RemoteException, ITMException;
-	public String getEORLocDtl(String locPhyArea,String loginCode,String locationRange,String expDate,String retestDate) throws RemoteException, ITMException;
+	public String getEORLocDtl(String locPhyArea,String loginCode,String locationRange,String expDate,String retestDate,String occupiedRack) throws RemoteException, ITMException;
 	public String getSelectedArea() throws RemoteException, ITMException;
 }

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

@@ -11,7 +11,7 @@ import javax.ejb.Remote;
 public interface EORLocationStockRemote  extends ValidatorRemote
 {
 	public String getEORLocPhyArea() throws RemoteException, ITMException;
-	public String getEORLocDtl(String locPhyArea,String loginCode,String locationRange,String expDate,String retestDate) throws RemoteException, ITMException;
+	public String getEORLocDtl(String locPhyArea,String loginCode,String locationRange,String expDate,String retestDate,String occupiedRack) throws RemoteException, ITMException;
 	public String getSelectedArea() throws RemoteException, ITMException;
 
 }