Skip to content

B
business-java
Commit 647866b0 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@215429 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f617328a
Show whitespace changes
Inline Side-by-side
Showing with 1308 additions and 831 deletions
webitm-dis/src/ibase/webitm/ejb/dis/adv/SalesReturnConfirm.java
View file @ 647866b0
package ibase.webitm.ejb.dis.adv;
import ibase.utility.CommonConstants;
import ibase.webitm.utility.*;
import ibase.webitm.utility.wms.CommonWmsUtil;
import ibase.system.config.*;
......@@ -57,7 +58,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
E12GenericUtility genericUtility = new E12GenericUtility();
String DB = CommonConstants.DB_NAME;
ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
ValidatorEJB vdt = new ValidatorEJB();
//ValidatorEJB vdt = new ValidatorEJB();
CommonWmsUtil common = new CommonWmsUtil();
DistCommon distCommon = new DistCommon();
//Added by wasim [START]
......@@ -91,18 +92,19 @@ 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);
System.out.println("SalesReturnConf Called........" + msalereturn+"connectionn--"+conn);
//Connection conn = null;
ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
ResultSet rs = null;
PreparedStatement pstmt = null;
java.sql.Timestamp chgDate = null,currDate = null;
String sql = "", ls_invoice_id ="", ls_full_ret = "", ls_var_value = "", ls_lr_no = "",ls_status = "", ls_confirmed ="",ls_sale_order = "",ls_cust_code__trf="";
String ls_errcode = "", mreturn = "", ls_edioption = "", ls_ledg_post_conf = "", ls_verify_password_filter = "", ls_filter = "", ls_cust_code__bill = "";
String ls_errcode = "", mreturn = "", ls_edioption = "",totAmtstr="", ls_ledg_post_conf = "", ls_verify_password_filter = "", ls_filter = "", ls_cust_code__bill = "";
String errMsg = null;
double lc_sret_amt = 0, lc_inv_amt = 0, lc_amt_drcr = 0;
double lc_sret_amt = 0, lc_inv_amt = 0, lc_amt_drcr = 0,totAmt;
boolean lb_ask_pwd=false;
boolean isError = false;
Timestamp sysDate = null;//Added by wasim on 19-MAY-2017
......@@ -116,6 +118,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
conn = getConnection();
isLocConn = true;
}
System.out.println("connectionn 2--"+conn);
//Changed by wasim on 23-MAY-2017 to check is connection is null then creation connection [END]
currDate = new java.sql.Timestamp(System.currentTimeMillis());
......@@ -462,6 +466,24 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
catch (Exception e)
{
System.out.println("Inside catch confirm==>"+e.getMessage());
if(conn!=null)
{
try
{
if(isLocConn)
{
conn.rollback();
}
}
catch (SQLException ex)
{
e.printStackTrace();
throw new ITMException(e);
}
}
//end
isError = true;
e.printStackTrace();
}
......@@ -526,9 +548,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
String serviceURI = "";
String actionURI = "";
String sql = "", dataStr = "";
PreparedStatement pstmt = null;
PreparedStatement pstmt = null,pstmtUpd = null,pstmtSorditem = null,pstmtSorddet = null,pstmtUpdFree = null ;
ResultSet rs = null;
ValidatorEJB vdt=new ValidatorEJB();
//ValidatorEJB vdt=new ValidatorEJB();
DistCommon distCommon = new DistCommon();
HashMap stockUpd = new HashMap();
//FinCommon finCommon = new FinCommon();
......@@ -538,15 +560,15 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
String ls_grade= "",ls_trantype = "",ls_cctr_code__cr= "",ls_channel_partner = "", ls_tran_type = "", ls_cust_code= "", ls_site_code = "", ls_crdt = "",ls_item_code = "", ls_unit = "", ls_hdr = "", ls_det = "";
String ls_dis_link = "", ls_site_code_dlv = "", ls_loc_code_git = "", ls_tran_stat = "", ls_online_acct = "", ls_edioption = "", ls_ledg_post_conf = "" , ls_invoice_id = "", ls_acctmethod = "" ,ls_sretinvqty = "", ls_var_value = "", ls_reas_code = "";
String ls_conf_drcr_opt = "", ls_conf_jv_opt = "", ls_comm_calc_on_off = "",ls_desp_id = "" ,ls_desp_line_no = "", ls_full_ret = "", ls_lot_no = "", ls_lot_sl = "", ls_sitecodedlv = "",ls_quar_lockcode = "", gs_run_mode = "";
String chgUser = "", chgTerm = "",lc_no_art = "",mline_no = "",gitUpdate ="N";
String chgUser = "", chgTerm = "",lc_no_art = "",mline_no = "";
ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
int mcount = 0, mmin_shelf_life = 0 ,mdays = 0 , mcount1 = 0, ll_min_shelf_life =0, ll_count = 0, ll_counter = 0 , ll_sret_count = 0, ll_invtrace_count =0,ll_row =0, ll_line_no_inv = 0, ll_invamd_count = 0, ll_line_no = 0;
Timestamp currDate = null, mtran_date = null;
Date mmfg_date = null, mexp_date = null, meff_date = null, mrestrict_upto = null, mchk_date = null, ld_today = null, ld_tran_date = null, ld_eff_date = null, ld_restr_upto_date = null, ldt_conf_date = null ;
double mquantity = 0, mset_qty = 0, mtot_stk = 0, mrate = 0, lc_physicalqty = 0, lc_qty = 0, lc_qty1 = 0;
double lc_rate = 0, lc_gross_wt = 0, lc_net_wt = 0, lc_tare_wt = 0, lc_invqty_lot = 0, lc_srqty_lot = 0, lc_srqty_prev = 0, lc_srqty = 0;
int li_restr_days = 0, li_cnt = 0, ll_line_no__invtrace = 0, mnet_amt = 0, meff_amt = 0, mret_ref_netamt = 0,updCount =0;
int li_restr_days = 0, li_cnt = 0, ll_line_no__invtrace = 0, mnet_amt = 0, meff_amt = 0, mret_ref_netamt = 0;
StockUpdate stockUpdate = new StockUpdate();
......@@ -559,15 +581,17 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
ArrayList tempList = new ArrayList();
InvHoldGen invHoldGen = new InvHoldGen();
//Added by wasim
boolean isError = false;
Timestamp sysDate = null, invDate = null;
boolean isError = false,isOpenOrder = false;
Timestamp sysDate = null;
ResultSet rsDetail = null;
PreparedStatement pstmtDetail = null;
String errMessage = "";
int detCnt = 0, ll_points = 0, returnPoints = 0;
String strOpenOrder= "", reasCodeHdr = "",saleOrder = "",sordLineNo = "",expLev = "",tranidCrn = "",lineType = "", stateCodeDlv= "", countCodeDlv = "", siteCode= "",docKey = "";
boolean bOpenOrder = false;
double srAmount = 0, crnAmount = 0;
int detCnt = 0;
String docKey = "", gitUpdate= "",reasCodeHdr = "";
String saleOrder = "", lineNoSord= "", expLev = "", lineType = "",tranIdBal = "",ls_tranidcrn = "";
int returnPoints = 0,points = 0,offierPoints = 0;
Timestamp invDate = null;
double lc_sramt = 0,lc_crnamt = 0;
try
{
......@@ -639,8 +663,20 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs = pstmt.executeQuery();
if(rs.next())
*/
sql = "select b.reas_code, b.quantity, b.rate, a.eff_date, b.invoice_id , b.item_code, a.cust_code ,b.line_no__inv, "
+ " b.full_ret ,b.line_no__invtrace, b.line_no, a.ret_opt, b.lot_no, b.lot_sl, a.channel_partner "
sql = "update min_rate_history set quantity_adj = ( case when quantity_adj is null then 0 else quantity_adj end ) + ? "
+ " where doc_key = ?";
pstmtUpd = conn.prepareStatement(sql);
sql = "update sorditem set qty_desp = qty_desp - ?, status = 'P' "
+ " where sale_order = ? and line_no = ? and exp_lev = ? ";
pstmtSorditem = conn.prepareStatement(sql);
sql = "update sorddet set status = 'P' "
+ " where sale_order = ? and line_no = ?";
pstmtSorddet = conn.prepareStatement(sql);
sql = "select b.reas_code, b.quantity, b.rate, a.eff_date, b.invoice_id , b.item_code, a.cust_code , "
+ " b.line_no__inv, b.full_ret ,b.line_no__invtrace, b.line_no, a.ret_opt, b.lot_no, b.lot_sl, "
+ " b.doc_key, a.channel_partner, a.reas_code as reas_code_hdr "
+ " from sreturn a,sreturndet b where a.tran_id = b.tran_id and a.tran_id = ? ";
pstmtDetail = conn.prepareStatement(sql);
pstmtDetail.setString(1,msalereturn );
......@@ -662,24 +698,16 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
ls_ret_opt = checkNullAndTrim(rsDetail.getString(12));
ls_lot_no = checkNull(rsDetail.getString(13));
ls_lot_sl = checkNull(rsDetail.getString(14));
gitUpdate = checkNull(rsDetail.getString("channel_partner")); // 10-oct-2019 manoharan to update GIT stock based on channel_partner flag in header
if (gitUpdate == null || gitUpdate.trim().length() == 0)
{
gitUpdate = "N";
}
/*}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
}*/
docKey = checkNull(rsDetail.getString("doc_key"));
gitUpdate = checkNull(rsDetail.getString("channel_partner"));
reasCodeHdr = checkNull(rsDetail.getString("reas_code_hdr"));
pstmtUpd.setDouble(1, lc_qty);
pstmtUpd.setString(2, docKey);
pstmtUpd.executeUpdate();
pstmtUpd.clearParameters();
System.out.println("---------- ls_invoice_id ---------------"+ls_invoice_id);
if(ls_invoice_id != null && ls_invoice_id.length() > 0)
......@@ -925,9 +953,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if(li_cnt > 0)
{
// 23-jul-2019 manoharan get the quantity of the line_no instead of invoice_trace.line_no to take case in return is not against invoice
//sql = "select quantity from sreturndet where tran_id = ? and line_no__inv = ? ";
sql = "select quantity from sreturndet where tran_id = ? and line_no = ? ";
sql = "select quantity from sreturndet where tran_id = ? "
+" and line_no = ? "; // 23-jul-2019 manoharan get the quantity of the line_no instead of invoice_trace.line_no to take case in return is not against invoice"
//+ " and line_no__inv = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,msalereturn );
//pstmt.setInt(2,ll_line_no_inv );
......@@ -1006,7 +1034,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
}
//Added by wasim on 19-MAY-2017 for while loop instead of if loop [END]
sql = "Select site_code, item_ser, tran_date, invoice_id, eff_date , cust_code, ret_opt, tran_type, case when site_code__dlv is null then site_code else site_code__dlv end,read_code from sreturn where tran_id = ?";
sql = "Select site_code, item_ser, tran_date, invoice_id, eff_date , cust_code, ret_opt, tran_type, case when site_code__dlv is null then site_code else site_code__dlv end from sreturn where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,msalereturn );
rs = pstmt.executeQuery();
......@@ -1021,7 +1050,6 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
ls_ret_opt = rs.getString(7);
ls_trantype = rs.getString(8);
ls_sitecodedlv = rs.getString(9);
reasCodeHdr = rs.getString("read_code"); //
}
if (rs != null)
{
......@@ -1033,7 +1061,14 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();
pstmt = null;
}
// 11-mar-2019 manoharan whether to open the order based on reason code
String openOrderStr = distCommon.getDisparams( "999999", "SRET_OPEN_ORD_REASON", conn);
// end 11-mar-2019 manoharan whether to open the order based on reason code
if (reasCodeHdr.trim().equals(openOrderStr.trim()))
{
isOpenOrder = true;
}
// end 11-mar-2019 manoharan whether to open the order based on reason code
sql = "select count(1) From sreturndet Where tran_id = ? and qc_reqd = 'Y'";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,msalereturn );
......@@ -1088,7 +1123,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if(ll_count == 0)
{
merrcode = "VTRETREP01";
errorString = vdt.getErrorString("",merrcode,"");
//errorString = vdt.getErrorString("",merrcode,"");
itmDBAccessLocal.getErrorString("",merrcode,"","",conn);
return errorString;
}
......@@ -1116,7 +1152,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if(meff_amt > Integer.parseInt(mvar_value))
{
merrcode = "VTSRET3";
errorString = vdt.getErrorString("",merrcode,"");
//errorString = vdt.getErrorString("",merrcode,"");
itmDBAccessLocal.getErrorString("",merrcode,"","",conn);
return errorString;
}
sql = "Select sum((case when net_amt is null then 0 else net_amt end)) from sreturndet Where tran_id = ? and ret_rep_flag = 'R'";
......@@ -1143,7 +1181,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if( ((mnet_amt * Integer.parseInt(mvar_value)) / 100 ) < meff_amt)
{
merrcode = "VTSRET3";
errorString = vdt.getErrorString("",merrcode,"");
//errorString = vdt.getErrorString("",merrcode,"");
itmDBAccessLocal.getErrorString("",merrcode,"","",conn);
return errorString;
}
}
......@@ -1191,7 +1231,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if((mnet_amt - mret_ref_netamt) > Integer.parseInt(mvar_value))
{
merrcode = "VTAMTDIF1";
errorString = vdt.getErrorString("",merrcode,"");
//errorString = vdt.getErrorString("",merrcode,"");
errorString=itmDBAccessLocal.getErrorString("",merrcode,"","",conn);
return errorString;
}
}
......@@ -1236,7 +1278,11 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
ls_loc_code_git = distCommon.getDisparams( "999999", "TRANSIT_LOC", conn);
// 01-mar-2019 manoharan transit entry in case of automatic tranaction also done as suggested by KB
if( "Y".equalsIgnoreCase(ls_channel_partner) && "E".equalsIgnoreCase(ls_dis_link))
// 10-oct-2019 manoharan to update GIT stock based on channel_partner flag in header
//if( "Y".equalsIgnoreCase(ls_channel_partner) && ("E".equalsIgnoreCase(ls_dis_link) || ("A".equalsIgnoreCase(ls_dis_link) ))
if( "Y".equals(gitUpdate) && ("E".equalsIgnoreCase(ls_dis_link) || ("A".equalsIgnoreCase(ls_dis_link) )))
{
sql = "Select inv_stat From location Where loc_code = ? ";
pstmt=conn.prepareStatement(sql);
......@@ -1252,20 +1298,13 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt = null;
}
ls_sretinvqty = distCommon.getDisparams("999999","SRET_INV_QTY",conn) ;
// 11-mar-2019 manoharan whether to open the order based on reason code
strOpenOrder = distCommon.getDisparams("999999","SRET_OPEN_ORD_REASON",conn) ;
// end 11-mar-2019 manoharan whether to open the order based on reason code
if (reasCodeHdr.trim().equals(strOpenOrder.trim()))
{
bOpenOrder = true;
}
//Changed by wasim on 19-MAY-2017 for changing prepared statements for while loop [START]
/*sql = "Select line_no, item_code, quantity__stduom, ret_rep_flag, unit__std, loc_code, lot_no, lot_sl, mfg_date, exp_date, site_code__mfg, cost_rate, reas_code, pack_code, full_ret, physical_qty, no_art, line_no__inv, line_no__invtrace , gross_weight, tare_weight, net_weight From sreturndet where tran_id = ? Order by line_no";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, msalereturn);
rs = pstmt.executeQuery();*/
sql = "Select line_no, item_code, quantity__stduom, ret_rep_flag, unit__std, loc_code, lot_no, lot_sl, mfg_date, exp_date, site_code__mfg, cost_rate, reas_code, pack_code, full_ret, physical_qty, no_art, line_no__inv, line_no__invtrace , gross_weight, tare_weight, net_weight, doc_key From sreturndet where tran_id = ? Order by line_no";
sql = "Select line_no, item_code, quantity__stduom, ret_rep_flag, unit__std, loc_code, lot_no, lot_sl, mfg_date, exp_date, site_code__mfg, cost_rate, reas_code, pack_code, full_ret, physical_qty, no_art, line_no__inv, line_no__invtrace , gross_weight, tare_weight, net_weight From sreturndet where tran_id = ? Order by line_no";
pstmtDetail=conn.prepareStatement(sql);
pstmtDetail.setString(1, msalereturn);
rsDetail = pstmtDetail.executeQuery();
......@@ -1302,12 +1341,6 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
lc_gross_wt = rsDetail.getDouble(20);
lc_tare_wt = rsDetail.getDouble(21);
lc_net_wt = rsDetail.getDouble(22);
docKey = checkNullAndTrim(rsDetail.getString("doc_key"));
/*}
rs.close();
rs = null;
pstmt.close();
pstmt = null;*/
if( "Y".equalsIgnoreCase(mfull_ret))
{
......@@ -1338,15 +1371,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if( "R".equalsIgnoreCase(mflag))
{
System.out.println("$$$$$$$$$$$Inside Sales Return------->["+mflag+"]$$$$$$$$$$$$$$");
if (docKey != null && docKey.trim().length() > 0)
{
sql = "update min_rate_history set quantity_adj = ( case when quantity_adj is null then 0 else quantity_adj end ) + ? "
+ " where doc_key = ?"; //: ;
pstmt=conn.prepareStatement(sql);
pstmt.setDouble(1, mquantity);
pstmt.setString(1, docKey);
updCount = pstmt.executeUpdate();
}
sql = "Select inv_stat From location Where loc_code = ? ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, mloc_code);
......@@ -1360,7 +1385,6 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();
pstmt = null;
//Changed by wasim as this closing bracket will end at after compeleting stock update for Returned tran type (R)
//}
minvoice_id = checkNull(minvoice_id);//Added by wasim as it is giving null pointer if minvoice_id is null
if(minvoice_id.trim().length() >0)
......@@ -1574,11 +1598,11 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
return merrcode;
}
// 01-mar-2019 manoharan transit entry in case of automatic transaction also done as suggested by KB
// 10-oct-2019 manoharan to update GIT stock based on channel_partner flag in header
//if("Y".equalsIgnoreCase(ls_channel_partner) && "E".equalsIgnoreCase(ls_dis_link))
if("Y".equalsIgnoreCase(gitUpdate) && ("E".equalsIgnoreCase(ls_dis_link) || "A".equalsIgnoreCase(ls_dis_link) ))
// 10-oct-2019 manoharan to update GIT stock based on channel_partner flag in header
// 10-oct-2019 manoharan to update GIT stock based on channel_partner flag in header
//if( "Y".equalsIgnoreCase(ls_channel_partner) && ("E".equalsIgnoreCase(ls_dis_link) || ("A".equalsIgnoreCase(ls_dis_link) ))
if( "Y".equals(gitUpdate) && ("E".equalsIgnoreCase(ls_dis_link) || ("A".equalsIgnoreCase(ls_dis_link) )))
{
stockUpd.put("inv_stat",ls_tran_stat);
stockUpd.put("loc_code",ls_loc_code_git);
......@@ -1590,43 +1614,51 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
return merrcode;
}
}
if (bOpenOrder) {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// 17-Mar-2018 manoharan in case of full return to reduse despatch quantity
// 11-mar-2019 manoharan whether to open the order based on reason code
//if ls_FULLRET_HDR = "Y" and ls_ret_opt = "C" then
if (isOpenOrder)
{
sql = "select SORD_NO,SORD_LINE_NO, EXP_LEV from invoice_trace "
+ " where invoice_id = ? and line_no = ?";
pstmt = conn.prepareStatement(sql);
sql = "select SORD_NO,SORD_LINE_NO,exp_lev from invoice_trace "
+ " where invoice_id = ? " // ":
+ " and line_no = ? ";
//+ " and inv_line_no = ? " //":
//+ " and item_code = ? " // ":mitem_code
//+ " and lot_no = ? " //":mlot_no
//+ " and lot_sl = ? " ;//:mlot_sl;
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, minvoice_id);
pstmt.setInt(2, ll_line_no__invtrace);
rs = pstmt.executeQuery();
if (rs.next()) {
if(rs.next())
{
saleOrder = rs.getString("SORD_NO");
sordLineNo = rs.getString("SORD_LINE_NO");
expLev = rs.getString("EXP_LEV");
lineNoSord = rs.getString("SORD_LINE_NO");
expLev = rs.getString("exp_lev");
}
if (rs != null) {
rs.close();
rs = null;
}
if (pstmt != null) {
pstmt.close();
pstmt = null;
}
sql = "update sorditem set qty_desp = qty_desp - ?, status = 'P' "
+ " where sale_order = ? and line_no = ? and exp_lev = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, mquantity);
pstmt.setString(2, saleOrder);
pstmt.setString(3, sordLineNo);
pstmt.setString(4, expLev);
updCount = pstmt.executeUpdate();
sql = "update sorddet set status = 'P' where sale_order = ? and line_no = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, saleOrder);
pstmt.setString(2, sordLineNo);
updCount = pstmt.executeUpdate();
pstmtSorditem.setDouble(1, mquantity);
pstmtSorditem.setString(2, saleOrder);
pstmtSorditem.setString(3, lineNoSord);
pstmtSorditem.setString(4, expLev);
pstmtSorditem.executeUpdate();
pstmtSorditem.clearParameters();
pstmtSorddet.setString(1, saleOrder);
pstmtSorddet.setString(2, lineNoSord);
pstmtSorddet.executeUpdate();
pstmtSorddet.clearParameters();
}
// end 17-Mar-2018 manoharan in case of full return to reduce despatch quantity
// end 17-Mar-2018 manoharan in case of full return to reduse despatch quantity
// 11-nov-2019 manoharan in case of value/quantity replacement scheme or point based scheme to reduce the
// used_free_qty = ?, used_free_value
if (minvoice_id != null && minvoice_id.trim().length() > 0 && ll_line_no_inv != 0 && ll_line_no__invtrace != 0)
......@@ -1637,97 +1669,179 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
+ " where a.invoice_id = b.invoice_id "
+ " and a.invoice_id = ? "
+ " and line_no = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,ls_invoice_id );
pstmt.setInt(2,ll_line_no__invtrace );
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, ls_invoice_id);
pstmt.setInt(2, ll_line_no__invtrace);
rs = pstmt.executeQuery();
if(rs.next())
{
lineType = rs.getString("line_type");
saleOrder = rs.getString("SORD_NO");
lineType = checkNullAndTrim(rs.getString("line_type"));
saleOrder = checkNullAndTrim(rs.getString("SORD_NO"));
invDate = rs.getTimestamp("tran_date");
}
if (rs != null)
{
rs.close();
rs = null;
pstmt.close();
pstmt = null;
String stateCodeDlv = "", countCodeDlv= "", ls_siteCode = "";
if ("P".equals(lineType))
{
// Point based scheme given free get the point from
sql = "select state_code__dlv,count_code__dlv,site_code "//into :, :, :
+ " from sorder where sale_order = ? : ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, saleOrder);
rs = pstmt.executeQuery();
if(rs.next())
{
stateCodeDlv = checkNullAndTrim(rs.getString("state_code__dlv"));
countCodeDlv = checkNullAndTrim(rs.getString("count_code__dlv"));
ls_siteCode = checkNullAndTrim(rs.getString("site_code"));
}
if (pstmt != null)
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = "select required_points "
+ " from SCH_OFFER_ITEMS where SCHEME_CODE in "
+ " (select a.scheme_code from scheme_applicability a,scheme_applicability_det b "
+ " where a.scheme_code= b.scheme_code and ? between a.app_from and a.valid_upto "
+ " and (b.site_code= ? or b.state_code = ? or b.count_code= ?) "
+ " and PROD_SCH = 'Y') and item_code = ? " ;
pstmt=conn.prepareStatement(sql);
pstmt.setTimestamp(1, invDate);
pstmt.setString(2, ls_siteCode);
pstmt.setString(3, stateCodeDlv);
pstmt.setString(4, countCodeDlv);
pstmt.setString(5, mitem_code);
rs = pstmt.executeQuery();
if(rs.next())
{
points = rs.getInt("required_points");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
returnPoints = (int) (mquantity * points);
sql = " UPDATE SCHEME_BALANCE SET USED_FREE_VALUE = USED_FREE_VALUE - ? "
+ " WHERE CUST_CODE = ? AND ITEM_CODE= 'X' AND ? between EFF_FROM and VALID_UPTO";
pstmtUpdFree = conn.prepareStatement(sql);
pstmtUpdFree.setInt(1, returnPoints);
pstmtUpdFree.setString(2, ls_cust_code);
pstmtUpdFree.setTimestamp(3, invDate);
pstmtUpdFree.close();
pstmtUpdFree = null;
}
if (lineType == null)
// end 11-nov-2019 manoharan in case of value/quantity replacement scheme or point based scheme to reduce the
// 06-dec-2019 manoharan Also if the return is against invoice and in that invoice offer points (BALANCE_FREE_VALUE) are added the same to be reduced scheme_balance
// sch_group_def.scheme_type = '3' (poits based) then only reduce the points
// to reduce BALANCE_FREE_VALUE in SCHEME_BALANCE
sql = "select count(1) from FREE_BALANCE_TRACE "
+ " where INVOICE_ID = ? "
+ " and LINE_NO_INVOICETRACE = ? "
+ " and scheme_code in (select scheme_code from sch_group_def where scheme_type = '3')";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, minvoice_id);
pstmt.setInt(2, ll_line_no__invtrace);
rs = pstmt.executeQuery();
if(rs.next())
{
lineType = "";
ll_count = rs.getInt(1);
}
if("P".equals(lineType.trim()))
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if (ll_count > 0 )
{
sql = " select a.line_type, a.SORD_NO, b.tran_date "// into :, :, :invDate
+ " from invoice_trace a, invoice b "
+ " where a.invoice_id = b.invoice_id "
+ " and a.invoice_id = ? " // :ls_invoice_id
+ " and line_no = ?";//:ll_line_no__invtrace;
pstmt.setString(1, minvoice_id);
pstmt.setInt(2, ll_line_no__invtrace);
rs = pstmt.executeQuery();
if(rs.next())
{
lineType = rs.getString("line_type");
saleOrder = rs.getString("SORD_NO");
invDate = rs.getTimestamp("tran_date");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if ("C".equals(lineType))
{
// Point based scheme given free get the point from
sql = "select state_code__dlv,count_code__dlv,site_code from sorder where sale_order = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,ls_invoice_id );
pstmt.setInt(2,ll_line_no__invtrace );
sql = " select state_code__dlv,count_code__dlv,site_code "
+ " from sorder where sale_order = ?";
pstmt.setString(1, saleOrder);
rs = pstmt.executeQuery();
if(rs.next())
{
stateCodeDlv = rs.getString("state_code__dlv");
countCodeDlv = rs.getString("count_code__dlv");
siteCode = rs.getString("site_code");
ls_siteCode = rs.getString("site_code");
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
//cnt= 0;
sql = "select required_points from SCH_OFFER_ITEMS where SCHEME_CODE in (select a.scheme_code from scheme_applicability a,scheme_applicability_det b "
+ " where a.scheme_code= b.scheme_code and ? between a.app_from and a.valid_upto "
+ " and (b.site_code= ? or b.state_code = ? or b.count_code= ?) and PROD_SCH = 'Y') and item_code = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1,invDate );
pstmt.setString(2,siteCode );
pstmt.setString(3,stateCodeDlv );
pstmt.setString(4,countCodeDlv );
pstmt.setString(5,mitem_code );
sql = " select TRAN_ID__BAL,VAL_BAL_AFTER - VAL_BAL_BEFORE from FREE_BALANCE_TRACE "
+ " where INVOICE_ID = ? "
+ " and LINE_NO_INVOICETRACE = ?";
pstmt.setString(1, minvoice_id);
pstmt.setInt(2, ll_line_no__invtrace);
rs = pstmt.executeQuery();
if(rs.next())
{
ll_points = rs.getInt(1);
tranIdBal = rs.getString("TRAN_ID__BAL");
offierPoints = rs.getInt(2);
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
returnPoints = (int) mquantity * ll_points;
sql = "UPDATE SCHEME_BALANCE SET USED_FREE_VALUE = USED_FREE_VALUE - ? "
if (offierPoints > 0 )
{
sql = " UPDATE SCHEME_BALANCE SET BALANCE_FREE_VALUE = BALANCE_FREE_VALUE - ? " //:
+ " WHERE CUST_CODE = ? AND ITEM_CODE= 'X' AND ? between EFF_FROM and VALID_UPTO";
pstmt = conn.prepareStatement(sql);
pstmt.setInt(1, returnPoints);
pstmt.setString(2, ls_cust_code);
pstmt.setTimestamp(3, invDate);
updCount = pstmt.executeUpdate();
pstmtUpdFree = conn.prepareStatement(sql);
pstmtUpdFree.setInt(1, offierPoints);
pstmtUpdFree.setString(2, ls_cust_code);
pstmtUpdFree.setTimestamp(3, invDate);
pstmtUpdFree.close();
pstmtUpdFree = null;
}
}
}
// end 11-nov-2019 manoharan in case of value/quantity replacement scheme or point based scheme to reduce the
}
// end 06-dec-2019 manoharan Also if the return is against invoice and in that invoice offer points (BALANCE_FREE_VALUE) are added the same to be reduced scheme_balance
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
}//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)
{
......@@ -1940,7 +2054,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if(mtot_stk < mquantity)
{
merrcode = "VTDIST4" + " ~t for site code : " + msite_code + " for item code : " + mitem_code + " for loc.code : " + mloc_code + " for lot no : " + mlot_no + " for lot sl.: " + mlot_sl;
errorString = vdt.getErrorString("",merrcode,"");
//errorString = vdt.getErrorString("",merrcode,"");
errorString=itmDBAccessLocal.getErrorString("",merrcode,"","",conn);
return errorString;
}
......@@ -1987,11 +2103,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
return merrcode;
}
// 01-mar-2019 manoharan transit entry in case of automatic transaction also done as suggested by KB
// 10-oct-2019 manoharan to update GIT stock based on channel_partner flag in header
//if("Y".equalsIgnoreCase(ls_channel_partner) && "E".equalsIgnoreCase(ls_dis_link))
if("Y".equalsIgnoreCase(gitUpdate) && ("E".equalsIgnoreCase(ls_dis_link) || "A".equalsIgnoreCase(ls_dis_link) ))
if("Y".equalsIgnoreCase(ls_channel_partner) && "E".equalsIgnoreCase(ls_dis_link))
{
stockUpd.put("inv_stat",ls_tran_stat);
stockUpd.put("loc_code",ls_loc_code_git);
......@@ -1999,13 +2111,14 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
merrcode = stockUpdate.updateStock(stockUpd,xtraParams, conn);
if(merrcode !=null && merrcode.trim().length() >0)
{
errorString = vdt.getErrorString("",merrcode,"");
//errorString = vdt.getErrorString("",merrcode,"");
errorString=itmDBAccessLocal.getErrorString("",merrcode,"","",conn);
return errorString;
}
}
} //End else part for Replaced (ID) by wasim on 19-MAY-2017
}//End while loop for sales return Details
//Added by wasim on 19-MAY-2017 to use while loop instead of if for multiple lines in sales return details [END]
if(rsDetail!=null)
......@@ -2016,19 +2129,30 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
pstmtDetail.close();pstmtDetail = null;
}
pstmtUpd.close();
pstmtUpd = null;
pstmtSorditem.close();
pstmtSorditem = null;
pstmtSorddet.close();
pstmtSorddet = null;
//Added by wasim on 19-MAY-2017 to use while loop instead of if for multiple lines in sales return details [END]
// 17-Mar-2018 manoharan in case of full return to reduce despatch quantity
if (bOpenOrder)
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
// 17-Mar-2018 manoharan in case of full return to reduse despatch quantity
// 11-mar-2019 manoharan whether to open the order based on reason code
//if ls_FULLRET_HDR = "Y" and ls_ret_opt = "C" then
if (isOpenOrder)
{
sql = "update sorder set status = 'P' "
+ " where sale_order = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, saleOrder);
updCount = pstmt.executeUpdate();
sql = "update sorder set status = 'P' where sale_order = ?";
pstmtUpd = conn.prepareStatement(sql);
pstmtUpd.setString(1, saleOrder);
pstmtUpd.executeUpdate();
pstmtUpd.close();
pstmtUpd= null;
}
// end 17-Mar-2018 manoharan in case of full return to reduce despatch quantity
// end 17-Mar-2018 manoharan in case of full return to reduse despatch quantity
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
ls_quar_lockcode = distCommon.getDisparams("999999","QUARNTINE_LOCKCODE",conn) ;
if("NULLFOUND".equalsIgnoreCase(ls_quar_lockcode))
{
......@@ -2090,13 +2214,14 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
System.out.println("After invHoldGen.generateHoldTrans ["+merrcode+"]");
if (merrcode != null && merrcode.trim().length() > 0)
{
errorString = vdt.getErrorString("",merrcode,"");
//errorString = vdt.getErrorString("",merrcode,"");
errorString=itmDBAccessLocal.getErrorString("",merrcode,"","",conn);
return errorString;
}
}
//if("Y".equalsIgnoreCase(ls_channel_partner) && "E".equalsIgnoreCase(ls_dis_link))
if("Y".equalsIgnoreCase(gitUpdate) && ("E".equalsIgnoreCase(ls_dis_link) || "A".equalsIgnoreCase(ls_dis_link) ))
if("Y".equalsIgnoreCase(ls_channel_partner) && "E".equalsIgnoreCase(ls_dis_link))
{
sql = "Select count(*) From sreturndet Where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
......@@ -2117,10 +2242,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt = null;
}
sql = "Select count(*) From invtrace Where ref_ser = 'S-RET' And ref_id = ? and loc_code <> ?";
sql = "Select count(*) From invtrace Where ref_ser = 'S-RET' And ref_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,msalereturn );
pstmt.setString(2,ls_loc_code_git );
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -2140,7 +2264,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if(ll_sret_count != ll_invtrace_count)
{
merrcode = "VTMISMATCH";
errorString = vdt.getErrorString("",merrcode,"");
//errorString = vdt.getErrorString("",merrcode,"");
errorString=itmDBAccessLocal.getErrorString("",merrcode,"","",conn);
return errorString;
}
}
......@@ -2338,7 +2464,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
merrcode = postordact.schemeHistoryUpd(msalereturn,msite_code,"R",conn) ;
if (merrcode != null && merrcode.trim().length() > 0)
{
errorString = vdt.getErrorString("",merrcode,"");
//errorString = vdt.getErrorString("",merrcode,"");
errorString=itmDBAccessLocal.getErrorString("",merrcode,"","",conn);
return errorString;
}
ls_var_value = distCommon.getDisparams("999999","PUR_INTEGRATED",conn) ;
......@@ -2390,7 +2518,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
else
{
merrcode = "VTSRET24";
errorString = vdt.getErrorString("",merrcode,"");
//errorString = vdt.getErrorString("",merrcode,"");
errorString=itmDBAccessLocal.getErrorString("",merrcode,"","",conn);
return errorString;
}
}
......@@ -2432,7 +2562,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if("NULLFOUND".equalsIgnoreCase(ls_crdt))
{
merrcode = "VTENVAR1";
errorString = vdt.getErrorString("",merrcode,"");
//errorString = vdt.getErrorString("",merrcode,"");
errorString=itmDBAccessLocal.getErrorString("",merrcode,"","",conn);
return errorString;
}
else if("S".equalsIgnoreCase(ls_crdt))
......@@ -2455,13 +2587,12 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
// 05-sep-2019 manoharan to create misc or normal credit note as per detail invoice_id
//without invoice no
sql = "select count(1) "//into :
+ " from sreturn a , sreturndet b "
sql = " select count(*) from sreturn a , sreturndet b "
+ " where a.tran_id = b.tran_id "
+ " and a.tran_id = ? "
+ " and a.tran_id = ? " //:
+ " and a.ret_opt = 'C' "
+ " and b.invoice_id is null "
+ " and a.tran_id__crn is null";
+ " and a.tran_id__crn is null ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,msalereturn );
rs = pstmt.executeQuery();
......@@ -2480,14 +2611,15 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt = null;
}
// 10-sep-2019 manoharan to check amount of credite note and sales return
sql = "select sum(net_amt) from sreturndet where tran_id = ?" ;
// 10-sep-2019 manoharan to check amount of credit note and sales return
sql = " select sum(net_amt) from sreturndet where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,msalereturn );
rs = pstmt.executeQuery();
if(rs.next())
{
srAmount = rs.getDouble(1);
lc_sramt = rs.getDouble(1);
}
if (rs != null)
{
......@@ -2500,25 +2632,21 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt = null;
}
// end 10-sep-2019 manoharan to check amount of credite note and sales return
// 05-sep-2019 manoharan to create misc or normal credit note as per detail invoice_id
//if(ls_invoice_id == null || ls_invoice_id.trim().length() == 0)
if (mcount1 > 0)
{
merrcode = gbf_auto_crnote_sreturn_misc(currDate, ls_tran_type, ls_site_code, msalereturn, msalereturn, ld_tran_date, ld_tran_date, ls_cust_code,ls_cust_code, "Y", xtraParams, conn);
//merrcode = gbf_auto_crnote_sreturn_misc(ld_today, ls_tran_type, ls_site_code,as_tran_id, as_tran_id, ld_tran_date, ld_tran_date, ls_cust_code, ls_cust_code, 'Y');
if(merrcode != null && merrcode.trim().length() > 0)
// 10-sep-2019 manoharan to check amount of credite note and sales return
if (merrcode == null || merrcode.trim().length() == 0 )
{
errorString = vdt.getErrorString("",merrcode,"");
return errorString;
}
sql = "select tran_id from misc_drcr_rcp where sreturn_no = ? ";
sql = " select tran_id from misc_drcr_rcp where sreturn_no = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,msalereturn );
rs = pstmt.executeQuery();
if(rs.next())
{
tranidCrn = rs.getString("tran_id");
ls_tranidcrn = checkNullAndTrim(rs.getString("tran_id"));
}
if (rs != null)
{
......@@ -2530,12 +2658,24 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();
pstmt = null;
}
if (ls_tranidcrn == null || ls_tranidcrn.trim().length() == 0 )
{
//errorString = vdt.getErrorString("","VTNOCRN","");
errorString=itmDBAccessLocal.getErrorString("","VTNOCRN","","",conn);
return errorString;
}
else
{
sql = " select sum(amount) from misc_drcr_rdet where tran_id = ? and net_amt is not null";
pstmt.setString(1,msalereturn );
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,ls_tranidcrn );
rs = pstmt.executeQuery();
if(rs.next())
{
crnAmount = rs.getDouble(1);
lc_crnamt = rs.getDouble(1);
}
if (rs != null)
{
......@@ -2547,30 +2687,94 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();
pstmt = null;
}
if (Math.abs(crnAmount - srAmount) > 1 )
if (Math.abs(lc_crnamt - lc_sramt) > 1 )
{
errorString = vdt.getErrorString("","VTSRCRAMT","");
//errorString = vdt.getErrorString("","VTSRCRAMT","");
errorString=itmDBAccessLocal.getErrorString("","VTSRCRAMT","","",conn);
return errorString;
}
}
// end 10-sep-2019 manoharan to check amount of credite note and sales return
}
else
/*else
{
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);
if(merrcode != null && merrcode.trim().length() > 0)
// 10-sep-2019 manoharan to check amount of credite note and sales return
if (merrcode == null || merrcode.trim().length() == 0 )
{
errorString = vdt.getErrorString("",merrcode,"");
sql = " select tran_id from drcr_rcp where sreturn_no = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,msalereturn );
rs = pstmt.executeQuery();
if(rs.next())
{
ls_tranidcrn = checkNullAndTrim(rs.getString("tran_id"));
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
if (ls_tranidcrn == null || ls_tranidcrn.trim().length() == 0 )
{
errorString = vdt.getErrorString("","VTNOCRN","");
return errorString;
}
sql = "select tran_id from drcr_rcp where sreturn_no = ? ";
else
{
sql = " select sum(net_amt) from drcr_rdet where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,ls_tranidcrn );
rs = pstmt.executeQuery();
if(rs.next())
{
lc_crnamt = rs.getDouble(1);
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
if (Math.abs(lc_crnamt - lc_sramt) > 1 )
{
errorString = vdt.getErrorString("","VTSRCRAMT","");
return errorString;
}
}
// end 10-sep-2019 manoharan to check amount of credit note and sales return
}
}//commented by monika 23 dec 19 to get vALUE FROM CRDRRCP WHERE INVOICE IS NULL
*/
}//TO ADD THE ELSE PART HERE WHERE INVOICE IS NOT NULL
else
{
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);
if (merrcode == null || merrcode.trim().length() == 0 )
{
System.out.println("inside merrcode");
sql = " select tran_id from drcr_rcp where sreturn_no = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,msalereturn );
rs = pstmt.executeQuery();
if(rs.next())
{
tranidCrn = rs.getString("tran_id");
ls_tranidcrn = checkNullAndTrim(rs.getString("tran_id"));
}
if (rs != null)
{
......@@ -2582,12 +2786,25 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();
pstmt = null;
}
sql = "select sum(net_amt) from drcr_rdet where tran_id = ? ";
pstmt.setString(1,msalereturn );
if (ls_tranidcrn == null || ls_tranidcrn.trim().length() == 0 )
{
//errorString = vdt.getErrorString("","VTNOCRN","");
errorString =itmDBAccessLocal.getErrorString("","VTRCPT8","","",conn);
return errorString;
}
else
{
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 );
rs = pstmt.executeQuery();
if(rs.next())
{
crnAmount = rs.getDouble(1);
lc_crnamt = rs.getDouble(1);
}
if (rs != null)
{
......@@ -2599,13 +2816,16 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();
pstmt = null;
}
if (Math.abs(crnAmount - srAmount) > 1 )
if (Math.abs(lc_crnamt - lc_sramt) > 1 )
{
errorString = vdt.getErrorString("","VTSRCRAMT","");
//errorString = vdt.getErrorString("","VTSRCRAMT","");
errorString =itmDBAccessLocal.getErrorString("","VTSRCRAMT","","",conn);
return errorString;
}
// end 10-sep-2019 manoharan to check amount of credite note and sales return
}
// end 10-sep-2019 manoharan to check amount of credit note and sales return
}
}//commented by monika 23 dec 19 to get vALUE FROM CRDRRCP
}
......@@ -2613,7 +2833,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
if(merrcode.indexOf("<?xml version") == -1)
{
errorString = vdt.getErrorString("",merrcode,"");
//errorString = vdt.getErrorString("",merrcode,"");
errorString =itmDBAccessLocal.getErrorString("",merrcode,"","",conn);
return errorString;
}
else
......@@ -2635,7 +2857,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
merrcode = calCom.CalCommission(ls_invoice_id,"SR",msalereturn,ls_conf_drcr_opt,ls_conf_jv_opt,xtraParams, conn);
if(merrcode != null && merrcode.trim().length() > 0)
{
errorString = vdt.getErrorString("",merrcode,"");
//errorString = vdt.getErrorString("",merrcode,"");
errorString =itmDBAccessLocal.getErrorString("",merrcode,"","",conn);
return errorString;
}
}
......@@ -2725,6 +2949,26 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
pstmtDetail.close();pstmtDetail = null;
}
if (pstmtUpd != null )
{
pstmtUpd.close();
pstmtUpd = null;
}
if (pstmtSorditem != null )
{
pstmtSorditem.close();
pstmtSorditem = null;
}
if (pstmtSorddet != null )
{
pstmtSorddet.close();
pstmtSorddet = null;
}
if (pstmtUpdFree != null )
{
pstmtUpdFree.close();
pstmtUpdFree = null;
}
}
catch(Exception e)
{
......@@ -2754,11 +2998,12 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
int ll_ctr = 0, ll_count = 0;
PreparedStatement pstmt = null;
ResultSet rs = null;
ValidatorEJB vdt=new ValidatorEJB();
//ValidatorEJB vdt=new ValidatorEJB();
DistCommon distCommon = new DistCommon();
//FinCommon finCommon = new FinCommon();
Timestamp currDate = null;
HashMap lstr_qc = new HashMap();
ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
/*s_qcorder lstr_qc
nvo_business_object_create_qord lnvo_qc
......@@ -3002,7 +3247,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
ls_errcode = createQc(lstr_qc, xtraParams, conn) ;
if (ls_errcode != null && ls_errcode.trim().length() > 0)
{
errorString = vdt.getErrorString("",ls_errcode,"");
//errorString = vdt.getErrorString("",ls_errcode,"");
errorString =itmDBAccessLocal.getErrorString("",ls_errcode,"","",conn);
return errorString;
}
}
......@@ -3053,7 +3299,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
PreparedStatement pstmt = null;
ResultSet rs = null;
ValidatorEJB vdt=new ValidatorEJB();
//ValidatorEJB vdt=new ValidatorEJB();
ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
DistCommon distCommon = new DistCommon();
Timestamp currDate = null;
UtilMethods utilMethods = UtilMethods.getInstance();
......@@ -3460,11 +3707,13 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
double lc_rate__clg = 0, lc_qty_stduom = 0, lc_rate_stduom = 0, lc_discount = 0, lc_amt = 0, lc_drcr_amt = 0, lc_net_amt = 0, lc_tax_amt = 0;
Timestamp ld_eff_date = null, ld_due_date = null,ld_gp_date = null;
String ls_rndstr = "", ls_rndTo = "", ls_rndoff = "", ls_ret_ref = "", ls_site_type = "", ls_creat_inv_othlist = "", ls_creat_inv_oth = "", ls_other_site = "",drNtTranId="";
double refBalAmt=0,adjamt=0,totAMt=0;
String totAmtStr="";
PreparedStatement pstmt = null;
PreparedStatement pstmt1 = null;
PreparedStatement pstmt1 = null,pstmt2=null,pstmt4;
ResultSet rs = null,rs1=null;
ValidatorEJB vdt=new ValidatorEJB();
//ValidatorEJB vdt=new ValidatorEJB();
ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
DistCommon distCommon = new DistCommon();
//FinCommon finCommon = new FinCommon();
StringBuffer xmlBuff = null;
......@@ -3472,6 +3721,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
UtilMethods utilMethods = UtilMethods.getInstance();
boolean lb_flag;
int currRow = 0; //Added by wasim
String invIbcaGen=null,siteCodeRcv=null;
boolean adjInvoice = false;
boolean bIbca=false;
String sretFullRetType=null,tranType=null;
try
{
xmlBuff= new StringBuffer();
......@@ -3491,16 +3744,16 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
ls_drcr_flag = "D";
transer = "DRNRCP";
ls_tranwin = "W_DRCRRCP_DR";
ls_auto_tran_id = generateTranId("w_drcrrcp_dr",as_site_code,ls_drcr_flag,currDateStr,conn);
remarks = "Auto Generated Debit Note for Sales Return " + ls_tran_id;
//ls_auto_tran_id = generateTranId("w_drcrrcp_dr",as_site_code,ls_drcr_flag,currDateStr,conn);
//remarks = "Auto Generated Debit Note for Sales Return " + ls_tran_id;//commented by monika 20 nov 2019
}
else
{
ls_drcr_flag = "C";
transer = "CRNRCP";
ls_tranwin = "W_DRCRRCP_CR";
ls_auto_tran_id = generateTranId("w_drcrrcp_cr",as_site_code,ls_drcr_flag,currDateStr,conn);
remarks = "Auto Generated Credit Note for Sales Return " + ls_tran_id;
//ls_auto_tran_id = generateTranId("w_drcrrcp_cr",as_site_code,ls_drcr_flag,currDateStr,conn);
//remarks = "Auto Generated Credit Note for Sales Return " + ls_tran_id;//commented by monika 20 nov 2019
}
lb_flag = false;
......@@ -3551,8 +3804,8 @@ 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+"]");
if(ls_old_cust_code != ls_cust_code || ls_old_item_ser != 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 = ? ";
pstmt = conn.prepareStatement(sql);
......@@ -3823,7 +4076,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
ls_rndTo = ls_rndTo.trim();
}
sql = "INSERT INTO DRCR_RCP ( tran_id, tran_date, site_code, fin_entity, tran_type," +
/* sql = "INSERT INTO DRCR_RCP ( tran_id, tran_date, site_code, fin_entity, tran_type," +
" tran_ser, drcr_flag, cust_code, item_ser, invoice_id ,acct_code ,cctr_code ,eff_date ," +
" due_date ,curr_code ,exch_rate ,anal_code ,cr_term ,emp_code__aprv ,chg_date ,chg_user," +
" chg_term,remarks,gp_no,gp_date ,rnd_off,rnd_to,amount,amount__bc,adj_recv,sreturn_no,cust_ref_no, confirmed) " +
......@@ -3869,7 +4122,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
pstmt1.close();pstmt1 = null;
}
*///commented by monika 20 nov 2019
xmlBuff.append("<?xml version='1.0' encoding='ISO-8859-1'?><DocumentRoot>");
......@@ -3912,7 +4165,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
xmlBuff.append("<exch_rate>").append("<![CDATA[" + lc_exch_rate + "]]>").append("</exch_rate>");
xmlBuff.append("<anal_code>").append("<![CDATA[" + ls_anal_code + "]]>").append("</anal_code>");
xmlBuff.append("<cr_term>").append("<![CDATA[" + ls_cr_term + "]]>").append("</cr_term>");
xmlBuff.append("<emp_code__aprv>").append("<![CDATA[" + ls_emp_code__aprv + "]]>").append("</emp_code__aprv>");
// xmlBuff.append("<emp_code__aprv>").append("<![CDATA[" + ls_emp_code__aprv + "]]>").append("</emp_code__aprv>");
xmlBuff.append("<drcr_flag>").append("<![CDATA[" + "C" + "]]>").append("</drcr_flag>");
xmlBuff.append("<remarks>").append("<![CDATA[" + remarks + "]]>").append("</remarks>");
xmlBuff.append("<gp_no>").append("<![CDATA[" + ls_gp_no + "]]>").append("</gp_no>");
......@@ -3927,14 +4180,18 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
xmlBuff.append("<amount__bc>").append("<![CDATA[" + (lc_tot_net_amt * lc_exch_rate ) + "]]>").append("</amount__bc>");
xmlBuff.append("<rnd_off>").append("<![CDATA[" + ls_rndoff + "]]>").append("</rnd_off>");
xmlBuff.append("<rnd_to>").append("<![CDATA[" + ls_rndTo + "]]>").append("</rnd_to>");
//added by monika 24 dec 2019-
//SRETURN_NO
xmlBuff.append("<sreturn_no>").append("<![CDATA[" + ls_tran_id + "]]>").append("</sreturn_no>");
xmlBuff.append("</Detail1>");
xmlBuff.append("\n");
}
}//commented by monika 20 nov 2019
sql = "select sales_pers from invoice where invoice_id = ? ";
/* sql = "select sales_pers from invoice where invoice_id = ? ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString( 1, ls_invoice_id);
rs1 = pstmt1.executeQuery();
......@@ -3949,7 +4206,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if (rs1 != null )
{
rs1.close();rs1 = null;
}
}*///commented by monika 20 nov 2019
//Changed by wasim to insert into header [END]
/*sql = "select sum(quantity) from invdet where invoice_id = ? ";
......@@ -4003,9 +4260,12 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
xmlBuff.append("<tax_class>").append("<![CDATA[" + ls_tax_class + "]]>").append("</tax_class>");
xmlBuff.append("<tax_chap>").append("<![CDATA[" + ls_tax_chap + "]]>").append("</tax_chap>");
xmlBuff.append("<tax_env>").append("<![CDATA[" + ls_tax_env + "]]>").append("</tax_env>");
//added by monika 24 dec 2019-
//SRETURN_NO
xmlBuff.append("<sreturn_no>").append("<![CDATA[" + ls_tran_id + "]]>").append("</sreturn_no>");
/*
sql = " INSERT INTO DRCR_RDET ( TRAN_ID, LINE_NO, INVOICE_ID, LINE_NO__INV, ITEM_CODE, SALES_PERS, TAX_CLASS, TAX_CHAP, TAX_ENV, DRCR_AMT," +
" TAX_AMT, NET_AMT, REAS_CODE, QUANTITY, RATE, RATE__CLG, DISCOUNT, LINE_NO__SRET, LINE_NO__INVTRACE, LOT_NO, LOT_SL) " +
" VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ) " ;
......@@ -4025,18 +4285,20 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
//lc_drcr_amt = (lc_qty_stduom * lc_rate_stduom) - ((lc_qty_stduom * lc_rate_stduom) * lc_discount / 100);
pstmt1.setDouble( 10, lc_drcr_amt);
//lc_tot_net_amt = lc_tot_net_amt + lc_net_amt ;
pstmt1.setDouble( 12, lc_net_amt);
pstmt1.setDouble( 12, lc_net_amt);*///commented by monika 20 nov 2019
xmlBuff.append("<drcr_amt>").append("<![CDATA[" + lc_drcr_amt + "]]>").append("</drcr_amt>");
xmlBuff.append("<net_amt>").append("<![CDATA[" + lc_net_amt + "]]>").append("</net_amt>");
}
/*}
if (lb_flag == true)
{
pstmt1.setDouble( 10, lc_amt);
pstmt1.setDouble( 12, (lc_amt + lc_tax_amt));
pstmt1.setDouble( 12, (lc_amt + lc_tax_amt));*///commented by monika 20 nov 2019
xmlBuff.append("<drcr_amt>").append("<![CDATA[" + lc_amt + "]]>").append("</drcr_amt>");
xmlBuff.append("<net_amt>").append("<![CDATA[" + (lc_amt + lc_tax_amt) + "]]>").append("</net_amt>");
}
/*}
//pstmt1.setDouble( 10, lc_drcr_amt);
pstmt1.setDouble( 11, lc_tax_amt);
......@@ -4049,7 +4311,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt1.setString( 18, ll_line_no_sret);
pstmt1.setString( 19, ll_line_no_invtrace);
pstmt1.setString( 20, ls_lot_no);
pstmt1.setString( 21, ls_lotsl);
pstmt1.setString( 21, ls_lotsl);*///commented by monika 20 nov 2019
xmlBuff.append("<tax_amt>").append("<![CDATA[" + (lc_tax_amt) + "]]>").append("</tax_amt>");
xmlBuff.append("<reas_code>").append("<![CDATA[" + (ls_reas_code) + "]]>").append("</reas_code>");
......@@ -4067,12 +4330,14 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
//int detCnt = pstmt1.executeUpdate();
if(pstmt1 != null)
/*if(pstmt1 != null)
{
pstmt1.close();pstmt1 = null;
}
}*/
} //End while loop
if (pstmt != null )
/*
* if (pstmt != null )
{
pstmt.close();
pstmt = null;
......@@ -4081,13 +4346,45 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
rs.close();
rs = null;
}
} */
currRow = 0;
sql = "SELECT TRAN_ID, REF_SER, REF_NO, ADJ_AMT, REF_BAL_AMT FROM SRETURN_INV WHERE TRAN_ID = ?";
xmlBuff.append("</Header0>");
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--");
if (errorString.indexOf("Success") > -1)
{
System.out.println("@@@@@@3: Success"+errorString);
Document dom = genericUtility.parseString(errorString);
System.out.println("dom>>>"+dom);
drNtTranId = genericUtility.getColumnValue("TranID",dom);
}
else
{
System.out.println("[SuccessSuccess" + errorString + "]");
conn.rollback();
return errorString;
}
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, ls_tran_id);
pstmt.setString(1, drNtTranId);
pstmt.setString(2, ls_tran_id);
int rowcnt = pstmt.executeUpdate();
if (pstmt != null )
{
pstmt.close();
pstmt = null;
}
//added by monika 0n 20 nov 2019
currRow = 0;
/*sql = "SELECT TRAN_ID, REF_SER, REF_NO, ADJ_AMT, REF_BAL_AMT FROM SRETURN_INV WHERE TRAN_ID = ?";
pstmtselect tran_id,tran_ser,ref_no , = conn.prepareStatement(sql);
pstmt.setString( 1,ls_tran_id);
rs = pstmt.executeQuery();
while(rs.next())
{
......@@ -4096,31 +4393,164 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
ls_sr_ref_ser = checkNullAndTrim(rs.getString(2));
ls_sr_ref_no = checkNullAndTrim(rs.getString(3));
lc_sr_adj_amt = checkNullAndTrim(rs.getString(4));
lc_sr_ref_bal_amt = checkNullAndTrim(rs.getString(5));
lc_sr_ref_bal_amt = checkNullAndTrim(rs.getString(5));*///commented by monika 22 nov 19 to insert data in drcr
/*sql = "select tran_id,tran_ser,ref_no ,(case when adj_amt is null then 0 else adj_amt end) as adj_amt,(case when tot_amt is null then 0 else tot_amt end) as tot_amt"
+ " from receivables where ref_no = ? and tran_ser = 'S-INV' ";
*/
sql = "select tran_id,tran_ser,ref_no ,(case when adj_amt is null then 0 else adj_amt end) as adj_amt,(case when tot_amt is null then 0 else tot_amt end) as tot_amt"
+ " from receivables where ref_no = ? and tran_ser like 'R-IBC%' and (tot_amt-adj_amt<>0)";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,ls_invoice_id);
rs = pstmt.executeQuery();
if(rs.next())
{
currRow++;
ls_sr_inv_tran_id = checkNullAndTrim(rs.getString("tran_id"));
ls_sr_ref_ser = checkNullAndTrim(rs.getString("tran_ser"));
ls_sr_ref_no = checkNullAndTrim(rs.getString("ref_no"));
adjamt =rs.getDouble("adj_amt");
totAMt =rs.getDouble("tot_amt");
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);
//added by monika 10 jan 2020
sretFullRetType = checkNullAndTrim(distCommon.getDisparams("999999","SRET_FULL_TRANTYPE",conn));
System.out.println("sretFullRetType["+sretFullRetType+"]");
if("NULLFOUND".equals(sretFullRetType) || sretFullRetType.length() > 0)
{
adjInvoice = true;
}
else
{
adjInvoice = false;
}
sql = " select tran_type from sreturn where tran_id = ? " ;
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,ls_tran_id);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
tranType = rs1.getString("tran_type");
}
if(pstmt1 != null)
{
pstmt1.close();pstmt1 = null;
}
if(rs1 != null)
{
rs1.close();rs1 = null;
}
invIbcaGen = checkNullAndTrim(finCommon.getFinparams("999999","INV_IBCA_GEN",conn));
System.out.println("INV_IBCA_GEN["+invIbcaGen+"]");
if("NULLFOUND".equals(invIbcaGen))
{
invIbcaGen = "Y";
}
else if("N".equals(invIbcaGen))
{
bIbca=false;
}
else
{
bIbca=true;
sql = " select site_customer.site_code__rcp from site_customer "
+ " where ( site_customer.site_code = ? ) and ( site_customer.cust_code = ? ) ";
pstmt4 = conn.prepareStatement(sql);
pstmt4.setString(1,as_site_code);
pstmt4.setString(2,ls_cust_code);
rs1 = pstmt4.executeQuery();
if(rs1.next())
{
siteCodeRcv = checkNullAndTrim(rs1.getString("site_code__rcp"));
}
if(pstmt4 != null)
{
pstmt4.close();pstmt4 = null;
}
if(rs1 != null)
{
rs1.close();rs1 = null;
}
if(siteCodeRcv.length() == 0)
{
sql = " select site_code__rcp from customer where cust_code = ? ";
pstmt4 = conn.prepareStatement(sql);
pstmt4.setString(1,ls_cust_code);
rs1 = pstmt4.executeQuery();
if(rs1.next())
{
siteCodeRcv = checkNullAndTrim(rs1.getString("site_code__rcp"));
}
if(pstmt4 != null)
{
pstmt4.close();pstmt4 = null;
}
if(rs1 != null)
{
rs1.close();rs1 = null;
}
}
if(siteCodeRcv.length() == 0)
{
siteCodeRcv = as_site_code ;
}
//added by monika 9 jan 2020
if((siteCodeRcv.trim()).equals(as_site_code.trim()))
{
bIbca=false;
}
System.out.println("adjInvoice["+adjInvoice+"] INVOICE IBCA ["+invIbcaGen+" ]");
if(adjInvoice && !bIbca)
{
//end
//Added by wasim on 01-jun-2017 to insert data into drcr_rcpinv as per NVO code, previously it was writtten this code [START]
sql = " insert into drcr_rcpinv (tran_id, line_no, ref_ser, ref_no, adj_amt, ref_bal_amt) values (?,?,?,?,?,?) ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, ls_auto_tran_id);
pstmt1.setInt(2, currRow);
pstmt1.setString(3, ls_sr_ref_ser);
pstmt1.setString(4, ls_sr_ref_no);
pstmt1.setDouble(5, Double.valueOf(lc_sr_adj_amt));
pstmt2 = conn.prepareStatement(sql);
pstmt2.setString(1, drNtTranId);
pstmt2.setInt(2, currRow);
pstmt2.setString(3, ls_sr_ref_ser);
pstmt2.setString(4, ls_sr_ref_no);
/* pstmt1.setDouble(5, Double.valueOf(lc_sr_adj_amt));
pstmt1.setDouble(6, Double.valueOf(lc_sr_ref_bal_amt));
//pstmt1.executeUpdate();
if (pstmt1 != null )
*/
pstmt2.setDouble(5, Double.valueOf(adjamt));
pstmt2.setDouble(6, Double.valueOf(refBalAmt));
pstmt2.executeUpdate();
if (pstmt2 != null )
{
pstmt1.close();
pstmt1 = null;
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);
//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("<Detail3 dbID=\"\" domID=\"1\" objName=\"drcrrcp_cr\" objContext=\"3\">");
xmlBuff.append("<line_no><![CDATA["+ currRow +"]]></line_no>");
xmlBuff.append("<ref_ser><![CDATA["+ ls_sr_ref_ser +"]]></ref_ser>");
xmlBuff.append("<ref_no><![CDATA["+ ls_sr_ref_no +"]]></ref_no>");
xmlBuff.append("<ref_bal_amt><![CDATA["+ lc_sr_ref_bal_amt +"]]></ref_bal_amt>");
xmlBuff.append("<adj_amt><![CDATA["+ lc_sr_adj_amt +"]]></adj_amt>");
xmlBuff.append("</Detail3>");
xmlBuff.append("</Detail3>");*/
}
}//end
}
if (pstmt != null )
{
......@@ -4132,7 +4562,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs.close();
rs = null;
}
xmlBuff.append("</Header0>");
/*xmlBuff.append("</Header0>");
xmlBuff.append("</group0>");
xmlBuff.append("</DocumentRoot>");
errorString = saveData(xtraParams,as_site_code,xmlBuff.toString(),conn);
......@@ -4151,9 +4581,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
conn.rollback();
return errorString;
}
*/
sql = "update sreturn set tran_id__crn = ? where tran_id = ? ";
/*sql = "update sreturn set tran_id__crn = ? where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, drNtTranId);
pstmt.setString(2, ls_tran_id);
......@@ -4163,7 +4593,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();
pstmt = null;
}
*/
//Changed by wasim on 24-MAY-2017 to call gbfRetrieveDrCrRCP as previously gbfRetrieveDrCrInv login was migrated [START]
......@@ -4183,7 +4613,6 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
errorString = "";
}
//Changed by wasim on 24-MAY-2017 to call gbfRetrieveDrCrRCP as previously gbfRetrieveDrCrInv login was migrated [END]
}
catch(Exception e)
{
......@@ -4248,7 +4677,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
PreparedStatement pstmt1 = null;
ResultSet rs = null;
ResultSet rs1 = null;
ValidatorEJB vdt=new ValidatorEJB();
//ValidatorEJB vdt=new ValidatorEJB();
ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
DistCommon distCommon = new DistCommon();
//FinCommon finCommon = new FinCommon();
Timestamp currDate = null;
......@@ -4299,8 +4729,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
transer = "MDRCRD";
ls_tranwin = "W_MISC_DRCR_RCP_DR";
objName = "misc_drcr_rcp_dr";
ls_auto_tran_id = generateTranId("w_misc_drcr_rcp_dr",as_site_code,ls_drcr_flag,currDateStr,conn);
remarks = "Auto Generated Debit Note for Sales Return " + ls_tran_id;
//ls_auto_tran_id = generateTranId("w_misc_drcr_rcp_dr",as_site_code,ls_drcr_flag,currDateStr,conn);
//remarks = "Auto Generated Debit Note for Sales Return " + ls_tran_id;
}
else
{
......@@ -4308,8 +4738,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
transer = "MDRCRC";
ls_tranwin = "W_MISC_DRCR_RCP_CR";
objName = "misc_drcr_rcp_cr";
ls_auto_tran_id = generateTranId("w_misc_drcr_rcp_cr",as_site_code,ls_drcr_flag,currDateStr,conn);
remarks = "Auto Generated Credit Note for Sales Return " + ls_tran_id;
// ls_auto_tran_id = generateTranId("w_misc_drcr_rcp_cr",as_site_code,ls_drcr_flag,currDateStr,conn);
// remarks = "Auto Generated Credit Note for Sales Return " + ls_tran_id;
}
lb_flag = false;
......@@ -4360,7 +4790,7 @@ 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+"]");
......@@ -4555,7 +4985,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
ls_rndTo = ls_rndTo.trim();
}
System.out.println("ls_fin_entity["+ls_fin_entity+"]");
/* System.out.println("ls_fin_entity["+ls_fin_entity+"]");
sql = "insert into MISC_DRCR_RCP(TRAN_ID, TRAN_SER, TRAN_DATE, EFF_DATE, FIN_ENTITY, SITE_CODE, SUNDRY_TYPE, SUNDRY_CODE, ACCT_CODE, CCTR_CODE, AMOUNT, CURR_CODE," +
" EXCH_RATE, REMARKS, DRCR_FLAG, CHG_USER, CHG_DATE, CHG_TERM, EMP_CODE__APRV, DUE_DATE, TRAN_TYPE, ITEM_SER, AMOUNT__BC, SRETURN_NO, ADJ_MISC_CRN, CUST_REF_NO, RND_OFF, RND_TO,confirmed)" +
" VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ? , ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,? ,? ,?,?,?,?) " ;
......@@ -4595,7 +5025,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if(pstmt1 != null)
{
pstmt1.close();pstmt1 = null;
}
}*/
xmlBuff.append("<?xml version='1.0' encoding='ISO-8859-1'?><DocumentRoot>");
xmlBuff.append("<description>Datawindow Root</description>");
xmlBuff.append("<group0>");
......@@ -4683,6 +5113,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
xmlBuff.append("<amount__bc>").append("<![CDATA[" + ((lc_net_amt + lc_process_fee) * lc_exch_rate ) + "]]>").append("</amount__bc>");
xmlBuff.append("<rnd_off>").append("<![CDATA[" + ls_rndoff + "]]>").append("</rnd_off>");
xmlBuff.append("<rnd_to>").append("<![CDATA[" + ls_rndTo + "]]>").append("</rnd_to>");
//added by monika 24 dec 2019-to add sreturn no
xmlBuff.append("<sreturn_no>").append("<![CDATA[" + ls_tran_id + "]]>").append("</sreturn_no>");
xmlBuff.append("</Detail1>");
xmlBuff.append("\n");
}
......@@ -4851,7 +5285,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt1.setString( 19, ls_unit);
lc_tot_net_amt = lc_tot_net_amt + lc_net_amt ;
/* xmlBuff.append("<tax_amt><![CDATA["+ (lc_tax_amt) +"]]></tax_amt>");
/* xmlBuff.append("<tax_amt><![CDATA["+ (lc_tax_amt) +"]]></tax_amt>");
xmlBuff.append("<item_code><![CDATA["+ (lc_tax_amt) +"]]></item_code>");
xmlBuff.append("<quantity><![CDATA["+ (lc_tax_amt) +"]]></quantity>");
xmlBuff.append("<rate><![CDATA["+ (lc_tax_amt) +"]]></rate>");
......@@ -4861,7 +5295,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
xmlBuff.append("<lot_sl><![CDATA["+ ls_lotsl +"]]></lot_sl>");
xmlBuff.append("<unit><![CDATA["+ ls_unit +"]]></unit>");
xmlBuff.append("</Detail2>");
*/
*/
xmlBuff.append("<tax_amt>").append("<![CDATA[" + lc_tax_amt + "]]>").append("</tax_amt>");
xmlBuff.append("<item_code>").append("<![CDATA[" + ls_item_code + "]]>").append("</item_code>");
......@@ -4875,6 +5309,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
xmlBuff.append("<tax_class><![CDATA["+ checkNull(ls_tax_class) +"]]></tax_class>");
xmlBuff.append("<tax_chap><![CDATA["+ checkNull(ls_tax_chap) +"]]></tax_chap>");
xmlBuff.append("<tax_env><![CDATA["+ checkNull(ls_tax_env) +"]]></tax_env>");
//added by monika 24 dec 2019- to set SRETURN_NO
xmlBuff.append("<sreturn_no>").append("<![CDATA[" + ls_tran_id + "]]>").append("</sreturn_no>");
xmlBuff.append("</Detail2>");
xmlBuff.append("\n");
......@@ -4921,13 +5358,53 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
System.out.println("<<-----------code ending------------->>");
////////////
// }//added by monika 21 nov 19
xmlBuff.append("</Header0>");
xmlBuff.append("</group0>");
xmlBuff.append("</DocumentRoot>");
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--");
if (errorString.indexOf("Success") > -1)
{
System.out.println("@@@@@@3: Success"+errorString);
Document dom = genericUtility.parseString(errorString);
System.out.println("dom>>>"+dom);
drNtTranId = genericUtility.getColumnValue("TranID",dom);
}
else
{
System.out.println("[SuccessSuccess" + errorString + "]");
conn.rollback();
return errorString;
}
if(("MI".equalsIgnoreCase(ls_adj_misc_crn) || "MC".equalsIgnoreCase(ls_adj_misc_crn)) && (ls_prevtranid != ls_tran_id))
sql = "update sreturn set tran_id__crn = ? where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, drNtTranId);
pstmt.setString(2, ls_tran_id);
int rowcnt = pstmt.executeUpdate();
if (pstmt != null )
{
sql = "SELECT TRAN_ID,LINE_NO,REF_SER,REF_NO,ADJ_AMT,REF_BAL_AMT,mrp_value__adj FROM SRETURN_INV WHERE TRAN_ID = ? " ;
pstmt.close();
pstmt = null;
}
if( rowcnt == 0 )
{
//ls_errcode = "DS000NR";
}
/*if(("MI".equalsIgnoreCase(ls_adj_misc_crn) || "MC".equalsIgnoreCase(ls_adj_misc_crn)) && (ls_prevtranid != ls_tran_id))
{
*/ sql = "SELECT TRAN_ID,LINE_NO,REF_SER,REF_NO,ADJ_AMT,REF_BAL_AMT,mrp_value__adj FROM SRETURN_INV WHERE TRAN_ID = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, ls_tran_id);
rs = pstmt.executeQuery();
while(rs.next())
{
ls_temp = checkNullAndTrim(rs.getString(1));
......@@ -4974,7 +5451,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs.close();
rs = null;
}
}
/*}
xmlBuff.append("</Header0>");
xmlBuff.append("</group0>");
xmlBuff.append("</DocumentRoot>");
......@@ -5012,7 +5489,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
//ls_errcode = "DS000NR";
}
*/
/* DrCrRcpConf drcrObj = new DrCrRcpConf();
errorString = drcrObj.confirm (ls_auto_tran_id, xtraParams, "" , conn);
System.out.println("After DrCrRcpConf---->["+errorString+"]");
......
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