Skip to content

B
business-java
Commit ea4e2c41 authored by msingh's avatar msingh
Browse files
Options

Changed by Manish on 08/04/16 for DockTranPos.java 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@101150 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c22bbe76
Show whitespace changes
Inline Side-by-side
Showing with 118 additions and 25 deletions
webitm-wms/ibase/webitm/ejb/wms/DockTranPos.java
View file @ ea4e2c41
......@@ -9,6 +9,7 @@ import ibase.system.config.*;
import ibase.webitm.bean.wms.PaypalParameters;
import ibase.webitm.bean.wms.ShipmentStatus;
import ibase.webitm.ejb.*;
import ibase.webitm.ejb.dis.DespatchConfirmLocal;
import ibase.webitm.ejb.dis.DistCommon;
import ibase.webitm.ejb.dis.InvAllocTraceBean;
import ibase.webitm.ejb.dis.StockUpdate;
......@@ -121,6 +122,9 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
// Changed by Sneha on 16-03-2016, [Start]
int receiptCount = 0;
// Changed by Sneha on 16-03-2016, [End]
//Added by Manish on 04/04/2016
DespatchConfirmLocal despatchConfirmLocal = null;
try
{
DistCommon distCommonObj = new DistCommon();
......@@ -383,7 +387,8 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
modName = "W_SAGEPAY";
//segPayStatus = authoriseSagePay(ptcn, conn);
//Changed by manish to check token_info is present or not on 09/03/16 [start]
if(tokenInfo == null || tokenInfo.trim().length() == 0 )
//if(tokenInfo == null || tokenInfo.trim().length() == 0 ||( tokenInfo != null && tokenInfo.indexOf("OK") < -1) )
if(tokenInfo == null || tokenInfo.trim().length() == 0 || ( tokenInfo != null && tokenInfo.indexOf("OK") == -1) )
{
segPayStatus = authoriseSagePay(ptcn, conn);
segPayStatus = segPayStatus == null ? "" : segPayStatus.trim();
......@@ -488,7 +493,8 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
{
//payPalStatus = authorizePayPal(ptcn, conn);
//Changed by manish to check token_info is present or not on 09/03/16 [start]
if(tokenInfo == null || tokenInfo.trim().length() == 0)
//if(tokenInfo == null || tokenInfo.trim().length() == 0)
if(tokenInfo == null || tokenInfo.trim().length() == 0 || ( tokenInfo != null && tokenInfo.indexOf("Success") == -1) )
{
payPalStatus = authorizePayPal(ptcn, conn);
payPalStatus = payPalStatus == null ? "" : payPalStatus.trim();
......@@ -697,7 +703,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
System.out.println("errString After confirmed------>>["+errString+"]");
if(errString.indexOf("VTCICONF3") > -1)
{
conn.commit();
//conn.commit();
System.out.println("Advanced receipt generated or confirmed successfully..................");
}
else
......@@ -746,7 +752,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
//Changed by samadhan on 01/06/2015 for status tracking update in magento system.end
conn.commit();
//conn.commit();
//Added by Santosh on 01-04-2016 for Exchange rate [Start]
......@@ -812,27 +818,29 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
{
System.out.println("Despatch Header Updated successfully with exchage rate [ "+exchRate +"]");
}
conn.commit();
pstmt.close();
pstmt = null;
//conn.commit();
//Added by Santosh on 01-04-2016 for Exchange rate [End]
//Changed By Manish To check the desp conf flag 08/03/16.start
isDespConfEnable = distCommonObj.getDisparams("999999", "IS_DESP_CONF_REQD", conn);
//Added by Manish on 04/04/2016
despatchConfirmLocal = (DespatchConfirmLocal)ctx.lookup("ibase/DespatchConfirm/local");
if("Y".equalsIgnoreCase(isDespConfEnable))
{
//Changed by Manish on 09/03/16 for retrying when got axis fault error [start]
for (int callCount = 0; callCount <= 2; callCount++)
/*for (int callCount = 0; callCount <= 2; callCount++)
{
System.out.println("------Commited all transaction before despatch confirmed...callCount....[" + callCount + "]");
try
{
errString = confirmDespatch("despatch", despId, xtraParams, "", conn);
// errString = confirmDespatch("despatch", despId, xtraParams, "", conn);
System.out.println("manish ========calling despatch confirm");
errString = despatchConfirmLocal.confirm( despId, xtraParams, "", conn);
}
catch (Exception e)
{
......@@ -847,11 +855,43 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
}
}
//Changed by Manish on 09/03/16 for retrying when got axis fault error [end]
System.out.println("------Commited all transaction before despatch confirmed.......");
System.out.println("------Commited all transaction before despatch confirmed.......");*/
// errString = confirmDespatch("despatch", despId, xtraParams, "", conn);
//Changed By Manish to call confirm method for despatch confirm 08/04/16.start
System.out.println(" ========calling despatch confirm ========");
errString = despatchConfirmLocal.confirm( despId, xtraParams, "", conn);
System.out.println("errString After Despatch Confirmed------>>["+errString+"]");
//Changed By Manish to call confirm method for despatch confirm 08/04/16.end
//Added by santosh on 05-04-2016 [Start]
String invoiceId = "";
sql = "SELECT INVOICE_ID FROM INVOICE WHERE DESP_ID = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, despId);
rs = pstmt.executeQuery();
if(rs.next())
{
invoiceId = rs.getString(1);
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
if(errString != null && errString.indexOf("VTSUCC1") > 0)
//Added by santosh on 05-04-2016 [Start]
//if(errString != null && errString.indexOf("VTSUCC1") > 0)
if(errString != null && errString.indexOf("VTPOSTDES") != -1)
{
System.out.println("----------"+despId+" Despatch confirmed successfully.................");
......@@ -897,7 +937,10 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
{
generateInvoiceReport(ptcn, despId, printer, conn, xtraParams);
}
break;
//added by santosh on 05-04-2016 to confirm Invoice
confirmInvoice("invoice", invoiceId, xtraParams, "", conn);
System.out.println("just after confirmInvoice========");
//break;
// Changed by Sneha on 08/03/2016 [End]
//Changed by Manish on [12/05/15] END
......@@ -907,7 +950,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
return errString;
//throw new Exception(errString);
}
}
// }
}
else
{
......@@ -1236,11 +1279,11 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
System.out.println("rollback");
conn.rollback();
}
if(!isError)
/*if(!isError)
{
conn.commit();
System.out.println("commit...");
}
}*/
if( rs != null )
{
rs.close();
......@@ -1993,8 +2036,9 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
return responseStr;
}
//
public String confirmDespatch(String businessObj, String tranIdFr,String xtraParams, String forcedFlag, Connection conn) throws ITMException
//Changed method name by Santosh on 05-04-2016
//public String confirmDespatch(String businessObj, String tranIdFr,String xtraParams, String forcedFlag, Connection conn) throws ITMException
public String confirmInvoice(String businessObj, String tranIdFr,String xtraParams, String forcedFlag, Connection conn) throws ITMException
{
String methodName = "";
......@@ -2062,7 +2106,8 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
serviceURI=serviceURI==null ? "" :serviceURI.trim();
System.out.println("serviceURI = ["+serviceURI+"]---> compName = ["+compName+"]");
Service service = new Service();
Call call = (Call)service.createCall();
//Commented by santosh on 05-04-2016 [Start]
/*Call call = (Call)service.createCall();
call.setTargetEndpointAddress(new java.net.URL(serviceURI));
call.setOperationName( new javax.xml.namespace.QName("http://NvoServiceurl.org", methodName ) );
call.setUseSOAPAction(true);
......@@ -2084,8 +2129,56 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
retString = (String)call.invoke(aobj);
System.out.println("Confirm Complete @@@@@@@@@@@ Return string from NVO is:==>["+retString+"]");
System.out.println("Confirm Complete @@@@@@@@@@@ Return string from NVO is:==>["+retString+"]");*/
//Commented by santosh on 05-04-2016 [End]
//Added by Santosh on 05-04-2016[Start]
final Service finalService = service;
final String finalServiceURI = serviceURI;
final String finalMethodName = methodName;
final String finalActionURI = actionURI;
final String finalCompName = compName;
final String finalTranIdFr = tranIdFr;
final String finalXtraParams = xtraParams;
final String finalForcedFlag = forcedFlag;
Thread confirmDespatchThread = new Thread()
{
public void run()
{
try
{
Call call = (Call)finalService.createCall();
call.setTargetEndpointAddress(new java.net.URL(finalServiceURI));
call.setOperationName( new javax.xml.namespace.QName("http://NvoServiceurl.org", finalMethodName ) );
call.setUseSOAPAction(true);
call.setSOAPActionURI(finalActionURI);
Object[] aobj = new Object[4];
call.addParameter( new javax.xml.namespace.QName("http://NvoServiceurl.org", "component_name"), XMLType.XSD_STRING, ParameterMode.IN);
call.addParameter( new javax.xml.namespace.QName("http://NvoServiceurl.org", "tran_id"), XMLType.XSD_STRING, ParameterMode.IN);
call.addParameter( new javax.xml.namespace.QName("http://NvoServiceurl.org", "xtra_params"), XMLType.XSD_STRING, ParameterMode.IN);
call.addParameter( new javax.xml.namespace.QName("http://NvoServiceurl.org", "forced_flag"), XMLType.XSD_STRING, ParameterMode.IN);
aobj[0] = new String(finalCompName);
aobj[1] = new String(finalTranIdFr);
aobj[2] = new String(finalXtraParams);
aobj[3] = new String(finalForcedFlag);
//System.out.println("@@@@@@@@@@loginEmpCode:" +genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode")+":");
System.out.println("@@@@@@ call.setReturnType(XMLType.XSD_STRING) executed........");
call.setReturnType(XMLType.XSD_STRING);
final String finalRetString = (String)call.invoke(aobj);
System.out.println("Confirm Complete confirmDespatchThread Return string from NVO is:==>["+finalRetString+"]");
}
catch (Exception e) {
e.printStackTrace();
}
}
};
confirmDespatchThread.start();
//Added by Santosh on 05-04-2016[End]
}
catch(Exception e)
{
......
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