change for point base scheme

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

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

@@ -5329,11 +5329,13 @@ public class PostOrderActivity {
 					}
 				}
 				
-				sql="UPDATE SCHEME_BALANCE SET BALANCE_FREE_VALUE = BALANCE_FREE_VALUE + ?  WHERE CUST_CODE = ?  AND ITEM_CODE= ?";
+				sql="UPDATE SCHEME_BALANCE SET BALANCE_FREE_VALUE = BALANCE_FREE_VALUE + ?  WHERE CUST_CODE = ?  AND ITEM_CODE= ? AND ? >= EFF_FROM and  ? <= VALID_UPTO";
 				pstmt1=conn.prepareStatement(sql);
 				pstmt1.setDouble(1, totalpoints);
 				pstmt1.setString(2, custCode);
 				pstmt1.setString(3, "X");
+				pstmt1.setTimestamp(4, orderDate);
+				pstmt1.setTimestamp(5, orderDate);
 				pstmt1.executeUpdate();
 				if (pstmt1 != null){
 					pstmt1.close();
@@ -5365,11 +5367,13 @@ public class PostOrderActivity {
 					retString = itmDBAccessEJB.getErrorString("","VTFREEPOIN","","",conn);
 				}
 				else {
-					sql="UPDATE SCHEME_BALANCE SET USED_FREE_VALUE = USED_FREE_VALUE + ?  WHERE  CUST_CODE = ?  AND ITEM_CODE= ?";
+					sql="UPDATE SCHEME_BALANCE SET USED_FREE_VALUE = USED_FREE_VALUE + ?  WHERE  CUST_CODE = ?  AND ITEM_CODE= ? AND ? >= EFF_FROM and  ? <= VALID_UPTO";
 					pstmt1=conn.prepareStatement(sql);
 					pstmt1.setDouble(1, totalusedpoints);
 					pstmt1.setString(2, custCode);
 					pstmt1.setString(3, "X");
+					pstmt1.setTimestamp(4, orderDate);
+					pstmt1.setTimestamp(5, orderDate);
 					pstmt1.executeUpdate();
 					if (pstmt1 != null){
 						pstmt1.close();

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

@@ -866,10 +866,12 @@ public class SaleOrderPostSave extends ValidatorEJB implements SaleOrderPostSave
 					{
 					
 					sql = " SELECT BALANCE_FREE_VALUE - USED_FREE_VALUE  FROM SCHEME_BALANCE  WHERE  BALANCE_FREE_VALUE - USED_FREE_VALUE > 0 "
-							+ "  AND CUST_CODE = ?  AND ITEM_CODE= ?  ";
+							+ "  AND CUST_CODE = ?  AND ITEM_CODE= ?  AND EFF_FROM <= ? AND VALID_UPTO >=? ";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1,custCode);
 						pstmt.setString(2,"X");
+						pstmt.setTimestamp(3, orderDate);
+						pstmt.setTimestamp(4, orderDate);
 						rs = pstmt.executeQuery();
 
 						if (rs.next()) 

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

@@ -3155,10 +3155,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 									}
 									
 									sql = " SELECT BALANCE_FREE_VALUE - USED_FREE_VALUE  FROM SCHEME_BALANCE  WHERE  BALANCE_FREE_VALUE - USED_FREE_VALUE > 0 "
-											+ "  AND CUST_CODE = ?  AND ITEM_CODE= ?  ";
+											+ "  AND CUST_CODE = ?  AND ITEM_CODE= ?   AND EFF_FROM <= ? AND VALID_UPTO >=?";
 										pstmt = conn.prepareStatement(sql);
 										pstmt.setString(1,custCode);
 										pstmt.setString(2,"X");
+										pstmt.setTimestamp(3, orderDate);
+										pstmt.setTimestamp(4, orderDate);
 										rs = pstmt.executeQuery();
 
 										if (rs.next())