Skip to content

B
business-java
Commit 1624a656 authored by caluka's avatar caluka
Browse files
Options

connection argument added for invoice posting 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103626 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d68fc75d
Show whitespace changes
Inline Side-by-side
Showing with 1484 additions and 1579 deletions
webitm-dis/ibase/webitm/ejb/dis/DespatchConfirm.java
View file @ 1624a656
...@@ -103,18 +103,16 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm ...@@ -103,18 +103,16 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
System.out.println("----------------confirmed method (Despatch confirm)----through button-----"); System.out.println("----------------confirmed method (Despatch confirm)----through button-----");
String retString = ""; String retString = "";
Connection conn = null; Connection conn = null;
Connection connCP = null;
ConnDriver connDriver = null; ConnDriver connDriver = null;
ITMDBAccessEJB itmDBAccessEJB = null; ITMDBAccessEJB itmDBAccessEJB = null;
try try
{ {
connDriver = new ConnDriver(); connDriver = new ConnDriver();
//Changes and Commented By Bhushan on 13-06-2016 :START conn = connDriver.getConnectDB("Driver");
//conn = connDriver.getConnectDB("Driver");
conn = getConnection();
//Changes and Commented By Bhushan on 13-06-2016 :END
conn.setAutoCommit(false); conn.setAutoCommit(false);
itmDBAccessEJB = new ITMDBAccessEJB(); itmDBAccessEJB = new ITMDBAccessEJB();
retString = confirm( tranID, xtraParams, forcedFlag,conn); //calling and creating connection retString = confirm( tranID, xtraParams, forcedFlag,conn,connCP); //calling and creating connection
if( retString != null && retString.trim().length() > 0 && !retString.contains("VTPOSTDES")) if( retString != null && retString.trim().length() > 0 && !retString.contains("VTPOSTDES"))
{ {
...@@ -163,7 +161,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm ...@@ -163,7 +161,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
} }
return retString; return retString;
} }
public String confirm(String tranId,String xtraParams, String forcedFlag ,Connection conn) throws RemoteException,ITMException public String confirm(String tranId,String xtraParams, String forcedFlag ,Connection conn,Connection connCP) throws RemoteException,ITMException
{ {
System.out.println("----------------confirmed method (Despatch confirm)---- with Connection-----"); System.out.println("----------------confirmed method (Despatch confirm)---- with Connection-----");
...@@ -193,18 +191,17 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm ...@@ -193,18 +191,17 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
String autoInvOnDesp=""; String autoInvOnDesp="";
boolean lockSuccess = false; boolean lockSuccess = false;
Date lrDate = null; Date lrDate = null;
PostOrderActivity postordact=null;
try try
{ {
postordact=new PostOrderActivity();
itmDBAccessEJB = new ITMDBAccessEJB(); itmDBAccessEJB = new ITMDBAccessEJB();
autoInvOnDesp = distCommon.getDisparams("999999", "AUTO_INV_ON_DESPATCH", conn); autoInvOnDesp = distCommon.getDisparams("999999", "AUTO_INV_ON_DESPATCH", conn);
/* if(conn==null) /* if(conn==null)
{ {
connDriver = new ConnDriver(); connDriver = new ConnDriver();
//Changes and Commented By Bhushan on 09-06-2016 :START conn = connDriver.getConnectDB("DriverITM");
//conn = connDriver.getConnectDB("DriverITM");
conn = getConnection();
//Changes and Commented By Bhushan on 09-06-2016 :END
connDriver = null; connDriver = null;
conn.setAutoCommit(false); conn.setAutoCommit(false);
isLocal=true; isLocal=true;
...@@ -414,91 +411,12 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm ...@@ -414,91 +411,12 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
// CHECKING WHETHER PURCHASE IS INTEGRATED WITH SALES OR NOT // CHECKING WHETHER PURCHASE IS INTEGRATED WITH SALES OR NOT
varValuePurInteg = checkNull(distCommon.getDisparams("999999","PUR_INTEGRATED",conn)); errString=postordact.createPORCP(tranId, xtraParams, conn,connCP);
if(errString != null && errString.trim().length()>0)
sql1 = "select edi_option from transetup "
+ "where tran_window = 'w_despatch' ";
pstmt1 = conn.prepareStatement(sql1);
rs1 = pstmt1.executeQuery();
while(rs1.next())
{
editOption = rs1.getInt("edi_option");
}
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
/*despatch_edit.setfilter("desp_id = '" + ls_desp_id + "'")
despatch_edit.filter()
desp_det.setfilter("desp_id = '" + ls_desp_id + "'")
desp_det.filter()*/
if(varValuePurInteg == "Y" || editOption > 0)
{
//channelPartner and dis link retrieved earlier
if(channelPartner == null || channelPartner.trim().length() == 0 )
{
sql1 = "select channel_partner, dis_link from customer "
+" where cust_code = ? ";
pstmt1 = conn.prepareStatement(sql1);
pstmt1.setString(1, custCode);
rs1 = pstmt1.executeQuery();
while(rs1.next())
{
channelPartner = checkNull(rs1.getString("channel_partner"));
disLink = checkNull(rs1.getString("dis_link"));
}
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
}
//Took code from Porder amd conf
if(channelPartner == "Y" || editOption > 0)
{
if(disLink == "E" || editOption > 0 )
{
if(editOption == 2)
{
CreateRCPXML createRCPXML = new CreateRCPXML("w_despatch", "tran_id");
dataStr = createRCPXML.getTranXML(tranId, conn);
System.out.println("dataStr =[ " + dataStr + "]");
Document ediDataDom = genericUtility.parseString(dataStr);
E12CreateBatchLoadEjb e12CreateBatchLoad = new E12CreateBatchLoadEjb();
errString = e12CreateBatchLoad.createBatchLoad(ediDataDom, "w_despatch", ""+editOption , xtraParams, conn);
createRCPXML = null;
e12CreateBatchLoad = null;
if (errString != null && "SUCCESS".equals(errString))
{ {
System.out.println("retString from batchload = [" + errString + "]"); return errString;
}
}
}
/*if (ls_dis_link = 'A' or ls_dis_link = 'S' or ls_dis_link = 'C') and ls_var_value = 'Y' then //prince --17-11-06
ls_hdr = despatch_edit.describe("datawindow.data")
ls_det = desp_det.describe("datawindow.data")
//sqlca_cp,ls_dis_link argument added by jasmina 18/06/09-DI78SUN061
merrcode = nvo_porcp.gbf_create_porcp(ls_hdr,ls_det,sqlca_cp,ls_dis_link)
if len(trim(merrcode)) > 0 then goto errfound
end if*/
}
} }
//Despatch confirm code ...
// merrcode = gbf_confirm_despatch(despatch_edit.describe("datawindow.data"), desp_det.describe("datawindow.data"),1)
exportOrderType = checkNull(distCommon.getDisparams("999999","EXPORT_DESPATCH_ORDER_TYPE",conn));//gf_getenv_dis('999999',"EXPORT_DESPATCH_ORDER_TYPE") exportOrderType = checkNull(distCommon.getDisparams("999999","EXPORT_DESPATCH_ORDER_TYPE",conn));//gf_getenv_dis('999999',"EXPORT_DESPATCH_ORDER_TYPE")
if(exportOrderType != "") if(exportOrderType != "")
...@@ -519,14 +437,9 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm ...@@ -519,14 +437,9 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
if(statusDesp != "X") { if(statusDesp != "X") {
//Changed by Santosh on 13-06-2016 for trim issue in checkNull() [Start] lineNo = checkNull(rs3.getString("line_no"));
/*lineNo = checkNull(rs3.getString("line_no"));
lineNoSord = checkNull(rs3.getString("line_no__sord")); lineNoSord = checkNull(rs3.getString("line_no__sord"));
expLev = checkNull(rs3.getString("exp_lev"));*/ expLev = checkNull(rs3.getString("exp_lev"));
lineNo = rs3.getString("line_no");
lineNoSord = rs3.getString("line_no__sord");
expLev = rs3.getString("exp_lev");
//Changed by Santosh on 13-06-2016 for trim issue in checkNull() [End]
itemCodeOrd = checkNull(rs3.getString("item_code__ord")); itemCodeOrd = checkNull(rs3.getString("item_code__ord"));
itemCode = checkNull(rs3.getString("item_code")); itemCode = checkNull(rs3.getString("item_code"));
lotNo = rs3.getString("lot_no"); lotNo = rs3.getString("lot_no");
...@@ -735,9 +648,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm ...@@ -735,9 +648,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,sordNo); pstmt.setString(1,sordNo);
//Changed by Santosh on 18-07-16 for line no bug fix pstmt.setString(2,lineNo);
//pstmt.setString(2,lineNo);
pstmt.setString(2,lineNoSord);
pstmt.setString(3,expLev); pstmt.setString(3,expLev);
pstmt.setString(4,itemCodeOrd); pstmt.setString(4,itemCodeOrd);
pstmt.setString(5,itemCode); pstmt.setString(5,itemCode);
...@@ -772,9 +683,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm ...@@ -772,9 +683,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,sordNo); pstmt.setString(1,sordNo);
//Changed by Santosh on 18-07-16 for line no bug fix pstmt.setString(2,lineNo);
//pstmt.setString(2,lineNo);
pstmt.setString(2,lineNoSord);
pstmt.setString(3,expLev); pstmt.setString(3,expLev);
pstmt.setString(4,itemCodeOrd); pstmt.setString(4,itemCodeOrd);
pstmt.setString(5,itemCode); pstmt.setString(5,itemCode);
...@@ -800,10 +709,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm ...@@ -800,10 +709,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,sordNo); pstmt.setString(1,sordNo);
//Changed by Santosh on 28-06-16 for line no issue [Start] pstmt.setString(2,lineNo);
//pstmt.setString(2,lineNo);
pstmt.setString(2,lineNoSord);
//Changed by Santosh on 28-06-16 for line no issue [End]
pstmt.setString(3,expLev); pstmt.setString(3,expLev);
pstmt.setString(4,itemCodeOrd); pstmt.setString(4,itemCodeOrd);
pstmt.setString(5,itemCode); pstmt.setString(5,itemCode);
...@@ -826,10 +732,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm ...@@ -826,10 +732,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
//pstmt.setDouble(1,qtyAlloc - quantityStduom); //pstmt.setDouble(1,qtyAlloc - quantityStduom);
pstmt.setDouble(1,quantityStduom); pstmt.setDouble(1,quantityStduom);
pstmt.setString(2,sordNo); pstmt.setString(2,sordNo);
//Changed by Santosh on 28-06-16 for line no issue [Start] pstmt.setString(3,lineNo);
//pstmt.setString(3,lineNo);
pstmt.setString(3,lineNoSord);
//Changed by Santosh on 28-06-16 for line no issue [End]
pstmt.setString(4,expLev); pstmt.setString(4,expLev);
pstmt.setString(5,itemCodeOrd); pstmt.setString(5,itemCodeOrd);
pstmt.setString(6,itemCode); pstmt.setString(6,itemCode);
...@@ -858,10 +761,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm ...@@ -858,10 +761,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt.setDouble(2,quantity); pstmt.setDouble(2,quantity);
pstmt.setTimestamp(3,despDate); pstmt.setTimestamp(3,despDate);
pstmt.setString(4,sordNo); pstmt.setString(4,sordNo);
//Changed by Santosh on 28-06-16 for line no issue [Start] pstmt.setString(5,lineNo);
//pstmt.setString(5,lineNo);
pstmt.setString(5,lineNoSord);
//Changed by Santosh on 28-06-16 for line no issue [End]
pstmt.setString(6,expLev); pstmt.setString(6,expLev);
pstmt.executeUpdate(); pstmt.executeUpdate();
...@@ -1429,6 +1329,11 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm ...@@ -1429,6 +1329,11 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
InvAcct inv = new InvAcct(); InvAcct inv = new InvAcct();
errString = inv.despatchPost(tranId,"S-DSP",conn); errString = inv.despatchPost(tranId,"S-DSP",conn);
if(errString.trim().length() == 0 || errString == null) if(errString.trim().length() == 0 || errString == null)
{
PostOrderActivity pstordact=new PostOrderActivity();
errString=pstordact.gbfCreateFrtDrn(tranId, xtraParams, conn);
}
if(errString.indexOf("CONFSUCCES") > -1 || errString == null || errString.trim().length()==0)
{ {
if("Y".equalsIgnoreCase(autoInvOnDesp)) if("Y".equalsIgnoreCase(autoInvOnDesp))
{ {
...@@ -1478,7 +1383,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm ...@@ -1478,7 +1383,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
System.out.println("START TIME FOR POST ORDER PROCESS IN SECONDS:::["+startTime/1000+"]"); System.out.println("START TIME FOR POST ORDER PROCESS IN SECONDS:::["+startTime/1000+"]");
errString= postOrderProcess.invPosting( fromSaleOrder, fromSaleOrder, fromCustCode, fromCustCode, tranId , orderType, fromDate, clubOrder, clubPendingOrd, adjDrcr, adjCustAdv, advAdjMode, adjNewProdInv, siteCodeShip, conn); errString= postOrderProcess.invPosting( fromSaleOrder, fromSaleOrder, fromCustCode, fromCustCode, tranId , orderType, fromDate, clubOrder, clubPendingOrd, adjDrcr, adjCustAdv, advAdjMode, adjNewProdInv, siteCodeShip,xtraParams, conn);
long endTime = System.currentTimeMillis(); long endTime = System.currentTimeMillis();
System.out.println("END TIME FOR POST ORDER PROCESS IN SECONDS:::["+endTime/1000+"]"); System.out.println("END TIME FOR POST ORDER PROCESS IN SECONDS:::["+endTime/1000+"]");
......
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