Commit e75f1514 authored by skale's avatar skale

Change in code for refseq issue.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91214 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 08ad9a96
......@@ -77,6 +77,7 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
String custCode = "";
String empCode = "";
String confirmed = "";
double cbNetAmt = 0;
userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
loginSite = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginSiteCode");
empCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode");
......@@ -92,8 +93,10 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
conn = connDriver.getConnectDB("DriverITM");
conn.setAutoCommit(false);
connDriver = null;
currDate = new Timestamp( System.currentTimeMillis() );
sql = "select tran_id, tran_date, site_code, cust_code, confirmed "
//currDate = new Timestamp( System.currentTimeMillis() );
currDate = getCurrdateTSFormat();
System.out.println("****getCurrdateTSFormat****"+currDate);
sql = "select tran_id, tran_date, site_code, cust_code, confirmed, net_amt "
+" from charge_back "
+" where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
......@@ -105,6 +108,7 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
siteCode = rs.getString("site_code");
custCode = rs.getString("cust_code");
confirmed = rs.getString("confirmed");
cbNetAmt = rs.getDouble("net_amt");
}
rs.close();
rs = null;
......@@ -116,6 +120,12 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
returnString = itmDBAccessEJB.getErrorString("",errStr,userId);
return returnString;
}
if( cbNetAmt == 0 )
{
errStr = "VTNTAMTZRO";
returnString = itmDBAccessEJB.getErrorString("",errStr,userId);
return returnString;
}
sql = "update charge_back set "
+" confirmed = 'Y', "
......@@ -394,7 +404,7 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
drcrAmt = claimAmt < netAmt ? claimAmt : netAmt;
}
crNtTranId = generateTranId("W_MISC_DRCR_RCP_CR", getCurrdateInAppFormat(), loginSite, userId, tranType );
crNtTranId = generateTranId("W_MISC_DRCR_RCP_CR", getCurrdateInAppFormat(), loginSite, userId, tranType, conn );
//-----------------------Inserting into header-----------------------------------
pstmtHdr.setString( 1, crNtTranId );
pstmtHdr.setString( 2, "MDRCRC" );
......@@ -612,6 +622,11 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
{
try
{
if( !errCode.equals("VTSUCC1") )
{
System.out.println("......connection rollback.......");
conn.rollback();
}
if(pstmt != null)
{
pstmt.close();
......@@ -653,7 +668,7 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
{
ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM");
conn.setAutoCommit(false);
//conn.setAutoCommit(false);
methodName = "gbf_post";
actionURI = "http://NvoServiceurl.org/" + methodName;
......@@ -742,9 +757,29 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
}
return (currAppdate);
}
private String generateTranId(String windowName, String tranDate, String siteCode ,String signBy,String tranType)
private Timestamp getCurrdateTSFormat()
{
String s = "";
Timestamp timestamp = null;
GenericUtility genericUtility = GenericUtility.getInstance();
try
{
java.util.Date date = null;
timestamp = new Timestamp(System.currentTimeMillis());
SimpleDateFormat simpledateformat = new SimpleDateFormat(genericUtility.getDBDateFormat());
date = simpledateformat.parse(timestamp.toString());
timestamp = Timestamp.valueOf(simpledateformat.format(date).toString() + " 00:00:00.0");
}
catch(Exception exception)
{
System.out.println("Exception in getCurrdateAppFormat " + exception.getMessage());
}
return timestamp;
}
private String generateTranId(String windowName, String tranDate, String siteCode ,String signBy,String tranType,Connection conn)
{
Connection conn = null;
//Connection conn = null;
PreparedStatement pstmt = null;
ResultSet rs = null;
String generateTranIdSql = null;
......@@ -756,9 +791,8 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
String tranIdCol = "";
try
{
ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB( "DriverITM" );
conn.setAutoCommit(false);
//ConnDriver connDriver = new ConnDriver();
//conn = connDriver.getConnectDB( "DriverITM" );
generateTranIdSql = "SELECT KEY_STRING, TRAN_ID_COL, REF_SER FROM TRANSETUP WHERE UPPER(TRAN_WINDOW)= ?";
System.out.println("[ChargeBackLocConfEJB :: generateTranId : input Paramaters][windowName]["+windowName+"][tranDate]["+tranDate+"][siteCode]["+siteCode+"]");
System.out.println( "[ChargeBackLocConfEJB : generateTranId : Tran generator Sql[" + generateTranIdSql+"]" );
......@@ -792,7 +826,6 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
TransIDGenerator tg = new TransIDGenerator(xmlValues,signBy, CommonConstants.DB_NAME);
tranId = tg.generateTranSeqID(refSer, tranIdCol, keyString, conn);
System.out.println("tranId :"+tranId);
conn.commit();
}
catch (SQLException ex)
{
......@@ -806,10 +839,10 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
{
try
{
if( conn != null ){
/* if( conn != null ){
conn.close();
conn = null;
}
} */
if( rs != null )
{
rs.close();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment