Skip to content

B
business-java
Commit a859cd83 authored by msalla's avatar msalla
Browse files
Options

Invoice cancellation testing with sales return. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@215434 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 472f91f4
Show whitespace changes
Inline Side-by-side
Showing with 125 additions and 126 deletions
webitm-dis/src/ibase/webitm/ejb/dis/adv/SalesReturnConfirm.java
View file @ a859cd83
......@@ -92,7 +92,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
//Changed by wasim on 23-MAY-2017 for overloading confirm method as to accept Connection parameter [END]
System.out.println("SalesReturnConf Called........" + msalereturn+"connectionn--"+conn);
//System.out.println("SalesReturnConf Called........" + msalereturn+"connectionn--"+conn);
//Connection conn = null;
......@@ -118,7 +118,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
conn = getConnection();
isLocConn = true;
}
System.out.println("connectionn 2--"+conn);
//System.out.println("connectionn 2--"+conn);
//Changed by wasim on 23-MAY-2017 to check is connection is null then creation connection [END]
......@@ -156,9 +156,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt = null;
}
System.out.println("ls_invoice_id---------->>"+ls_invoice_id);
System.out.println("ls_status---------->>"+ls_status);
System.out.println("ls_confirmed---------->>"+ls_confirmed);
//System.out.println("ls_invoice_id---------->>"+ls_invoice_id);
//System.out.println("ls_status---------->>"+ls_status);
//System.out.println("ls_confirmed---------->>"+ls_confirmed);
if("S".equalsIgnoreCase(ls_status))
{
......@@ -177,7 +177,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
}
ls_var_value = distCommon.getDisparams( "999999", "HO_APPROVAL_REQD", conn);
System.out.println("ls_var_value---------->>"+ls_var_value);
//System.out.println("ls_var_value---------->>"+ls_var_value);
if("Y".equalsIgnoreCase(ls_var_value))
{
sql = "select lr_no from despatch where desp_id in ( select desp_id from invoice where invoice_id = ? )";
......@@ -198,7 +198,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();
pstmt = null;
}
System.out.println("ls_lr_no---------->>"+ls_lr_no);
//System.out.println("ls_lr_no---------->>"+ls_lr_no);
}
// Sneha need to uncomment
......@@ -208,10 +208,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
return errMsg;
}*/
System.out.println("ls_invoice_id---------->>"+ls_invoice_id);
//System.out.println("ls_invoice_id---------->>"+ls_invoice_id);
if(ls_invoice_id != null && ls_invoice_id.length() > 0)
{
System.out.println("ls_full_ret---------->>"+ls_full_ret);
//System.out.println("ls_full_ret---------->>"+ls_full_ret);
if("Y".equalsIgnoreCase(ls_full_ret))
{
sql = "select sum((case when b.net_amt is null then 0 else b.net_amt end) - (case when b.tax_amt is null then 0 else b.tax_amt end)) from sreturn a, sreturndet b " +
......@@ -233,7 +233,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();
pstmt = null;
}
System.out.println("lc_sret_amt---------->>"+lc_sret_amt);
//System.out.println("lc_sret_amt---------->>"+lc_sret_amt);
sql = "select ((case when net_amt is null then 0 else net_amt end) - (case when round_adj is null then 0 else round_adj end) - (case when tax_amt is null then 0 else tax_amt end))" +
" from invoice where invoice_id = ?";
......@@ -255,7 +255,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();
pstmt = null;
}
System.out.println("lc_inv_amt---------->>"+lc_inv_amt);
//System.out.println("lc_inv_amt---------->>"+lc_inv_amt);
sql = "select sum(case when a.drcr_flag = 'C' then ((case when b.drcr_amt is null then 0 else b.drcr_amt end) * -1) else 0 End) " +
" from drcr_rcp a, drcr_rdet b where a.tran_id = b.tran_id and b.invoice_id = ? and a.sreturn_no is null ";
......@@ -277,12 +277,12 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();
pstmt = null;
}
System.out.println("lc_amt_drcr---------->>"+lc_amt_drcr);
//System.out.println("lc_amt_drcr---------->>"+lc_amt_drcr);
}
lc_inv_amt = lc_inv_amt + lc_amt_drcr;
System.out.println("lc_inv_amt---------->>"+lc_inv_amt);
System.out.println("lc_sret_amt---------->>"+lc_sret_amt);
//System.out.println("lc_inv_amt---------->>"+lc_inv_amt);
//System.out.println("lc_sret_amt---------->>"+lc_sret_amt);
if ((lc_sret_amt - lc_inv_amt) > 1 )
{
......@@ -388,10 +388,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt = null;
}
}
System.out.println("ls_confirmed---------->>"+ls_confirmed);
System.out.println("ls_ledg_post_conf---------->>"+ls_ledg_post_conf);
System.out.println("gs_run_mode---------->>"+gs_run_mode);
System.out.println("ls_verify_password_filter---------->>"+ls_verify_password_filter);
//System.out.println("ls_confirmed---------->>"+ls_confirmed);
//System.out.println("ls_ledg_post_conf---------->>"+ls_ledg_post_conf);
//System.out.println("gs_run_mode---------->>"+gs_run_mode);
//System.out.println("ls_verify_password_filter---------->>"+ls_verify_password_filter);
if("Y".equalsIgnoreCase(ls_ledg_post_conf))
{
......@@ -442,13 +442,13 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();
pstmt = null;
}
System.out.println("ls_cust_code__bill---------->>"+ls_cust_code__bill);
System.out.println("ls_invoice_id---------->>"+ls_invoice_id);
//System.out.println("ls_cust_code__bill---------->>"+ls_cust_code__bill);
//System.out.println("ls_invoice_id---------->>"+ls_invoice_id);
ls_errcode = confirmSalesReturn(msalereturn, xtraParams, conn);
//ls_errcode = nvo_dist_sales.gbf_sreturn_confirm(msalereturn, 1, sqlca_cp)
System.out.println("after sales return confirm=== ["+ls_errcode+"]");
//System.out.println("after sales return confirm=== ["+ls_errcode+"]");
if(ls_cust_code__trf.length() > 0)
{
//nvo_dist_interstock = create nvo_business_object_dist_interstockist
......@@ -595,7 +595,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
try
{
System.out.println("------------------- Inside confirmSalesReturn --------------- ");
//System.out.println("------------------- Inside confirmSalesReturn --------------- ");
currDate = new java.sql.Timestamp(System.currentTimeMillis());
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
......@@ -631,11 +631,11 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt = null;
}
System.out.println("---------- ls_ledg_post_conf ---------------"+ls_ledg_post_conf);
//System.out.println("---------- ls_ledg_post_conf ---------------"+ls_ledg_post_conf);
if("Y".equalsIgnoreCase(ls_ledg_post_conf))
{
// No vale is initialized for gs_run_mode
System.out.println("---------- gs_run_mode ---------------"+gs_run_mode);
//System.out.println("---------- gs_run_mode ---------------"+gs_run_mode);
//Changed by wasim on 19-MAY-2017 to check runMode as not equal to B
//if("B".equalsIgnoreCase(gs_run_mode))
if(!"B".equalsIgnoreCase(gs_run_mode))
......@@ -709,10 +709,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmtUpd.clearParameters();
System.out.println("---------- ls_invoice_id ---------------"+ls_invoice_id);
//System.out.println("---------- ls_invoice_id ---------------"+ls_invoice_id);
if(ls_invoice_id != null && ls_invoice_id.length() > 0)
{
System.out.println("---------- ll_line_no__invtrace ---------------"+ll_line_no__invtrace);
//System.out.println("---------- ll_line_no__invtrace ---------------"+ll_line_no__invtrace);
if(ll_line_no__invtrace > 0)
{
sql = "select count(1) from sreturndet where tran_id = ? and invoice_id = ? and line_no__invtrace = ? and line_no <> ? ";
......@@ -744,7 +744,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
}
}
System.out.println("---------- ll_line_no__invtrace ---------------"+ll_line_no__invtrace);
//System.out.println("---------- ll_line_no__invtrace ---------------"+ll_line_no__invtrace);
if(ll_line_no__invtrace == 0)
{
sql = "select sum(quantity__stduom) from invoice_trace where invoice_id = ? and inv_line_no = ? and lot_no = ? and lot_sl = ? ";
......@@ -792,7 +792,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt = null;
}
}
System.out.println("---------- lc_invqty_lot ---------------"+lc_invqty_lot);
//System.out.println("---------- lc_invqty_lot ---------------"+lc_invqty_lot);
sql = "select sum(b.quantity__stduom) from sreturn a, sreturndet b where b.tran_id = a.tran_id and b.invoice_id = ? and b.line_no__inv = ? " +
" and ((b.line_no__invtrace = ?) or (b.line_no__invtrace is null or b.line_no__invtrace = 0)) and a.tran_id <> ? and a.status <> 'X'" ;
......@@ -816,7 +816,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();
pstmt = null;
}
System.out.println("---------- lc_srqty_prev ---------------"+lc_srqty_prev);
//System.out.println("---------- lc_srqty_prev ---------------"+lc_srqty_prev);
sql = "select sum(b.quantity__stduom) from sreturn a, sreturndet b where b.tran_id = a.tran_id and b.tran_id = ? and b.invoice_id = ? and b.line_no__inv = ?" +
" and ((b.line_no__invtrace = ?) or (b.line_no__invtrace is null or b.line_no__invtrace = 0))" ;
......@@ -840,17 +840,17 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();
pstmt = null;
}
System.out.println("---------- lc_srqty ---------------"+lc_srqty);
//System.out.println("---------- lc_srqty ---------------"+lc_srqty);
lc_srqty_lot = lc_srqty + lc_srqty_prev ;
System.out.println("---------- lc_srqty_lot ---------------"+lc_srqty_lot);
System.out.println("---------- lc_invqty_lot ---------------"+lc_invqty_lot);
System.out.println("---------- ls_full_ret ---------------"+ls_full_ret);
//System.out.println("---------- lc_srqty_lot ---------------"+lc_srqty_lot);
//System.out.println("---------- lc_invqty_lot ---------------"+lc_invqty_lot);
//System.out.println("---------- ls_full_ret ---------------"+ls_full_ret);
if (lc_srqty_lot > lc_invqty_lot)
{
System.out.println("---------- ls_ret_opt ---------------"+ls_ret_opt);
//System.out.println("---------- ls_ret_opt ---------------"+ls_ret_opt);
if(!"D".equalsIgnoreCase(ls_ret_opt))
{
merrcode = "VTSRET7";
......@@ -905,11 +905,11 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();
pstmt = null;
}
System.out.println("li_restr_days===["+li_restr_days+"]");
//System.out.println("li_restr_days===["+li_restr_days+"]");
if (li_restr_days > 0 )
{
ld_restr_upto_date = utilMethods.RelativeDate(ld_eff_date,li_restr_days);
System.out.println("ld_restr_upto_date===["+ld_restr_upto_date+"]");
//System.out.println("ld_restr_upto_date===["+ld_restr_upto_date+"]");
sql = "select unit, descr from item where item_code = ? ";
pstmt = conn.prepareStatement(sql);
......@@ -949,7 +949,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();
pstmt = null;
}
System.out.println("li_cnt for customeritem["+li_cnt+"]");
//System.out.println("li_cnt for customeritem["+li_cnt+"]");
if(li_cnt > 0)
{
......@@ -1091,14 +1091,14 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if(ll_count > 0 && !"B".equalsIgnoreCase(gs_run_mode))
{
merrcode = gbf_create_sretqc(msalereturn, xtraParams, conn);
System.out.println("After creating QC order="+merrcode);
//System.out.println("After creating QC order="+merrcode);
if(merrcode != null && merrcode.trim().length() > 0)
{
errorString = itmDBAccessLocal.getErrorString("",merrcode,"","",conn);
return errorString;
}
}
System.out.println("------------- ls_ret_opt ------------ "+ ls_ret_opt);
//System.out.println("------------- ls_ret_opt ------------ "+ ls_ret_opt);
if("R".equalsIgnoreCase(ls_ret_opt))
{
sql = "Select count(*) From sreturndet Where tran_id = ? and ret_rep_flag = 'P'";
......@@ -1370,7 +1370,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if( "R".equalsIgnoreCase(mflag))
{
System.out.println("$$$$$$$$$$$Inside Sales Return------->["+mflag+"]$$$$$$$$$$$$$$");
//System.out.println("$$$$$$$$$$$Inside Sales Return------->["+mflag+"]$$$$$$$$$$$$$$");
sql = "Select inv_stat From location Where loc_code = ? ";
pstmt=conn.prepareStatement(sql);
......@@ -1434,7 +1434,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if (ls_cctr_code__dr != null && ls_cctr_code__dr.trim().length() > 0)
{
String tokens [] = ls_cctr_code__dr.split(",");
System.out.println("Length=["+tokens.length+"]");
//System.out.println("Length=["+tokens.length+"]");
if ( tokens.length >= 2)
{
......@@ -1451,7 +1451,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
}
tokens = null;
}
System.out.println("@@ls_cctr_code__dr ["+ls_cctr_code__dr+"]");
//System.out.println("@@ls_cctr_code__dr ["+ls_cctr_code__dr+"]");
//ls_acct_code__dr = ls_cctr_code__dr.substring(0,ls_cctr_code__dr.indexOf(","));
//ls_cctr_code__dr = ls_cctr_code__dr.substring(ls_cctr_code__dr.indexOf(",")+1);
}
......@@ -1461,7 +1461,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if (ls_cctr_code__cr != null && ls_cctr_code__cr.trim().length() > 0)
{
String tokens [] = ls_cctr_code__cr.split(",");
System.out.println("Length=["+tokens.length+"]");
//System.out.println("Length=["+tokens.length+"]");
if ( tokens.length >= 2)
{
......@@ -1608,7 +1608,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
stockUpd.put("loc_code",ls_loc_code_git);
stockUpd.put("tran_type","I");
merrcode = stockUpdate.updateStock(stockUpd,xtraParams, conn);
System.out.println("After stockUpdate2 ["+merrcode+"]");
//System.out.println("After stockUpdate2 ["+merrcode+"]");
if(merrcode !=null && merrcode.trim().length() >0)
{
return merrcode;
......@@ -1845,7 +1845,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
}//END tran type R (Sales return) by wasim on 19-MAY-2017
else //Added by wasim on 19-05-2017 else part for Replace (ID)
{
System.out.println("$$$$$$$$$$$Inside Sales Replacement------->["+mflag+"]$$$$$$$$$$$$$$");
//System.out.println("$$$$$$$$$$$Inside Sales Replacement------->["+mflag+"]$$$$$$$$$$$$$$");
sql = "Select (case when var_value is null then 'N' else var_value end) From finparm Where prd_code = '999999' And var_name = 'INV_ACCT_SRET'";
pstmt=conn.prepareStatement(sql);
......@@ -1900,7 +1900,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
String tokens [] = ls_cctr_code__cr.split(",");
System.out.println("Length="+tokens.length);
//System.out.println("Length="+tokens.length);
if ( tokens.length >= 2)
{
......@@ -1926,7 +1926,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
String tokens [] = ls_cctr_code__dr.split(",");
System.out.println("Length="+tokens.length);
//System.out.println("Length="+tokens.length);
if ( tokens.length >= 2)
{
......@@ -2094,7 +2094,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
stockUpd.put("net_weight",lc_net_wt);
merrcode = stockUpdate.updateStock(stockUpd,xtraParams, conn);
System.out.println("After stockUpdate3 ["+merrcode+"]");
//System.out.println("After stockUpdate3 ["+merrcode+"]");
if(merrcode !=null && merrcode.trim().length() >0)
{
//Commented by wasim as it is returning the full XML
......@@ -2211,7 +2211,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt = null;
}
merrcode = invHoldGen.generateHoldTrans(ls_quar_lockcode, msalereturn, "S-RET", msite_code, tempList, xtraParams, conn);
System.out.println("After invHoldGen.generateHoldTrans ["+merrcode+"]");
//System.out.println("After invHoldGen.generateHoldTrans ["+merrcode+"]");
if (merrcode != null && merrcode.trim().length() > 0)
{
//errorString = vdt.getErrorString("",merrcode,"");
......@@ -2372,7 +2372,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
retString = invacct.postSalesReturn (msalereturn, xtraParams, "", conn);
}
System.out.println("After InvAcct confirmSalesReturn ["+retString+"]");
//System.out.println("After InvAcct confirmSalesReturn ["+retString+"]");
if(retString != null && retString.trim().length() > 0)
{
return retString;
......@@ -2395,8 +2395,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();
pstmt = null;
System.out.println("ls_channel_partner+["+ls_channel_partner+"]");
System.out.println("ediOption+["+ediOption+"]");
//System.out.println("ls_channel_partner+["+ls_channel_partner+"]");
//.out.println("ediOption+["+ediOption+"]");
if("Y".equalsIgnoreCase(ls_channel_partner) && "E".equalsIgnoreCase(ls_dis_link))
{
if ("2".equals(ediOption))
......@@ -2404,7 +2404,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
// CreateRCPXML createRCPXML = new CreateRCPXML("w_salesreturn", "tran_id");
CreateRCPXML createRCPXML = new CreateRCPXML("w_salesreturn_retn", "tran_id");
dataStr = createRCPXML.getTranXML(msalereturn, conn);
System.out.println("dataStr =[ " + dataStr + "]");
//System.out.println("dataStr =[ " + dataStr + "]");
Document ediDataDom = genericUtility.parseString(dataStr);
E12CreateBatchLoadEjb e12CreateBatchLoad = new E12CreateBatchLoadEjb();
......@@ -2415,7 +2415,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if (retString != null && "SUCCESS".equalsIgnoreCase(retString))
{
System.out.println("retString from edi 2 batchload = [" + retString + "]");
//System.out.println("retString from edi 2 batchload = [" + retString + "]");
}
}
......@@ -2424,7 +2424,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
// CreateRCPXML createRCPXML = new CreateRCPXML("w_salesreturn","tran_id");
CreateRCPXML createRCPXML = new CreateRCPXML("w_salesreturn_retn","tran_id");
dataStr = createRCPXML.getTranXML(msalereturn, conn);
System.out.println("dataStr =[ " + dataStr + "]");
//System.out.println("dataStr =[ " + dataStr + "]");
Document ediDataDom = genericUtility.parseString(dataStr);
E12CreateBatchLoadEjb e12CreateBatchLoad = new E12CreateBatchLoadEjb();
......@@ -2435,11 +2435,11 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if (retString != null && "SUCCESS".equalsIgnoreCase(retString))
{
System.out.println("retString from batchload = ["+ retString + "]");
//System.out.println("retString from batchload = ["+ retString + "]");
}
}
System.out.println("retString from["+retString+"]");
}
//system.out.println("retString from["+retString+"]");
}//
sql = "Select count(*) From sreturndet Where tran_id = ? and ret_rep_flag = 'P'";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,msalereturn );
......@@ -2479,7 +2479,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
CreateRCPXML createRCPXML = new CreateRCPXML("w_salesrcp", "tran_id");
dataStr = createRCPXML.getTranXML(msalereturn, conn);
System.out.println("dataStr =[ " + dataStr + "]");
//System.out.println("dataStr =[ " + dataStr + "]");
Document ediDataDom = genericUtility.parseString(dataStr);
E12CreateBatchLoadEjb e12CreateBatchLoad = new E12CreateBatchLoadEjb();
......@@ -2497,7 +2497,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
CreateRCPXML createRCPXML = new CreateRCPXML("w_salesrcp","tran_id");
dataStr = createRCPXML.getTranXML(msalereturn, conn);
System.out.println("dataStr =[ " + dataStr + "]");
//System.out.println("dataStr =[ " + dataStr + "]");
Document ediDataDom = genericUtility.parseString(dataStr);
E12CreateBatchLoadEjb e12CreateBatchLoad = new E12CreateBatchLoadEjb();
......@@ -2764,10 +2764,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
merrcode = gbf_auto_crnote_sreturn(currDate, ls_tran_type, ls_site_code, msalereturn, msalereturn, ld_tran_date, ld_tran_date, ls_cust_code,ls_cust_code, "Y", xtraParams, conn);
// 10-sep-2019 manoharan to check amount of credite note and sales return
System.out.println("value of merrcode"+merrcode);
//System.out.println("value of merrcode"+merrcode);
if (merrcode == null || merrcode.trim().length() == 0 )
{
System.out.println("inside merrcode");
//System.out.println("inside merrcode");
sql = " select tran_id from drcr_rcp where sreturn_no = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,msalereturn );
......@@ -2797,7 +2797,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
else
{
System.out.println("inside merrcode");
//System.out.println("inside merrcode");
sql = " select sum(net_amt) from drcr_rdet where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,ls_tranidcrn );
......@@ -2879,29 +2879,28 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();
pstmt = null;
System.out.println("<-----------Edi Code calling ------>");
System.out.println("PS3 merrcode[+"+merrcode+"]");
System.out.println("PS ls_channel_partner[+"+ls_channel_partner+"]");
System.out.println("PS ediOption[+"+ediOption+"]");
//System.out.println("<-----------Edi Code calling ------>");
//System.out.println("PS3 merrcode[+"+merrcode+"]");
//System.out.println("PS ls_channel_partner[+"+ls_channel_partner+"]");
//System.out.println("PS ediOption[+"+ediOption+"]");
if((!("Y".equalsIgnoreCase(ls_channel_partner)) && "1".equals(ediOption)) && ((merrcode == null || merrcode.trim().length() == 0)))
{
System.out.println("merrcode[+"+merrcode+"]");
//System.out.println("merrcode[+"+merrcode+"]");
CreateRCPXML createRCPXML = new CreateRCPXML("w_salesreturn_retn", "tran_id");
dataStr = createRCPXML.getTranXML(msalereturn, conn);
System.out.println("dataStr =[ " + dataStr + "]");
//System.out.println("dataStr =[ " + dataStr + "]");
Document ediDataDom = genericUtility.parseString(dataStr);
System.out.println("xtraParams:["+xtraParams+"]");
//System.out.println("xtraParams:["+xtraParams+"]");
E12GenerateEDIEJB e12GenerateEDIEJB = new E12GenerateEDIEJB();
retString = e12GenerateEDIEJB.nfCreateEdiMultiLogic(ediDataDom,"w_salesreturn_retn", xtraParams);
System.out.println("retString from E12GenerateEDIEJB before = ["+ retString + "]");
//stem.out.println("retString from E12GenerateEDIEJB before = ["+ retString + "]");
if (retString != null && "SUCCESS".equalsIgnoreCase(retString))
{
System.out.println("retString from E12GenerateEDIEJB = ["+ retString + "]");
//System.out.println("retString from E12GenerateEDIEJB = ["+ retString + "]");
}
}
//Added by Arun p 31-10-17 for generate edi outbond data when edi medium=4 and edi medium=1 -end
System.out.println("<-----------Edi Code ending ------>");
//System.out.println("<-----------Edi Code ending ------>");
}
catch(Exception e)
......@@ -3015,7 +3014,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
try
{
System.out.println("------- Inside gbf_create_sretqc ----------------");
//System.out.println("------- Inside gbf_create_sretqc ----------------");
currDate = new java.sql.Timestamp(System.currentTimeMillis());
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
......@@ -3043,7 +3042,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs = null;
}
ls_sretinvqty = distCommon.getDisparams("999999","SRET_INV_QTY",conn) ;
System.out.println("ls_sretinvqty--------->>"+ls_sretinvqty);
//System.out.println("ls_sretinvqty--------->>"+ls_sretinvqty);
sql = "select item_code, sum(quantity__stduom) ,count(1), max(lot_sl), max(unit__std), loc_code, lot_no, min(exp_date), Min(line_no), min(mfg_date), sum(physical_qty) " +
" from sreturndet where tran_id = ? and qc_reqd = 'Y' Group by loc_code, item_code, lot_no Order by loc_code, item_code, lot_no";
......@@ -3075,7 +3074,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs = null;
}
System.out.println("ll_ctr--------->>"+ll_ctr);
//System.out.println("ll_ctr--------->>"+ll_ctr);
if(ll_ctr > 1)
{
//SetNull(ls_lotsl)
......@@ -3101,7 +3100,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs.close();
rs = null;
}
System.out.println("lc_sample_qty--------->>"+lc_sample_qty);
//System.out.println("lc_sample_qty--------->>"+lc_sample_qty);
if(lc_sample_qty == 0)
{
......@@ -3123,7 +3122,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs.close();
rs = null;
}
System.out.println("lc_sample_qty 111111 --------->>"+lc_sample_qty);
//System.out.println("lc_sample_qty 111111 --------->>"+lc_sample_qty);
}
sql = "select count(*) from item_lot_info where item_code = ? and lot_no = ? ";
......@@ -3145,7 +3144,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs.close();
rs = null;
}
System.out.println("ll_count 111111 --------->>"+ll_count);
//System.out.println("ll_count 111111 --------->>"+ll_count);
if (ll_count > 0)
{
......@@ -3172,8 +3171,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs = null;
}
}
System.out.println("ll_count 22222222 --------->>"+ll_count);
System.out.println("ls_supp_code__mfg 22222222 --------->>"+ls_supp_code__mfg);
//System.out.println("ll_count 22222222 --------->>"+ll_count);
//System.out.println("ls_supp_code__mfg 22222222 --------->>"+ls_supp_code__mfg);
if (ll_count == 0 || ls_supp_code__mfg == null)
{
sql = "select exp_date, mfg_date, supp_code__mfg from stock where item_code = ? and site_code = ? and lot_no = ? " +
......@@ -3199,7 +3198,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs.close();
rs = null;
}
System.out.println(" 22222222 --------->>");
//System.out.println(" 22222222 --------->>");
}
lstr_qc.put("supp_code", ls_supp_code);
......@@ -3307,7 +3306,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
java.sql.Date startDate = null, dueDate = null, retestDate = null,qcOrderDate = null;
try
{
System.out.println("----------- Inside createQc -------------");
//System.out.println("----------- Inside createQc -------------");
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId");
currDate = new java.sql.Timestamp(System.currentTimeMillis());
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
......@@ -3582,7 +3581,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
dueDate = java.sql.Date.valueOf(genericUtility.getValidDateString(qcOrd.get("due_date").toString(), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()));
}
System.out.println("---------- dueDate -----------------"+dueDate);
//System.out.println("---------- dueDate -----------------"+dueDate);
//Changed by wasim to convert for getting proper date formate [START]
if(qcOrd.get("qorder_date") != null)
......@@ -3804,7 +3803,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
}
}
//Changed by wasim on 30-MAY-2017 to copy below code in while loop below [START]
System.out.println("Old CustCode["+ls_old_cust_code+"] CustCode["+ls_cust_code+"] ls_old_item_ser["+ls_old_item_ser+"] ItemSer["+ls_item_ser+"]");
//System.out.println("Old CustCode["+ls_old_cust_code+"] CustCode["+ls_cust_code+"] ls_old_item_ser["+ls_old_item_ser+"] ItemSer["+ls_item_ser+"]");
/*if(ls_old_cust_code != ls_cust_code || ls_old_item_ser != ls_item_ser)
{
sql = "select fin_entity, acct_code__ar, cctr_code__ar, due_date, gp_no, gp_date from invoice where invoice_id = ? ";
......@@ -4012,7 +4011,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
lb_flag = false;
}
System.out.println("lb_flag-->"+lb_flag);
//System.out.println("lb_flag-->"+lb_flag);
if (lb_flag == false)
{
......@@ -4023,17 +4022,17 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
lc_tot_net_amt = lc_tot_net_amt + lc_amt + lc_tax_amt;
}
System.out.println("DRCR_RCP---lc_tot_net_amt["+lc_tot_net_amt+"] lc_amt ["+lc_amt+"] lc_tax_amt["+lc_tax_amt+"] lc_drcr_amt["+lc_drcr_amt+"]"
+ "lc_qty_stduom["+lc_qty_stduom+"] lc_rate_stduom["+lc_rate_stduom+"] lc_discount["+lc_discount+"]");
//System.out.println("DRCR_RCP---lc_tot_net_amt["+lc_tot_net_amt+"] lc_amt ["+lc_amt+"] lc_tax_amt["+lc_tax_amt+"] lc_drcr_amt["+lc_drcr_amt+"]"
//+ "lc_qty_stduom["+lc_qty_stduom+"] lc_rate_stduom["+lc_rate_stduom+"] lc_discount["+lc_discount+"]");
//Added by wasim on 01-JUN-2017 as amount calculation was not migrated [END]
//Changed by wasim to insert into header [START]
System.out.println("Old CustCode["+ls_old_cust_code+"] CustCode["+ls_cust_code+"] ls_old_item_ser["+ls_old_item_ser+"] ItemSer["+ls_item_ser+"]");
//System.out.println("Old CustCode["+ls_old_cust_code+"] CustCode["+ls_cust_code+"] ls_old_item_ser["+ls_old_item_ser+"] ItemSer["+ls_item_ser+"]");
if( ! ls_old_cust_code.equalsIgnoreCase(ls_cust_code))// || ! ls_old_item_ser.equalsIgnoreCase(ls_item_ser) )
{
System.out.println("Inside header loop");
//System.out.println("Inside header loop");
sql = "select fin_entity, acct_code__ar, cctr_code__ar, due_date, gp_no, gp_date from invoice where invoice_id = ? ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, ls_invoice_id);
......@@ -4353,22 +4352,22 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
xmlBuff.append("</group0>");
xmlBuff.append("</DocumentRoot>");
errorString = saveData(xtraParams,as_site_code,xmlBuff.toString(),conn);
System.out.println("@@@@@2: retString:"+errorString);
System.out.println("--retString finished--");
//System.out.println("@@@@@2: retString:"+errorString);
//System.out.println("--retString finished--");
if (errorString.indexOf("Success") > -1)
{
System.out.println("@@@@@@3: Success"+errorString);
// System.out.println("@@@@@@3: Success"+errorString);
Document dom = genericUtility.parseString(errorString);
System.out.println("dom>>>"+dom);
//System.out.println("dom>>>"+dom);
drNtTranId = genericUtility.getColumnValue("TranID",dom);
}
else
{
System.out.println("[SuccessSuccess" + errorString + "]");
//System.out.println("[SuccessSuccess" + errorString + "]");
conn.rollback();
return errorString;
}
System.out.println("@@tranId cr note @@@@:"+drNtTranId+"tran_id sreturn.. "+ls_tran_id);
//System.out.println("@@tranId cr note @@@@:"+drNtTranId+"tran_id sreturn.. "+ls_tran_id);
sql = "update sreturn set tran_id__crn = ? where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, drNtTranId);
......@@ -4416,13 +4415,13 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
refBalAmt = totAMt - adjamt;
System.out.println("@@TotAmt["+totAMt+"] @@AdjAmt["+adjamt+"]@@ refSer["+ls_sr_ref_ser+"]@@ refBalAmt ["+refBalAmt);
System.out.println("tran_id [" +ls_sr_inv_tran_id+" ]ref_ser ["+ls_sr_ref_ser+" ]ref_no ["+ls_sr_ref_no+" ]adj_amt ["+adjamt+" ]REF_BAL_AMT ["+refBalAmt);
//System.out.println("@@TotAmt["+totAMt+"] @@AdjAmt["+adjamt+"]@@ refSer["+ls_sr_ref_ser+"]@@ refBalAmt ["+refBalAmt);
//.out.println("tran_id [" +ls_sr_inv_tran_id+" ]ref_ser ["+ls_sr_ref_ser+" ]ref_no ["+ls_sr_ref_no+" ]adj_amt ["+adjamt+" ]REF_BAL_AMT ["+refBalAmt);
//added by monika 10 jan 2020
sretFullRetType = checkNullAndTrim(distCommon.getDisparams("999999","SRET_FULL_TRANTYPE",conn));
System.out.println("sretFullRetType["+sretFullRetType+"]");
//System.out.println("sretFullRetType["+sretFullRetType+"]");
if("NULLFOUND".equals(sretFullRetType) || sretFullRetType.length() > 0)
{
adjInvoice = true;
......@@ -4449,7 +4448,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs1.close();rs1 = null;
}
invIbcaGen = checkNullAndTrim(finCommon.getFinparams("999999","INV_IBCA_GEN",conn));
System.out.println("INV_IBCA_GEN["+invIbcaGen+"]");
//System.out.println("INV_IBCA_GEN["+invIbcaGen+"]");
if("NULLFOUND".equals(invIbcaGen))
{
......@@ -4540,7 +4539,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt2.close();
pstmt2 = null;
}
System.out.println(" data inserted tran_id["+drNtTranId+" ]line no ["+currRow+" ]ref_ser ["+ls_sr_ref_ser+" ]ref_no ["+ls_sr_ref_no +" ] adj_amt ["+lc_sr_adj_amt);
//System.out.println(" data inserted tran_id["+drNtTranId+" ]line no ["+currRow+" ]ref_ser ["+ls_sr_ref_ser+" ]ref_no ["+ls_sr_ref_no +" ] adj_amt ["+lc_sr_adj_amt);
//Added by wasim on 01-jun-2017 to insert data into drcr_rcpinv as per NVO code, previously it was writtten this code [END]
/* xmlBuff.append("<Detail3 dbID=\"\" domID=\"1\" objName=\"drcrrcp_cr\" objContext=\"3\">");
xmlBuff.append("<line_no><![CDATA["+ currRow +"]]></line_no>");
......@@ -4607,7 +4606,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
//ls_errcode = gbfRetrieveDrCrRcp(ls_auto_tran_id, as_site_code, xtraParams, conn);
DrCrRcpConf drcrObj = new DrCrRcpConf();
errorString = drcrObj.confirm (drNtTranId, xtraParams, "" , conn);
System.out.println("After DrCrRcpConf---->["+errorString+"]");
//System.out.println("After DrCrRcpConf---->["+errorString+"]");
if(errorString != null && errorString.indexOf("VTCICONF3") != -1)
{
errorString = "";
......@@ -4788,10 +4787,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs = null;
}
}
System.out.println("ls_tran_id ["+ls_tran_id+"]");
//System.out.println("ls_tran_id ["+ls_tran_id+"]");
////////////////////////////////
System.out.println("ls_cust_code ["+ls_cust_code+"]");
//System.out.println("ls_cust_code ["+ls_cust_code+"]");
......@@ -4843,8 +4842,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
ls_ret_ref = checkNullAndTrim(rs.getString(27));
ls_unit = checkNullAndTrim(rs.getString(28));
////////
System.out.println("ls_tran_id ["+ls_tran_id+"]");
System.out.println("ls_cust_code ["+ls_cust_code+"]");
//System.out.println("ls_tran_id ["+ls_tran_id+"]");
//System.out.println("ls_cust_code ["+ls_cust_code+"]");
////////////// Added arun
sql = "select acct_code__pfee, cctr_code__pfee from itemser where item_ser = ? ";
pstmt1 = conn.prepareStatement(sql);
......@@ -4867,7 +4866,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs1 = null;
}
//added by apal for Outbound Integration
System.out.println("ls_old_cust_code["+ls_old_cust_code+"]"+"[ls_cust_code"+ls_cust_code+"]"+"ls_old_item_ser["+ls_old_item_ser+"]"+"ls_item_ser["+ls_item_ser+"]");
//System.out.println("ls_old_cust_code["+ls_old_cust_code+"]"+"[ls_cust_code"+ls_cust_code+"]"+"ls_old_item_ser["+ls_old_item_ser+"]"+"ls_item_ser["+ls_item_ser+"]");
if(! (ls_old_cust_code.trim().equalsIgnoreCase(ls_cust_code)) || !(ls_old_item_ser.trim().equalsIgnoreCase(ls_item_ser) ))
{
sql = "select fin_entity from site where site_code = ? ";
......@@ -4943,7 +4942,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
ls_cctr_code = finCommon.getAcctDetrTtype(ls_item_code, ls_item_ser, "AR", as_tran_type, conn);
String tokens [] = ls_cctr_code.split(",");
System.out.println("Length="+tokens.length);
//System.out.println("Length="+tokens.length);
if ( tokens.length >= 2)
{
......@@ -5143,11 +5142,11 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
System.out.println("ls_tran_id ["+ls_tran_id+"]");
System.out.println("ls_cust_code ["+ls_cust_code+"]");
//System.out.println("ls_tran_id ["+ls_tran_id+"]");
//System.out.println("ls_cust_code ["+ls_cust_code+"]");
ls_old_cust_code = ls_cust_code;
ls_old_item_ser = ls_item_ser;
System.out.println("ls_old_cust_code["+ls_cust_code+"]"+"[ls_old_item_ser["+ls_item_ser+"]");
//System.out.println("ls_old_cust_code["+ls_cust_code+"]"+"[ls_old_item_ser["+ls_item_ser+"]");
////////
if((ls_acct_code__pfee == null || ls_acct_code__pfee.length()== 0) || (ls_cctr_code__pfee == null || ls_cctr_code__pfee.length() == 0) )
{
......@@ -5159,7 +5158,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
String tokens [] = ls_cctr_code__pfee.split(",");
System.out.println("Length="+tokens.length);
//System.out.println("Length="+tokens.length);
if ( tokens.length >= 2)
{
......@@ -5183,7 +5182,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
String tokens [] = ls_det_cctr.split(",");
System.out.println("Length="+tokens.length);
//System.out.println("Length="+tokens.length);
if ( tokens.length >= 2)
{
......@@ -5266,7 +5265,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
xmlBuff.append("<reas_code>").append("<![CDATA[" + ls_reas_code + "]]>").append("</reas_code>");
}
lc_drcr_amt = (lc_qty_stduom * lc_rate_stduom) - ((lc_qty_stduom * lc_rate_stduom) * lc_discount / 100) ;
System.out.println("lc_drcr_amt("+lc_drcr_amt+") = ("+lc_qty_stduom+" * "+lc_qty_stduom+") - ("+lc_qty_stduom+"*"+lc_rate_stduom+") * "+lc_discount+"/ 100");
//System.out.println("lc_drcr_amt("+lc_drcr_amt+") = ("+lc_qty_stduom+" * "+lc_qty_stduom+") - ("+lc_qty_stduom+"*"+lc_rate_stduom+") * "+lc_discount+"/ 100");
if (lc_net_amt >= 0 )
{
pstmt1.setDouble( 5, lc_drcr_amt );
......@@ -5336,14 +5335,14 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
}
///////////////////// arun <Detail3 dbID=\"\" domID=\"1\" objName=\"
System.out.println("<<-----------code calling ------------->>");
//System.out.println("<<-----------code calling ------------->>");
sql="update MISC_DRCR_RCP set amount =? , AMOUNT__BC = ? where tran_id = ?";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setDouble(1, lc_tot_net_amt + lc_process_fee);
pstmt1.setDouble(2, (lc_tot_net_amt + lc_process_fee) * lc_exch_rate );
pstmt1.setString(3,ls_auto_tran_id );
System.out.println("ls_auto_tran_id["+ls_auto_tran_id+"]");
//System.out.println("ls_auto_tran_id["+ls_auto_tran_id+"]");
int s=pstmt1.executeUpdate();
if(s>0)
{
......@@ -5355,7 +5354,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
}
System.out.println("<<-----------code ending------------->>");
//System.out.println("<<-----------code ending------------->>");
////////////
// }//added by monika 21 nov 19
......@@ -5366,13 +5365,13 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
String xmlString = xmlBuff.toString().trim().replaceFirst("^([\\W]+)<","<");
String drNtTranId="";
errorString = saveData(xtraParams,as_site_code,xmlString,conn);
System.out.println("@@@@@2: retString:"+errorString);
System.out.println("--retString finished--");
//System.out.println("@@@@@2: retString:"+errorString);
//System.out.println("--retString finished--");
if (errorString.indexOf("Success") > -1)
{
System.out.println("@@@@@@3: Success"+errorString);
//System.out.println("@@@@@@3: Success"+errorString);
Document dom = genericUtility.parseString(errorString);
System.out.println("dom>>>"+dom);
//System.out.println("dom>>>"+dom);
drNtTranId = genericUtility.getColumnValue("TranID",dom);
}
else
......@@ -6815,7 +6814,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
//Changed by wasim on 24-MAY-2017 for migration to retrieve DRCRrcp [START]
private String saveData(String xtraParams,String siteCode, String xmlString, Connection conn) throws ITMException
{
System.out.println("saving data...........");
//System.out.println("saving data...........");
InitialContext ctx = null;
String retString = null;
String userId =""; //Added By PriyankaC on 15/03/2018. [START]
......@@ -6827,18 +6826,18 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
//Added By PriyankaC on 15/03/2018. [START]
userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
System.out.println("userId" + userId + "]");
//System.out.println("userId" + userId + "]");
//Added By PriyankaC on 15/03/2018. [END]
AppConnectParm appConnect = new AppConnectParm();
ctx = new InitialContext(appConnect.getProperty());
masterStateful = (MasterStatefulLocal) ctx.lookup("ibase/MasterStatefulEJB/local");
System.out.println("-----------masterStateful------- " + masterStateful);
//System.out.println("-----------masterStateful------- " + masterStateful);
String[] authencate = new String[2];
//authencate[0] = "";
authencate[0] = userId; //Changed By PriynkaC on 15/03/2018
authencate[1] = "";
System.out.println("xmlString to masterstateful [" + xmlString + "]");
//System.out.println("xmlString to masterstateful [" + xmlString + "]");
userInfoBean.setEmpCode(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode"));
......
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