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 ...@@ -77,6 +77,7 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
String custCode = ""; String custCode = "";
String empCode = ""; String empCode = "";
String confirmed = ""; String confirmed = "";
double cbNetAmt = 0;
userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"); userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
loginSite = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginSiteCode"); loginSite = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginSiteCode");
empCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode"); empCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode");
...@@ -92,8 +93,10 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo ...@@ -92,8 +93,10 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
conn.setAutoCommit(false); conn.setAutoCommit(false);
connDriver = null; connDriver = null;
currDate = new Timestamp( System.currentTimeMillis() ); //currDate = new Timestamp( System.currentTimeMillis() );
sql = "select tran_id, tran_date, site_code, cust_code, confirmed " currDate = getCurrdateTSFormat();
System.out.println("****getCurrdateTSFormat****"+currDate);
sql = "select tran_id, tran_date, site_code, cust_code, confirmed, net_amt "
+" from charge_back " +" from charge_back "
+" where tran_id = ? "; +" where tran_id = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -105,6 +108,7 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo ...@@ -105,6 +108,7 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
siteCode = rs.getString("site_code"); siteCode = rs.getString("site_code");
custCode = rs.getString("cust_code"); custCode = rs.getString("cust_code");
confirmed = rs.getString("confirmed"); confirmed = rs.getString("confirmed");
cbNetAmt = rs.getDouble("net_amt");
} }
rs.close(); rs.close();
rs = null; rs = null;
...@@ -116,6 +120,12 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo ...@@ -116,6 +120,12 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
returnString = itmDBAccessEJB.getErrorString("",errStr,userId); returnString = itmDBAccessEJB.getErrorString("",errStr,userId);
return returnString; return returnString;
} }
if( cbNetAmt == 0 )
{
errStr = "VTNTAMTZRO";
returnString = itmDBAccessEJB.getErrorString("",errStr,userId);
return returnString;
}
sql = "update charge_back set " sql = "update charge_back set "
+" confirmed = 'Y', " +" confirmed = 'Y', "
...@@ -394,7 +404,7 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo ...@@ -394,7 +404,7 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
drcrAmt = claimAmt < netAmt ? claimAmt : netAmt; 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----------------------------------- //-----------------------Inserting into header-----------------------------------
pstmtHdr.setString( 1, crNtTranId ); pstmtHdr.setString( 1, crNtTranId );
pstmtHdr.setString( 2, "MDRCRC" ); pstmtHdr.setString( 2, "MDRCRC" );
...@@ -612,6 +622,11 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo ...@@ -612,6 +622,11 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
{ {
try try
{ {
if( !errCode.equals("VTSUCC1") )
{
System.out.println("......connection rollback.......");
conn.rollback();
}
if(pstmt != null) if(pstmt != null)
{ {
pstmt.close(); pstmt.close();
...@@ -653,7 +668,7 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo ...@@ -653,7 +668,7 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
{ {
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
conn.setAutoCommit(false); //conn.setAutoCommit(false);
methodName = "gbf_post"; methodName = "gbf_post";
actionURI = "http://NvoServiceurl.org/" + methodName; actionURI = "http://NvoServiceurl.org/" + methodName;
...@@ -742,9 +757,29 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo ...@@ -742,9 +757,29 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
} }
return (currAppdate); return (currAppdate);
} }
private String generateTranId(String windowName, String tranDate, String siteCode ,String signBy,String tranType) private Timestamp getCurrdateTSFormat()
{ {
Connection conn = null; 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;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
String generateTranIdSql = null; String generateTranIdSql = null;
...@@ -756,9 +791,8 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo ...@@ -756,9 +791,8 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
String tranIdCol = ""; String tranIdCol = "";
try try
{ {
ConnDriver connDriver = new ConnDriver(); //ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB( "DriverITM" ); //conn = connDriver.getConnectDB( "DriverITM" );
conn.setAutoCommit(false);
generateTranIdSql = "SELECT KEY_STRING, TRAN_ID_COL, REF_SER FROM TRANSETUP WHERE UPPER(TRAN_WINDOW)= ?"; 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 : input Paramaters][windowName]["+windowName+"][tranDate]["+tranDate+"][siteCode]["+siteCode+"]");
System.out.println( "[ChargeBackLocConfEJB : generateTranId : Tran generator Sql[" + generateTranIdSql+"]" ); System.out.println( "[ChargeBackLocConfEJB : generateTranId : Tran generator Sql[" + generateTranIdSql+"]" );
...@@ -792,7 +826,6 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo ...@@ -792,7 +826,6 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
TransIDGenerator tg = new TransIDGenerator(xmlValues,signBy, CommonConstants.DB_NAME); TransIDGenerator tg = new TransIDGenerator(xmlValues,signBy, CommonConstants.DB_NAME);
tranId = tg.generateTranSeqID(refSer, tranIdCol, keyString, conn); tranId = tg.generateTranSeqID(refSer, tranIdCol, keyString, conn);
System.out.println("tranId :"+tranId); System.out.println("tranId :"+tranId);
conn.commit();
} }
catch (SQLException ex) catch (SQLException ex)
{ {
...@@ -806,10 +839,10 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo ...@@ -806,10 +839,10 @@ public class ChrgBckLocConf extends ActionHandlerEJB implements ChrgBckLocConfLo
{ {
try try
{ {
if( conn != null ){ /* if( conn != null ){
conn.close(); conn.close();
conn = null; conn = null;
} } */
if( rs != null ) if( rs != null )
{ {
rs.close(); 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