Skip to content

B
business-java
Commit 0da75d17 authored by wansari's avatar wansari
Browse files
Options

W16IBAS005 updated source for migration from NVO to java and type casting... 

W16IBAS005 updated source for migration from NVO to java and type casting issue due to JDK compliance level resolved


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@44059 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 388c0db9
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 70 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/SalesReturnConfirm.java
View file @ 0da75d17
......@@ -12,6 +12,7 @@ import ibase.webitm.ejb.dis.PostOrderActivity;
import ibase.webitm.ejb.dis.StockUpdate;
import ibase.webitm.ejb.fin.*;
import ibase.webitm.ejb.fin.adv.CalculateCommission;
import ibase.webitm.ejb.fin.adv.DrCrRcpConf;
import ibase.webitm.ejb.sys.CreateRCPXML;
import ibase.webitm.ejb.sys.UtilMethods;
......@@ -24,12 +25,15 @@ import java.sql.*;
import javax.ejb.*;
import ibase.webitm.ejb.MasterStatefulLocal;
import javax.naming.InitialContext;
import javax.xml.rpc.ParameterMode;
import org.apache.axis.client.Call;
import org.apache.axis.client.Service;
import org.apache.axis.encoding.XMLType;
import org.w3c.dom.Document;
import javax.activation.DataHandler;
import javax.activation.DataSource;
import javax.activation.FileDataSource;
......@@ -491,8 +495,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
else
{
System.out.println("Committed Transaction.............");
//conn.commit();//For test only need to uncomment
conn.rollback();
conn.commit();//For test only
//conn.rollback();
}
if (conn != null)
......@@ -561,6 +565,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
ResultSet rsDetail = null;
PreparedStatement pstmtDetail = null;
String errMessage = "";
int detCnt = 0;
try
{
......@@ -1249,6 +1254,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
//if(rs.next())
while(rsDetail.next())
{
detCnt++;//Added by wasim on 05-JUN-2017 for detail counter
mline_no = checkNullAndTrim(rsDetail.getString(1));
mitem_code = checkNullAndTrim(rsDetail.getString(2));
mquantity = rsDetail.getDouble(3);
......@@ -2045,6 +2052,18 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
}
}
}
//Changed by wasim on 05-JUN-2017 for [START]
if(detCnt != 0)
{
retString = invacct.postSalesReturn (msalereturn, xtraParams, "", conn);
}
System.out.println("After InvAcct confirmSalesReturn ["+retString+"]");
if(retString != null && retString.trim().length() > 0)
{
return retString;
}
//Changed by wasim on 05-JUN-2017 for [END]
if(!"B".equalsIgnoreCase(gs_run_mode))
{
......@@ -2283,7 +2302,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
}
catch(Exception e)
{
System.out.println("Expception inside confirmSalesReturn-->"+e.getMessage());
System.out.println("Expception inside confirmSalesReturn-->["+e.getMessage()+"]");
isError = true;
e.printStackTrace();
errMessage = e.getMessage();
......@@ -3640,8 +3659,12 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
errorString = vdt.getErrorString("",ls_errcode,"");
return errorString;
}*/
ls_errcode = gbfRetrieveDrCrRcp(ls_auto_tran_id, as_site_code, xtraParams, conn);
//DrCrRcpConf drcrObj = new DrCrRcpConf();
//ls_errcode = drcrObj.confirm (ls_auto_tran_id, xtraParams, "" , conn);
//Changed by wasim on 24-MAY-2017 to call gbfRetrieveDrCrRCP as previously gbfRetrieveDrCrInv login was migrated [END]
ls_errcode = gbfRetrieveDrCrRcp(ls_auto_tran_id, as_site_code, xtraParams, conn);
}
catch(Exception e)
......@@ -5958,7 +5981,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
//Need to verfiy below code
//amountTotal = amount + lds_det.getitemnumber(li_lineno,"amount");
detMap = (HashMap) detailList.get(Integer.valueOf(lineNo));
amountTotal = amount + (double) detMap.get("amount");
amountTotal = amount + (Double) detMap.get("amount");
}
detMap.put("tran_id", tranId);
......@@ -6099,7 +6122,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
else if(taxRows > 0)
{
detMap = (HashMap) detailList.get(Integer.valueOf(taxRows));
amount = (double) detMap.get("amount");
amount = (Double) detMap.get("amount");
detMap.put("amount", amount + recoAmt);
detailList.set(taxRows, detMap);
}
......@@ -6218,7 +6241,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
//Need to verify
//amountTotal = amount + lds_det.getitemnumber(li_lineno,"amount");
detMap = (HashMap) detailList.get(Integer.valueOf(lineNo));
amountTotal = amount + (double) detMap.get("amount");
amountTotal = amount + (Double) detMap.get("amount");
}
detMap.put("tran_id", tranId);
......@@ -6250,23 +6273,23 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();pstmt = null;
}
roundAdj = (double) hdrMap.get("round_adj");
amountHdr = (double) hdrMap.get("amount");
exchRate = (double) hdrMap.get("exch_rate");
roundAdj = (Double) hdrMap.get("round_adj");
amountHdr = (Double) hdrMap.get("amount");
exchRate = (Double) hdrMap.get("exch_rate");
amountHdr1 = amountHdr;
System.out.println("@roundAdj["+roundAdj+"]");
if(roundAdj == 0)
{
amountHdr = (double)hdrMap.get("amount");
amountHdr = (Double)hdrMap.get("amount");
roundOff = (String) hdrMap.get("rnd_off");
amountHdr1 = amountHdr;
System.out.println("@roundOff["+roundOff+"]");
if(!"N".equals(roundOff))
{
roundTo = (double)hdrMap.get("rnd_to");
roundTo = (Double)hdrMap.get("rnd_to");
amountHdr = distCommon.getRndamt(amountHdr1, roundOff, roundTo);
}
......@@ -6300,7 +6323,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
}
}
roundAdj = (double) hdrMap.get("round_adj");
roundAdj = (Double) hdrMap.get("round_adj");
System.out.println("@@roundAdj["+roundAdj+"]");
......@@ -6353,14 +6376,14 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
for(int x = 0; x < dtlCount; x++)
{
detMap = (HashMap) detailList.get(x);
amountDet = (double) detMap.get("amount");
amountDet = (Double) detMap.get("amount");
System.out.println("amountDet["+amountDet+"]");
total = total + amountDet;
}
amountHdr = (double) hdrMap.get("amount");
amountHdr = (Double) hdrMap.get("amount");
System.out.println("total["+total+"] amountHdr["+amountHdr+"] and Math.abs["+ Math.abs(total - amountHdr)+"]");
......@@ -6409,7 +6432,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
refNo = (String) adjMap.get("ref_no");
refSer = (String) adjMap.get("ref_ser");
adjAmount = (double) adjMap.get("adj_amt");
adjAmount = (Double) adjMap.get("adj_amt");
total = total + adjAmount;
......@@ -6466,7 +6489,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
}
}
amount = (double)hdrMap.get("amount");
amount = (Double)hdrMap.get("amount");
System.out.println("@@@amount["+amount+"] total["+total+"]");
......@@ -6497,7 +6520,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
for(int x = 1; x< dtlCount; x++)
{
detMap = (HashMap) detailList.get(x);
amountDet = (double) detMap.get("amount");
amountDet = (Double) detMap.get("amount");
if(amountDet != 0)
{
......@@ -6505,7 +6528,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
}
}
amountHdr = (double)hdrMap.get("amount");
amountHdr = (Double)hdrMap.get("amount");
if(total != amountHdr && Math.abs(total - amountHdr) > 1 )
{
errCode = "VTPOST2";
......@@ -6978,6 +7001,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
//ls_errcode = nvo_rcpibca.gbf_retrieve_ribca(ls_ibca_id, ls_ibca_id, 1,ls_site)
retString = gbf_retrieve_ribca(ibcaID, siteCode, xtraParams, conn);
//RcvIbcaConf ibcaObj = new RcvIbcaConf();
//retString = ibcaObj.confirm(ibcaID, xtraParams, "", conn);
System.out.println("After gbf_retrieve_ribca ----->["+retString+"]");
if(retString != null && retString.trim().length() > 0)
......@@ -7178,12 +7205,12 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if("D".equals(drcrFalg))
{
sundryBalMap.put("dr_amt", (double)hdrMap.get("amount"));
sundryBalMap.put("dr_amt", (Double)hdrMap.get("amount"));
sundryBalMap.put("cr_amt", 0.0);
}
else
{
sundryBalMap.put("cr_amt", (double)hdrMap.get("amount"));
sundryBalMap.put("cr_amt", (Double)hdrMap.get("amount"));
sundryBalMap.put("dr_amt", 0.0);
}
sundryBalMap.put("adv_amt", 0.0);
......@@ -7232,11 +7259,11 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if("D".equals(drcrFalg))
{
receivablesMap.put("tot_amt", (double) hdrMap.get("amount"));
receivablesMap.put("tot_amt", (Double) hdrMap.get("amount"));
}
else
{
receivablesMap.put("tot_amt", 0 - (double) hdrMap.get("amount"));
receivablesMap.put("tot_amt", 0 - (Double) hdrMap.get("amount"));
}
receivablesMap.put("auto_rcp", "N");
receivablesMap.put("bank_code", "");
......@@ -7264,7 +7291,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
receivablesMap.put("cust_ref_no", hdrMap.get("cust_ref_no"));
receivablesMap.put("cust_ref_date", hdrMap.get("cust_ref_date"));
receivablesMap.put("cust_ref_amt", String.valueOf((double) hdrMap.get("cust_ref_amt")));
receivablesMap.put("cust_ref_amt", String.valueOf((Double) hdrMap.get("cust_ref_amt")));
receivablesMap.put("gp_no", hdrMap.get("gp_no"));
receivablesMap.put("gp_date", (Timestamp) hdrMap.get("gp_date"));
salesReturnNo = (String) hdrMap.get("sreturn_no");
......@@ -7437,7 +7464,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
siteCodeFor = (String)hdrMap.get("site_code__for");
projectCode = (String)hdrMap.get("proj_code");
currCode = (String)hdrMap.get("curr_code");
exchRate = (double) hdrMap.get("exch_rate");
exchRate = (Double) hdrMap.get("exch_rate");
remarks = (String)hdrMap.get("remarks");
for (int ctr =0; ctr < detailList.size(); ctr++)
......@@ -7487,31 +7514,31 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
glTraceMap.put("emp_code", (String)detMap.get("emp_code"));
glTraceMap.put("anal_code", (String)detMap.get("anal_code"));
glTraceMap.put("curr_code", (String)hdrMap.get("curr_code"));
glTraceMap.put("exch_rate", (double)hdrMap.get("exch_rate"));
glTraceMap.put("exch_rate", (Double)hdrMap.get("exch_rate"));
if("D".equals(drcrFalg))
{
if((double)detMap.get("amount") > 0)
if((Double)detMap.get("amount") > 0)
{
glTraceMap.put("cr_amt", (double) detMap.get("amount"));
glTraceMap.put("cr_amt", (Double) detMap.get("amount"));
glTraceMap.put("dr_amt", "0");
}
else
{
glTraceMap.put("dr_amt", 0 - (double)detMap.get("amount"));
glTraceMap.put("dr_amt", 0 - (Double)detMap.get("amount"));
glTraceMap.put("cr_amt", "0");
}
}
else
{
if((double)detMap.get("amount") > 0)
if((Double)detMap.get("amount") > 0)
{
glTraceMap.put("dr_amt", (double) detMap.get("amount"));
glTraceMap.put("dr_amt", (Double) detMap.get("amount"));
glTraceMap.put("cr_amt", "0");
}
else
{
glTraceMap.put("cr_amt", 0 - (double)detMap.get("amount"));
glTraceMap.put("cr_amt", 0 - (Double)detMap.get("amount"));
glTraceMap.put("dr_amt", "0");
}
}
......@@ -7587,7 +7614,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
refSer = checkNull((String)detMap.get("ref_ser"));
refNo = (String)detMap.get("ref_no");
amount = (double) detMap.get("adj_amt");
amount = (Double) detMap.get("adj_amt");
totAdjAmount += amount;
sql = "update receivables set adj_amt = (case when adj_amt is null then 0 else adj_amt end + ? ) where tran_ser = ? and ref_no = ? ";
......@@ -7964,7 +7991,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
invoiceID = (String) invoiceIDList.get(i);
adjRefNo = invoiceID;
diffAmount = (double) netAmountList.get(i);
diffAmount = (Double) netAmountList.get(i);
if("CRNRCP".equals(tranSer) || "R-ADV".equals(tranSer))
{
......@@ -8490,9 +8517,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
System.out.println("tranSer ["+tranSer.toUpperCase()+"]");
switch ( tranSer.toUpperCase() )
//switch ( tranSer.toUpperCase() )
{
case "I":
//case "I":
if("I".equals(tranSer))
{
retString = gbf_post_ribca_hdr_iss(expHdr, xtraParams ,conn);
if(retString.trim().length() == 0)
......@@ -8551,9 +8579,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
}
}
}
break;
//break;
case "R":
//case "R":
else if("R".equals(tranSer))
{
retString = gbf_post_ribca_hdr_rcp(expHdr, conn);
......@@ -8608,7 +8637,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
}
}
}
break;
//break;
}
if (retString != null && retString.trim().length() > 0)
......@@ -8721,32 +8750,36 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
}
}
switch(linkType)
//switch(linkType)
{
case "A":
//case "A":
if("A".equals(linkType))
{
retString = gbf_post_ribca_hdr_rcp(hdrMap,conn);
}
break;
//break;
case "P":
//case "P":
else if("P".equals(linkType))
{
tranId = (String)glTraceMap.get("ref_id");
retString = gbf_create_ribca(tranId, tranId, xtraParams , conn);
}
break;
//break;
case "R":
//case "R":
else if("R".equals(linkType))
{
retString = gbf_post_ribca_hdr_rcp(hdrMap,conn);
}
break;
//break;
case "C":
//case "C":
else if("C".equals(linkType))
{
retString = gbf_post_ribca_hdr_rcp(hdrMap,conn);
}
break;
//break;
}
if(retString != null && retString.trim().length() > 0)
......@@ -8812,7 +8845,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
HashMap detMap = (HashMap) expDetList.get(i);
amount = (double)detMap.get("tot_amt");
amount = (Double)detMap.get("tot_amt");
refNo = (String)detMap.get("ref_no");
refSer = (String)detMap.get("ref_ser");
lineNoref = (String)detMap.get("line_no__ref");
......@@ -8834,7 +8867,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
glTraceMap.put("emp_code", "");
glTraceMap.put("anal_code", "");
glTraceMap.put("curr_code", detMap.get("curr_code"));
glTraceMap.put("exch_rate", (double) detMap.get("exch_rate"));
glTraceMap.put("exch_rate", (Double) detMap.get("exch_rate"));
if(amount > 0)
{
......@@ -8866,9 +8899,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
sundryMap.put("acct_code", glTraceMap.get("acct_code"));
sundryMap.put("cctr_code", glTraceMap.get("cctr_code"));
sundryMap.put("curr_code", glTraceMap.get("curr_code"));
sundryMap.put("exch_rate", (double)glTraceMap.get("exch_rate"));
sundryMap.put("dr_amt", (double) glTraceMap.get("dr_amt"));
sundryMap.put("cr_amt", (double) glTraceMap.get("cr_amt"));
sundryMap.put("exch_rate", (Double)glTraceMap.get("exch_rate"));
sundryMap.put("dr_amt", (Double) glTraceMap.get("dr_amt"));
sundryMap.put("cr_amt", (Double) glTraceMap.get("cr_amt"));
sundryMap.put("adv_amt", 0.0);
retString = finCommon.gbf_sundrybal_upd((HashMap) sundryMap, conn);
......@@ -8946,24 +8979,27 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
return retString;
}
switch(linkType)
//switch(linkType)
{
case "A" :
//case "A" :
if("A".equals(linkType))
{
//retString = gbf_post_ribca_det_rcp(as_hdrdata, as_detdata)
retString = gbf_post_ribca_det_rcp(hdrMap, expDetList, xtraParams, conn);
}
break;
case "R" :
//break;
//case "R" :
else if("R".equals(linkType))
{
retString = gbf_post_ribca_det_rcp(hdrMap, expDetList, xtraParams, conn);
}
break;
case "C" :
//break;
//case "C" :
else if("C".equals(linkType))
{
retString = gbf_post_ribca_det_rcp(hdrMap, expDetList, xtraParams, conn);
}
break;
//break;
}
}
catch(Exception e)
......@@ -9100,7 +9136,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
+" amount,curr_code,confirmed,exch_rate,conf_date,emp_code__aprv,acct_code__ifr,cctr_code__ifr,acct_code__ito,cctr_code__ito, "
+" chg_date,chg_user,chg_term,add_date,add_user,add_term,amount__bc,tran_type,tran_ser,tran_id__iss,link_type,remarks, "
+" parent__tran_id,rev__tran,sundry_type,sundry_code "
+" rcp_ibca WHERE tran_id = ? ";
+" from rcp_ibca WHERE tran_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,(String)tranIDList.get(i));
rs = pstmt.executeQuery();
......@@ -9429,9 +9465,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
glTraceMap.put("emp_code", "");
glTraceMap.put("anal_code", "");
glTraceMap.put("curr_code", (String)detMap.get("curr_code"));
glTraceMap.put("exch_rate", (double) detMap.get("exch_rate"));
glTraceMap.put("exch_rate", (Double) detMap.get("exch_rate"));
amount = (double)detMap.get("tot_amt");
amount = (Double)detMap.get("tot_amt");
if(amount > 0)
{
glTraceMap.put("dr_amt",amount);
......@@ -9466,9 +9502,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
sundryBalMap.put("acct_code", (String)glTraceMap.get("acct_code"));
sundryBalMap.put("cctr_code", (String)glTraceMap.get("cctr_code"));
sundryBalMap.put("curr_code", (String)glTraceMap.get("curr_code"));
sundryBalMap.put("exch_rate", (double)glTraceMap.get("exch_rate"));
sundryBalMap.put("dr_amt", (double)glTraceMap.get("dr_amt"));
sundryBalMap.put("cr_amt", (double)glTraceMap.get("cr_amt"));
sundryBalMap.put("exch_rate", (Double)glTraceMap.get("exch_rate"));
sundryBalMap.put("dr_amt", (Double)glTraceMap.get("dr_amt"));
sundryBalMap.put("cr_amt", (Double)glTraceMap.get("cr_amt"));
sundryBalMap.put("adv_amt", 0.0);
refNo = (String)detMap.get("ref_no");
......@@ -9509,13 +9545,13 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
recvbleMap.put("ref_date", detMap.get("ref_date"));
recvbleMap.put("due_date", glTraceMap.get("due_date"));
recvbleMap.put("curr_code", (String)glTraceMap.get("curr_code"));
recvbleMap.put("exch_rate", (double)glTraceMap.get("exch_rate"));
recvbleMap.put("exch_rate", (Double)glTraceMap.get("exch_rate"));
recvbleMap.put("cust_code", (String)detMap.get("cust_code"));
recvbleMap.put("acct_code", (String)glTraceMap.get("acct_code"));
recvbleMap.put("cctr_code", (String)glTraceMap.get("cctr_code"));
recvbleMap.put("cctr_code", (double)detMap.get("tax_amt"));
recvbleMap.put("discount", (double)detMap.get("discount"));
recvbleMap.put("tot_amt", (double)detMap.get("tot_amt"));
recvbleMap.put("cctr_code", (Double)detMap.get("tax_amt"));
recvbleMap.put("discount", (Double)detMap.get("discount"));
recvbleMap.put("tot_amt", (Double)detMap.get("tot_amt"));
recvbleMap.put("auto_rcp", (String)detMap.get("auto_rcp"));
recvbleMap.put("bank_code", (String)detMap.get("bank_code"));
recvbleMap.put("ref_type", (String)detMap.get("ref_type"));
......
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