period_tbl entry_start_dt,entry_end_dt condition removed

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

webitm-dis/ibase/webitm/ejb/dis/CustStockGWTIC.java

@@ -1780,7 +1780,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 								"and a.site_code=? " +
 								//" AND b.prd_code = ? " +
 								"and b.prd_tblno=? " +
-								"AND case when a.type is null then 'X' else a.type end='S' ";
+								"AND case when a.type is null then 'X' else a.type end='S'  "+
+								"and CASE WHEN b.prd_closed IS NULL THEN 'N' ELSE b.prd_closed END='N' " ;
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1,loginSiteCode);
 						//pstmt.setString(2,period.trim());
@@ -1828,7 +1829,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 										"where a.ref_code=a.prd_tblno and a.prd_tblno=b.prd_tblno " +
 										"and a.site_code=? AND b.prd_code = ? " +
 										"and b.prd_tblno=? " +
-										"AND case when a.type is null then 'X' else a.type end='S' ";
+										"AND case when a.type is null then 'X' else a.type end='S' "+
+										"and CASE WHEN b.prd_closed IS NULL THEN 'N' ELSE b.prd_closed END='N' " ;
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString(1,loginSiteCode);
 								pstmt.setString(2,period.trim());
@@ -2801,8 +2803,9 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 						pstmt.close();
 						pstmt = null;*/
 						
-						sql = "select b.FR_DATE as FR_DATE,b.TO_DATE as TO_DATE,b.entry_start_dt as entry_start_dt" +
-								",b.entry_end_dt as entry_end_dt" +
+						sql = "select b.FR_DATE as FR_DATE,b.TO_DATE as TO_DATE " +
+								//",b.entry_start_dt as entry_start_dt" +
+								//",b.entry_end_dt as entry_end_dt" +
 								" from period_appl a,period_tbl b " +
 								"where a.ref_code=a.prd_tblno and a.prd_tblno=b.prd_tblno " +
 								"and a.site_code=? " +
@@ -3261,8 +3264,9 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 					pstmt.close();
 					pstmt = null;*/
 					
-					 sql = "select b.FR_DATE as FR_DATE,b.TO_DATE as TO_DATE,b.entry_start_dt as entry_start_dt" +
-								",b.entry_end_dt as entry_end_dt" +
+					 sql = "select b.FR_DATE as FR_DATE,b.TO_DATE as TO_DATE " +
+					 		//",b.entry_start_dt as entry_start_dt" +
+							//	",b.entry_end_dt as entry_end_dt" +
 								" from period_appl a,period_tbl b " +
 								"where a.ref_code=a.prd_tblno and a.prd_tblno=b.prd_tblno " +
 								"and a.site_code=? " +