Changes for same transaction cancel again.

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

webitm-dis/ibase/webitm/ejb/dis/adv/ChargeBackFormAccept.java

@@ -9,6 +9,7 @@ import ibase.utility.CommonConstants;
 import ibase.webitm.utility.*;
 import ibase.webitm.ejb.*;
 import ibase.system.config.*;
+
 import java.sql.*;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
@@ -16,6 +17,7 @@ import java.rmi.*;
 import java.util.*;
 
 import org.w3c.dom.*;
+
 import javax.ejb.Stateless; // added for ejb3
 
 @Stateless // added for ejb3
@@ -154,6 +156,12 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack
 					errString = itmDBAccessEJB.getErrorString("","VTNTVERFY   ","","",conn);
 				    return errString;
 				}
+				Calendar curDate = Calendar.getInstance();
+				SimpleDateFormat sdfc = new SimpleDateFormat(genericUtility.getApplDateFormat());
+			    String sysDtStr = sdfc.format(curDate.getTime());
+			    System.out.println(">>>>>>>Now sysDateStr :=>  " + sysDtStr);	
+			    sysDate= Timestamp.valueOf(genericUtility.getValidDateString(sysDtStr, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0");
+			    System.out.println(">>>>>>>>sysDate:"+sysDate);	
 				
 				//String chbtranID = generateTranId("w_charge_back",loginSite,conn );
 				String chbtranID = generateTranId("w_charge_back",loginSite,siteCodeLog,conn );//added by chandrashekar on 16-12-2014
@@ -176,8 +184,8 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack
 							"	EMP_CODE__APRV ,CHG_DATE ,CHG_USER,CHG_TERM ,TRAN_ID__CRN,EFF_DATE ,TAX_AMT,PORDER_NO ,PORDER_DATE  ,VENDOR_NO ,"+
 							" INT_VENDOR_NO ,CUST_NAME_BAT ,CUST_PNAME_BAT  ,TEST_PROD ,CUST_CODE__SHIP ,CUST_NAME__SHIP ,CUST_CODE__END,CUST_NAME,CONTRACT_NO ,"+
 							  " PRICE_LIST,CUST_CODE_DLV,SITE_CODE__LOG,CLAUM_AMT ,ITEM_SER,PARENT__TRAN_ID ,REV__TRAN ,SPEC_REASON ,DIRECT_INV ,"+
-							  " SALE_PERIOD ,SITE_CODE__CR  ,DISCOUNT_INV    ,EMP_CODE,TRAN_ID,CUST_CODE,SITE_CODE,TYPE,STATUS ) "+
-							  " values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+							  " SALE_PERIOD ,SITE_CODE__CR  ,DISCOUNT_INV    ,EMP_CODE,TRAN_ID,CUST_CODE,SITE_CODE,TYPE,STATUS,STATUS_DATE ) "+
+							  " values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 					pStmt1 = conn.prepareStatement(sql);
 					pStmt1.setTimestamp(1,rs.getTimestamp(1));
 					pStmt1.setString(2,rs.getString(2));
@@ -226,6 +234,7 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack
 					pStmt1.setString(45,rs.getString(44));
 					pStmt1.setString(46,rs.getString(45));
 					pStmt1.setString(47,"O"); // VALLABH KADAM STATUS  is 'O' as OPEN
+					pStmt1.setTimestamp(48,sysDate); // VALLABH KADAM STATUS DATE
 					chbHed = pStmt1.executeUpdate();
 					if(pStmt1 != null)
 						pStmt1.close();
@@ -339,11 +348,12 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack
 				    sysDate= Timestamp.valueOf(genericUtility.getValidDateString(sysDateStr, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0");
 				    System.out.println(">>>>>>>>sysDate:"+sysDate);	
 				    
-				    sql = " update charge_back_form set tran_id__cb = ? , confirmed = 'Y', conf_date= ?, STATUS='A' where tran_id = ?";
+				    sql = " update charge_back_form set tran_id__cb = ? , confirmed = 'Y', conf_date= ?, STATUS='A', STATUS_DATE=? where tran_id = ?";
 				    pStmt1 = conn.prepareStatement(sql);
 				    pStmt1.setString(1,chbtranID);
 				    pStmt1.setTimestamp(2, sysDate);//conf_date is set by sagar on 04/07/14
-				    pStmt1.setString(3,tranId);
+				    pStmt1.setTimestamp(3,sysDate);
+				    pStmt1.setString(4,tranId);
 				    upConf = upConf + pStmt1.executeUpdate();
 				    if(pStmt1 != null)
 						pStmt1.close();

webitm-dis/ibase/webitm/ejb/dis/adv/ChargeBackFormCancel.java

@@ -73,14 +73,33 @@ public class ChargeBackFormCancel extends ActionHandlerEJB implements ChargeBack
 				errString = itmDBAccessEJB.getErrorString("","VTALRACCNC","","",conn);
 			    return errString;
 			}
-			else
-			{
+//			else
+//			{
 				/**
 				 * Hence the Transaction is not Accepted
 				 * Cancel the transaction
 				 * Set STATUS='X'
 				 * */
-				
+			System.out.println("Tran Id fornd by transaction :- ["+tranID+"]");
+	        sql = " select  count(*) as cnt from charge_back_form where tran_id = ? and STATUS = 'X'";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, tranID.trim());
+			rs = pstmt.executeQuery();
+			if(rs.next()) 
+			{
+				cnt  = rs.getInt("cnt");
+			}
+			rs.close();
+			rs = null;			
+			pstmt.close();
+			pstmt=null;
+			if(cnt > 0)
+			{
+				errString = itmDBAccessEJB.getErrorString("","VTALRACNCL","","",conn);
+			    return errString;
+			}
+			else
+			{
 				Calendar currentDate = Calendar.getInstance();
 				SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
 			    String sysDateStr = sdf.format(currentDate.getTime());
@@ -95,7 +114,7 @@ public class ChargeBackFormCancel extends ActionHandlerEJB implements ChargeBack
 				updateCount = pstmt.executeUpdate();				
 				pstmt.close();
 				pstmt = null;				
-				
+			}
 				if(updateCount>0)
 				{
 					if(errString==null || errString.trim().length()<=0)
@@ -107,7 +126,7 @@ public class ChargeBackFormCancel extends ActionHandlerEJB implements ChargeBack
 				{
 					errString = itmDBAccessEJB.getErrorString("","VTACNLFAIL","","",conn);
 				}
-			}			
+//			}			
         } 
 		catch (SQLException e)
         {

webitm-dis/ibase/webitm/ejb/dis/adv/ChargeBackLocCancel.java

@@ -71,13 +71,33 @@ public class ChargeBackLocCancel extends ActionHandlerEJB implements ChargeBackL
 				errString = itmDBAccessEJB.getErrorString("","VTALRACNFM","","",conn);
 			    return errString;
 			}			
-			else
-			{
+//			else
+//			{
 				/**
 				 * Hence the Transaction is not Accepted
 				 * Cancel the transaction
 				 * Set STATUS='X'
 				 * */
+				System.out.println("Tran Id fornd by transaction :- ["+tranID+"]");
+		        sql = " select  count(*) as cnt from charge_back where tran_id = ? and STATUS = 'X'";
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1, tranID.trim());
+				rs = pstmt.executeQuery();
+				if(rs.next()) 
+				{
+					cnt  = rs.getInt("cnt");
+				}
+				rs.close();
+				rs = null;			
+				pstmt.close();
+				pstmt=null;
+				if(cnt > 0)
+				{
+					errString = itmDBAccessEJB.getErrorString("","VTALRACNCL","","",conn);
+				    return errString;
+				}
+				else
+				{				
 				Calendar currentDate = Calendar.getInstance();
 				SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
 			    String sysDateStr = sdf.format(currentDate.getTime());
@@ -92,7 +112,7 @@ public class ChargeBackLocCancel extends ActionHandlerEJB implements ChargeBackL
 				updateCount = pstmt.executeUpdate();				
 				pstmt.close();
 				pstmt = null;				
-				
+				}
 				if(updateCount>0)
 				{
 					if(errString==null || errString.trim().length()<=0)
@@ -104,7 +124,7 @@ public class ChargeBackLocCancel extends ActionHandlerEJB implements ChargeBackL
 				{
 					errString = itmDBAccessEJB.getErrorString("","VTACNLFAIL","","",conn);
 				}
-			}
+//			}
         }
 		catch (SQLException e)
         {