CHANGE FOR REPLACE EXPIRY DATE WITH PREVIOUS DATE OF EFFECTIVE DATE

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

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

@@ -45,6 +45,7 @@ public class TaxItemStanIC extends ValidatorEJB implements TaxItemStanICLocal,Ta
 		return (errString);
 	}
 
+	
 	public String wfValData(Document dom, Document dom1, Document dom2, String objContext, String editFlag, String xtraParams) throws RemoteException,ITMException
 	{
 		NodeList parentNodeList = null;
@@ -111,7 +112,7 @@ public class TaxItemStanIC extends ValidatorEJB implements TaxItemStanICLocal,Ta
 						{
 							sql = "SELECT COUNT(1) FROM station WHERE STAN_CODE = ? ";
 							pstmt = conn.prepareStatement(sql);
-							pstmt.setString( 1, stanCode );
+							pstmt.setString( 1, stanCode.trim());
 							rs = pstmt.executeQuery();
 							if (rs.next())
 							{
@@ -329,7 +330,6 @@ public class TaxItemStanIC extends ValidatorEJB implements TaxItemStanICLocal,Ta
 				int childNodeListLength = childNodeList.getLength();
 				System.out.println("[" + currentColumn + "] ==> '" + columnValue + "'");
 
-
 				if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) )
 				{
 					System.out.println("--------------------ITM_DEFAULT-----------------------");
@@ -542,19 +542,27 @@ public class TaxItemStanIC extends ValidatorEJB implements TaxItemStanICLocal,Ta
 								while(rs1.next())
 								{
 									validuptoDB = rs1.getTimestamp("valid_upto");
+									java.util.Date effFromDB1 = rs1.getDate("eff_from");
 									effFromDB = rs1.getTimestamp("eff_from");
 									
-									if(yesterday.equals(effFromDB))
-									{
-										errString = itmDBAccessEJB.getErrorString("","VTEXPDTNT1 ",userId);
-										break ;
-									}
-									else if(validuptoDB.after(yesterday))
+									Calendar cal = Calendar.getInstance();  
+									cal.setTime(effFromDB1);
+									cal.add(Calendar.DATE, -1);  
+									java.sql.Date effFromDB2 = new java.sql.Date(cal.getTimeInMillis());
+									Timestamp expiryDate = java.sql.Timestamp.valueOf(sdf1.format(effFromDB2)+" 00:00:00.0");
+								    
+//									if(yesterday.equals(effFromDB))
+//									{
+//										errString = itmDBAccessEJB.getErrorString("","VTEXPDTNT1 ",userId);
+//										break ;
+//									}
+									if(validuptoDB.after(expiryDate))
 									{
-										sql = "update tax_item_stan set valid_upto = ? where stan_code = ? ";
+										sql = "update tax_item_stan set valid_upto = ? where stan_code = ? and eff_from = ? ";
 										pstmt2 = conn.prepareStatement(sql);
-										pstmt2.setTimestamp(1,yesterday);
+										pstmt2.setTimestamp(1,expiryDate);
 										pstmt2.setString(2,stanCode);
+										pstmt2.setTimestamp(3,effFromDB);
 										int rows = pstmt2.executeUpdate();
 										cntR = cntR + rows;