Skip to content

B
business-java
Commit 03d91965 authored by arawankar's avatar arawankar
Browse files
Options

DespatchConfirm.java 

PostOrdDespatchGen.java
PostOrderProcess.java

-Changes made to adjust dr cr note ,if dr cr note is changed from front end  (From filter screen of post order process).


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@200643 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6d4ba02f
Show whitespace changes
Inline Side-by-side
Showing with 89 additions and 13 deletions
webitm-dis/ibase/webitm/ejb/dis/DespatchConfirm.java
View file @ 03d91965
...@@ -171,7 +171,26 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm ...@@ -171,7 +171,26 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
} }
return retString; return retString;
} }
public String confirm(String tranId,String xtraParams, String forcedFlag ,Connection conn,Connection connCP) throws RemoteException,ITMException //Modified by Azhar K. on [07-05-2019][Start]
public String confirm(String tranId,String xtraParams, String forcedFlag ,Connection conn,Connection connCP) throws RemoteException, ITMException
{
HashMap hm = new HashMap();
String retStr = "";
try
{
retStr = confirm(tranId,xtraParams, forcedFlag ,conn,connCP,hm);
}
catch(Exception e)
{
e.printStackTrace();
System.out.println("Exception ::"+e.getMessage());
throw new ITMException(e);
}
return retStr;
}
public String confirm(String tranId,String xtraParams, String forcedFlag ,Connection conn,Connection connCP,HashMap additionalMap) throws RemoteException,ITMException
//Modified by Azhar K. on [07-05-2019][End]
{ {
System.out.println("----------------confirmed method (Despatch confirm)---- with Connection-----"); System.out.println("----------------confirmed method (Despatch confirm)---- with Connection-----");
...@@ -1501,7 +1520,24 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm ...@@ -1501,7 +1520,24 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
//advAdjMode="C"; //advAdjMode="C";
//adjNewProdInv="N"; //adjNewProdInv="N";
//Modified by Azhar K. on [07-05-2019][Start]
System.out.println("checking map additionalMap: "+additionalMap);
if(additionalMap != null && additionalMap.size() > 0)
{
if(additionalMap.containsKey("ADJ_DRCR"))
{
adjDrcr = (String) additionalMap.get("ADJ_DRCR");
if(adjDrcr == null || adjDrcr.trim().length() == 0)
{
adjDrcr = "N";
}
}
}
else
{
adjDrcr = checkNull(distCommon.getDisparams("999999","ADJUST_DR_CR_NOTE",conn)); adjDrcr = checkNull(distCommon.getDisparams("999999","ADJUST_DR_CR_NOTE",conn));
}
//Modified by Azhar K. on [07-05-2019][End]
adjCustAdv = checkNull(distCommon.getDisparams("999999","ADJUST_CUST_ADV",conn)); adjCustAdv = checkNull(distCommon.getDisparams("999999","ADJUST_CUST_ADV",conn));
adjNewProdInv = checkNull(distCommon.getDisparams("999999","ADJUST_NEW_PRODUCT_INVOICE",conn)); adjNewProdInv = checkNull(distCommon.getDisparams("999999","ADJUST_NEW_PRODUCT_INVOICE",conn));
advAdjMode = checkNull(distCommon.getDisparams("999999","ADJ_ADV_CUST_SALE",conn)); advAdjMode = checkNull(distCommon.getDisparams("999999","ADJ_ADV_CUST_SALE",conn));
......
webitm-dis/ibase/webitm/ejb/dis/PostOrdDespatchGen.java
View file @ 03d91965
...@@ -47,9 +47,28 @@ public class PostOrdDespatchGen ...@@ -47,9 +47,28 @@ public class PostOrdDespatchGen
FinCommon finCommon=new FinCommon(); FinCommon finCommon=new FinCommon();
ArrayList<String> sordDisList=new ArrayList<String>(); ArrayList<String> sordDisList=new ArrayList<String>();
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
//Modified by Azhar K. on [07-05-2019][Start]
public String createDespatch(String saleOrderfr, String saleOrderTo,String custCodeFr, String custCodeTo, Timestamp frDate, public String createDespatch(String saleOrderfr, String saleOrderTo,String custCodeFr, String custCodeTo, Timestamp frDate,
Timestamp toDate, String siteCodeShip, String clubOrder,String xtraParams,Connection conn) throws RemoteException, ITMException, SQLException Timestamp toDate, String siteCodeShip, String clubOrder,String xtraParams,Connection conn) throws RemoteException, ITMException, SQLException
{ {
HashMap hm = new HashMap();
String retStr = "";
try
{
retStr = createDespatch(saleOrderfr, saleOrderTo, custCodeFr, custCodeTo, frDate, toDate, siteCodeShip, clubOrder, xtraParams, conn, hm);
}
catch(Exception e)
{
e.printStackTrace();
System.out.println("Exception ::"+e.getMessage());
throw new ITMException(e);
}
return retStr;
}
public String createDespatch(String saleOrderfr, String saleOrderTo,String custCodeFr, String custCodeTo, Timestamp frDate,
Timestamp toDate, String siteCodeShip, String clubOrder,String xtraParams,Connection conn,HashMap additionalMap) throws RemoteException, ITMException, SQLException
//Modified by Azhar K. on [07-05-2019][End]
{
ibase.utility.UserInfoBean userInfo = new UserInfoBean(); ibase.utility.UserInfoBean userInfo = new UserInfoBean();
System.out.println("CREATING DESPATCH !!!!!!!!!!!!"); System.out.println("CREATING DESPATCH !!!!!!!!!!!!");
String sql = ""; String sql = "";
...@@ -2262,13 +2281,19 @@ public class PostOrdDespatchGen ...@@ -2262,13 +2281,19 @@ public class PostOrdDespatchGen
String forcedFlag="N"; String forcedFlag="N";
connCP=chaneParnerExist(tranId,xtraParams,conn); connCP=chaneParnerExist(tranId,xtraParams,conn);
if(connCP!=null ) if(connCP!=null )
{ { //Modified by Azhar K. on [07-05-2019][Start]
errString=despatchConfirm.confirm(tranId, xtraParams, forcedFlag,conn,connCP); //errString=despatchConfirm.confirm(tranId, xtraParams, forcedFlag,conn,connCP);
errString=despatchConfirm.confirm(tranId, xtraParams, forcedFlag,conn,connCP,additionalMap);
//Modified by Azhar K. on [07-05-2019][End]
despatchConfirm = null; despatchConfirm = null;
} }
else else
{ {
errString=despatchConfirm.confirm(tranId, xtraParams, forcedFlag,conn,conn); System.out.println("@@@@@@@@@@@@@@iNSIDE 2294 @@@@@@@@@");
//Modified by Azhar K. on [07-05-2019][Start]
//errString=despatchConfirm.confirm(tranId, xtraParams, forcedFlag,conn,connCP);
errString=despatchConfirm.confirm(tranId, xtraParams, forcedFlag,conn,conn,additionalMap);
//Modified by Azhar K. on [07-05-2019][End]
despatchConfirm = null; despatchConfirm = null;
} }
//System.out.println("despatchConfirm return string >>>>"+errString); //System.out.println("despatchConfirm return string >>>>"+errString);
......
webitm-dis/ibase/webitm/ejb/dis/PostOrderProcess.java
View file @ 03d91965
...@@ -718,9 +718,14 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -718,9 +718,14 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
Connection connCP=null; Connection connCP=null;
ArrayList showSordrList=new ArrayList<String>(); ArrayList showSordrList=new ArrayList<String>();
long startTime2 = 0, endTime2 = 0; long startTime2 = 0, endTime2 = 0;
//Modified by Azhar K. on [07-05-2019][Start]
HashMap additionalMap = null;
//Modified by Azhar K. on [07-05-2019][End]
try try
{ {
//Modified by Azhar K. on [07-05-2019][Start]
additionalMap = new HashMap();
//Modified by Azhar K. on [07-05-2019][End]
//conn = connDriver.getConnectDB("DriverITM"); //conn = connDriver.getConnectDB("DriverITM");
//conn.setAutoCommit(false); //conn.setAutoCommit(false);
DistCommon dis=new DistCommon(); DistCommon dis=new DistCommon();
...@@ -744,6 +749,12 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -744,6 +749,12 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
adjNewProdInv=checkNull(e12GenericUtility.getColumnValue("adj_new_product_invoice",headerDom)); adjNewProdInv=checkNull(e12GenericUtility.getColumnValue("adj_new_product_invoice",headerDom));
orderType=checkNull(e12GenericUtility.getColumnValue("order_type",headerDom)); orderType=checkNull(e12GenericUtility.getColumnValue("order_type",headerDom));
//Modified by Azhar K. on [07-05-2019][Start]
additionalMap.put("ADJ_DRCR", adjDrcr);
//Modified by Azhar K. on [07-05-2019][End]
fromDate = java.sql.Timestamp.valueOf(e12GenericUtility.getValidDateString(fromDateStr, e12GenericUtility.getApplDateFormat(),e12GenericUtility.getDBDateFormat()) + " 00:00:00.0"); fromDate = java.sql.Timestamp.valueOf(e12GenericUtility.getValidDateString(fromDateStr, e12GenericUtility.getApplDateFormat(),e12GenericUtility.getDBDateFormat()) + " 00:00:00.0");
toDate = java.sql.Timestamp.valueOf(e12GenericUtility.getValidDateString(toDateStr, e12GenericUtility.getApplDateFormat(),e12GenericUtility.getDBDateFormat()) + " 00:00:00.0"); toDate = java.sql.Timestamp.valueOf(e12GenericUtility.getValidDateString(toDateStr, e12GenericUtility.getApplDateFormat(),e12GenericUtility.getDBDateFormat()) + " 00:00:00.0");
/*----------------changes start by mahendra -----------------*/ /*----------------changes start by mahendra -----------------*/
...@@ -939,14 +950,18 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -939,14 +950,18 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
//Changed By Nasruddin Start 04-11-16 //Changed By Nasruddin Start 04-11-16
startTime2 = System.currentTimeMillis(); startTime2 = System.currentTimeMillis();
if("Y".equalsIgnoreCase(clubOrder)) if("Y".equalsIgnoreCase(clubOrder))
{ { //Modified by Azhar K. on [07-05-2019][Start]
errString= postOrdDespatchGen.createDespatch(fromSaleOrder, toSaleOrder, custCode, custCode, fromDate, toDate, siteCodeShip,clubOrder, xtraParams, conn); //errString= postOrdDespatchGen.createDespatch(fromSaleOrder, toSaleOrder, custCode, custCode, fromDate, toDate, siteCodeShip,clubOrder, xtraParams, conn);
errString= postOrdDespatchGen.createDespatch(fromSaleOrder, toSaleOrder, custCode, custCode, fromDate, toDate, siteCodeShip,clubOrder, xtraParams, conn,additionalMap);
//Modified by Azhar K. on [07-05-2019][End]
endTime2 = System.currentTimeMillis(); endTime2 = System.currentTimeMillis();
System.out.println("createDespatch time taken for SO [" + fromSaleOrder + "] - [" +toSaleOrder + "] ["+(endTime2-startTime2)/1000+"] seconds"); System.out.println("createDespatch time taken for SO [" + fromSaleOrder + "] - [" +toSaleOrder + "] ["+(endTime2-startTime2)/1000+"] seconds");
}else }else
{ { //Modified by Azhar K. on [07-05-2019][Start]
errString= postOrdDespatchGen.createDespatch(SaleOrder, SaleOrder, fromCustCode, toCustCode, fromDate, toDate, siteCodeShip,clubOrder, xtraParams, conn); ////errString= postOrdDespatchGen.createDespatch(fromSaleOrder, toSaleOrder, custCode, custCode, fromDate, toDate, siteCodeShip,clubOrder, xtraParams, conn);
errString= postOrdDespatchGen.createDespatch(SaleOrder, SaleOrder, fromCustCode, toCustCode, fromDate, toDate, siteCodeShip,clubOrder, xtraParams, conn,additionalMap);
//Modified by Azhar K. on [07-05-2019][End]
endTime2 = System.currentTimeMillis(); endTime2 = System.currentTimeMillis();
System.out.println("createDespatch time taken for SO [" + SaleOrder + "] ["+(endTime2-startTime2)/1000+"] seconds"); System.out.println("createDespatch time taken for SO [" + SaleOrder + "] ["+(endTime2-startTime2)/1000+"] seconds");
} }
......
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