Changes made to fix display active scheme on tool tip

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

webitm-wms/ibase/webitm/ejb/wms/SorderWizardEJB.java

@@ -55,7 +55,6 @@ import ibase.webitm.ejb.MasterStatefulLocal;
 import ibase.webitm.ejb.ValidatorEJB;
 import ibase.webitm.ejb.dis.DistCommon;
 import ibase.webitm.ejb.dis.SalesOrderIC;
-import ibase.webitm.ejb.dis.adv.SorderAct;
 import ibase.webitm.ejb.dis.adv.SorderActRemote;
 import ibase.webitm.utility.GenerateFormLayout;
 import ibase.webitm.utility.GenerateTranLayout;
@@ -2343,10 +2342,13 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 								 schemeCode = "";
 								 schemeDesc = "";
 								
-								 sql = " select a.scheme_code,a.descr from SCH_GROUP_DEF a,SCH_PUR_ITEMS b "
-								 	 + " where a.SCHEME_CODE = b.SCHEME_CODE and trim(b.ITEM_CODE) = ?";
+								 sql = " SELECT A.SCHEME_CODE,A.DESCR FROM SCH_GROUP_DEF A,SCH_PUR_ITEMS B, SCHEME_APPLICABILITY C "
+									 + " WHERE A.SCHEME_CODE = B.SCHEME_CODE AND A.SCHEME_CODE = C.SCHEME_CODE "
+									 + " AND C.APP_FROM <= ? AND C.VALID_UPTO >= ? AND TRIM(B.ITEM_CODE) = ?";
 									pstmt = conn.prepareStatement(sql);
-									pstmt.setString(1, itmCode);
+									pstmt.setTimestamp(1, java.sql.Timestamp.valueOf(genericUtility.getValidDateString(new Date(), genericUtility.getDBDateTimeFormat())));
+									pstmt.setTimestamp(2, java.sql.Timestamp.valueOf(genericUtility.getValidDateString(new Date(), genericUtility.getDBDateTimeFormat())));
+									pstmt.setString(3, itmCode);
 									rs = pstmt.executeQuery();
 									if(rs.next())
 									{