Skip to content

B
business-java
Commit 50cd6bb0 authored by apal's avatar apal
Browse files
Options

bug fix 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@173895 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f2350149
Show whitespace changes
Inline Side-by-side
Showing with 311 additions and 235 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/SalesReturnConfirm.java
View file @ 50cd6bb0
...@@ -2307,11 +2307,27 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -2307,11 +2307,27 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
} }
} }
//Added by Arun p 31-10-17 for generate edi outbond data when edi medium=4 and edi medium=1 -Start
String ediOption = ""; String ediOption = "";
sql = "select edi_option from transetup where tran_window = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, "w_salesreturn_retn");
rs = pstmt.executeQuery();
if (rs.next())
{
ediOption = rs.getString("edi_option");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("<-----------Edi Code calling ------>"); System.out.println("<-----------Edi Code calling ------>");
//Added by Arun p 31-10-17 for generate edi outbond data when edi medium=4 and edi medium=1 -Start
if(!("Y".equalsIgnoreCase(ls_channel_partner)) && "1".equals(ediOption) || (merrcode == null || merrcode.trim().length() == 0)) 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"); CreateRCPXML createRCPXML = new CreateRCPXML("w_salesreturn_retn", "tran_id");
...@@ -3764,6 +3780,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -3764,6 +3780,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
PreparedStatement pstmt1 = null; PreparedStatement pstmt1 = null;
ResultSet rs = null; ResultSet rs = null;
ResultSet rs1 = null;
ValidatorEJB vdt=new ValidatorEJB(); ValidatorEJB vdt=new ValidatorEJB();
DistCommon distCommon = new DistCommon(); DistCommon distCommon = new DistCommon();
//FinCommon finCommon = new FinCommon(); //FinCommon finCommon = new FinCommon();
...@@ -3870,122 +3887,148 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -3870,122 +3887,148 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs = null; rs = null;
} }
} }
System.out.println("ls_tran_id ["+ls_tran_id+"]");
sql = "select acct_code__pfee, cctr_code__pfee from itemser where item_ser = ? "; ////////////////////////////////
System.out.println("ls_cust_code ["+ls_cust_code+"]");
sql = "select a.cust_code__bill, a.eff_date, a.curr_code, a.exch_rate, a.anal_code, a.emp_code__aprv, a.item_ser, b.tran_id, b.quantity, " +
" case when (b.net_amt) is null then 0 else (b.net_amt) end , b.tax_chap, b.tax_class, b.tax_env, b.quantity__stduom, b.rate__stduom, " +
" b.discount,case when ( b.tax_amt) is null then 0 else ( b.tax_amt) end, b.reas_code, b.line_no, a.ret_opt, a.tran_type, b.item_code, " +
" a.adj_misc_crn, b.lot_no, b.line_no__invtrace, b.lot_sl,a.ret_ref, b.unit from sreturn a , sreturndet b where a.tran_id = b.tran_id " +
" and a.tran_id >= ? and a.tran_id <= ? and a.tran_date >= ? and a.tran_date <= ? and a.cust_code >= ? and a.cust_code <= ? and a.site_code = ?" +
" and a.tran_type = ? and a.confirmed = 'Y' and a.ret_opt in ('C','D') and b.invoice_id is null and a.tran_id__crn is null order by a.cust_code, a.item_ser, a.tran_date, a.tran_id " ;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,ls_item_ser ); pstmt.setString(1,as_tranid_from );
pstmt.setString(2,as_tranid_to );
pstmt.setDate(3, (java.sql.Date) adt_tran_date_from);
pstmt.setDate(4,(java.sql.Date) adt_tran_date_to );
pstmt.setString(5,as_cust_code_from );
pstmt.setString(6,as_cust_code_to );
pstmt.setString(7,as_site_code );
pstmt.setString(8,as_tran_type );
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) while(rs.next())
{
ls_acct_code__pfee = checkNullAndTrim(rs.getString("acct_code__pfee"));
ls_cctr_code__pfee = checkNullAndTrim(rs.getString("cctr_code__pfee"));
}
if (pstmt != null )
{ {
pstmt.close(); ll_line_no ++;
pstmt = null; ls_cust_code = checkNullAndTrim(rs.getString(1));
} ld_eff_date = rs.getTimestamp(2);
if (rs != null ) ls_curr_code = checkNullAndTrim(rs.getString(3));
lc_exch_rate = rs.getDouble(4);
ls_anal_code = checkNullAndTrim(rs.getString(5));
ls_emp_code__aprv = checkNullAndTrim(rs.getString(6));
ls_item_ser = checkNullAndTrim(rs.getString(7));
ls_tran_id = checkNullAndTrim(rs.getString(8));
lc_quantity = checkNullAndTrim(rs.getString(9));
lc_net_amt = rs.getDouble(10);
ls_tax_chap = checkNullAndTrim(rs.getString(11));
ls_tax_class = checkNullAndTrim(rs.getString(12));
ls_tax_env = checkNullAndTrim(rs.getString(13));
lc_qty_stduom = rs.getDouble(14);
lc_rate_stduom = rs.getDouble(15);
lc_discount = rs.getDouble(16);
lc_tax_amt = rs.getDouble(17);
ls_reas_code = checkNullAndTrim(rs.getString(18));
ll_line_no_sret = checkNullAndTrim(rs.getString(19));
ls_ret_opt = checkNullAndTrim(rs.getString(20));
ls_trantype = checkNullAndTrim(rs.getString(21));
ls_item_code = checkNullAndTrim(rs.getString(22));
ls_adj_misc_crn = checkNullAndTrim(rs.getString(23));
ls_lot_no = checkNull(rs.getString(24));
ll_line_no_invtrace = checkNullAndTrim(rs.getString(25));
ls_lotsl = checkNullAndTrim(rs.getString(26));
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+"]");
////////////// Added arun
sql = "select acct_code__pfee, cctr_code__pfee from itemser where item_ser = ? ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,ls_item_ser );
rs1 = pstmt1.executeQuery();
if(rs1.next())
{ {
rs.close(); ls_acct_code__pfee = checkNullAndTrim(rs1.getString("acct_code__pfee"));
rs = null; ls_cctr_code__pfee = checkNullAndTrim(rs1.getString("cctr_code__pfee"));
} }
if((ls_acct_code__pfee == null || ls_acct_code__pfee.length()== 0) || (ls_cctr_code__pfee == null || ls_cctr_code__pfee.length() == 0) ) if (pstmt1 != null )
{
/*ls_cctr_code__pfee = gbf_acct_detr_ttype(ls_itemcode,ls_itemser,'SRET', ls_trantype, as_site_code)
ls_acct_code__pfee = f_get_token(ls_cctr_code__pfee,'~t')*/
ls_cctr_code__pfee = finCommon.getAcctDetrTtype(ls_item_code, ls_item_ser, "SRET", as_tran_type, conn);
if (ls_cctr_code__pfee != null && ls_cctr_code__pfee.trim().length() > 0)
{
String tokens [] = ls_cctr_code__pfee.split(",");
System.out.println("Length="+tokens.length);
if ( tokens.length >= 2)
{ {
ls_acct_code__pfee = tokens[0]; pstmt1.close();
ls_cctr_code__pfee = tokens[1]; pstmt1 = null;
ls_acct_code__pfee = checkNullAndTrim(ls_acct_code__pfee);
ls_cctr_code__pfee = checkNullAndTrim(ls_cctr_code__pfee);
} }
else if (rs1 != null )
{ {
ls_acct_code__pfee = ls_cctr_code__pfee.substring(0,ls_cctr_code__pfee.indexOf(",")); rs1.close();
ls_cctr_code__pfee = ls_cctr_code__pfee.substring(ls_cctr_code__pfee.indexOf(",") + 1); rs1 = null;
}
tokens = null;
}
} }
if(ls_old_cust_code != ls_cust_code || ls_old_item_ser != ls_item_ser) if(ls_old_cust_code != ls_cust_code || ls_old_item_ser != ls_item_ser)
{ {
sql = "select fin_entity from site where site_code = ? "; sql = "select fin_entity from site where site_code = ? ";
pstmt = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
pstmt.setString(1, as_site_code); pstmt1.setString(1, as_site_code);
rs = pstmt.executeQuery(); rs1 = pstmt1.executeQuery();
if(rs.next()) if(rs1.next())
{ {
ls_fin_entity = checkNullAndTrim(rs.getString(1)); ls_fin_entity = checkNullAndTrim(rs1.getString(1));
} }
if (pstmt != null ) if (pstmt1 != null )
{ {
pstmt.close(); pstmt1.close();
pstmt = null; pstmt1 = null;
} }
if (rs != null ) if (rs1 != null )
{ {
rs.close(); rs1.close();
rs = null; rs1 = null;
} }
sql = "select acct_code__ar, cctr_code__ar from customer where cust_code = ? "; sql = "select acct_code__ar, cctr_code__ar from customer where cust_code = ? ";
pstmt = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
pstmt.setString(1, ls_cust_code); pstmt1.setString(1, ls_cust_code);
rs = pstmt.executeQuery(); rs1 = pstmt1.executeQuery();
if(rs.next()) if(rs1.next())
{ {
ls_acct_code = checkNullAndTrim(rs.getString(1)); ls_acct_code = checkNullAndTrim(rs1.getString(1));
ls_cctr_code = checkNullAndTrim(rs.getString(2)); ls_cctr_code = checkNullAndTrim(rs1.getString(2));
} }
if (pstmt != null ) if (pstmt1 != null )
{ {
pstmt.close(); pstmt1.close();
pstmt = null; pstmt1 = null;
} }
if (rs != null ) if (rs1 != null )
{ {
rs.close(); rs1.close();
rs = null; rs1 = null;
} }
else if((ls_acct_code == null || ls_cctr_code == null) || (ls_acct_code.length() == 0 || ls_cctr_code.length() == 0)) else if((ls_acct_code == null || ls_cctr_code == null) || (ls_acct_code.length() == 0 || ls_cctr_code.length() == 0))
{ {
sql = "select acct_code__ar, cctr_code__ar from itemser where item_ser = ? " ; sql = "select acct_code__ar, cctr_code__ar from itemser where item_ser = ? " ;
pstmt = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
pstmt.setString(1, ls_item_ser); pstmt1.setString(1, ls_item_ser);
rs = pstmt.executeQuery(); rs1 = pstmt1.executeQuery();
if(rs.next()) if(rs1.next())
{ {
ls_acct_code = checkNullAndTrim(rs.getString(1)); ls_acct_code = checkNullAndTrim(rs1.getString(1));
ls_cctr_code = checkNullAndTrim(rs.getString(2)); ls_cctr_code = checkNullAndTrim(rs1.getString(2));
} }
if (pstmt != null ) if (pstmt1 != null )
{ {
pstmt.close(); pstmt1.close();
pstmt = null; pstmt1 = null;
} }
if (rs != null ) if (rs1 != null )
{ {
rs.close(); rs1.close();
rs = null; rs1 = null;
} }
} }
/*ls_cctr_code = gbf_acct_detr_ttype(ls_itemcode,ls_item_ser,'AR',ls_trantype, as_site_code) /*ls_cctr_code = gbf_acct_detr_ttype(ls_itemcode,ls_item_ser,'AR',ls_trantype, as_site_code)
...@@ -4017,28 +4060,6 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -4017,28 +4060,6 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
/*ls_det_cctr = gbf_acct_detr_ttype(ls_itemcode,ls_item_ser,'SRET', ls_trantype, as_site_code) /*ls_det_cctr = gbf_acct_detr_ttype(ls_itemcode,ls_item_ser,'SRET', ls_trantype, as_site_code)
ls_det_acct = f_get_token(ls_det_cctr,'~t')*/ ls_det_acct = f_get_token(ls_det_cctr,'~t')*/
ls_det_cctr = finCommon.getAcctDetrTtype(ls_item_code, ls_item_ser, "SRET", as_tran_type, conn);
if (ls_det_cctr != null && ls_det_cctr.trim().length() > 0)
{
String tokens [] = ls_det_cctr.split(",");
System.out.println("Length="+tokens.length);
if ( tokens.length >= 2)
{
ls_det_acct = tokens[0];
ls_det_cctr = tokens[1];
ls_det_acct = checkNullAndTrim(ls_det_acct);
ls_det_cctr = checkNullAndTrim(ls_det_cctr);
}
else
{
ls_det_acct = ls_det_cctr.substring(0,ls_det_cctr.indexOf(","));
ls_det_cctr = ls_det_cctr.substring(ls_det_cctr.indexOf(",") + 1);
}
tokens = null;
}
ls_finpara = finCommon.getFinparams("999999", "INVOICE_DRCR_ADJ", conn); ls_finpara = finCommon.getFinparams("999999", "INVOICE_DRCR_ADJ", conn);
if("NULLFOUND".equalsIgnoreCase(ls_finpara)) if("NULLFOUND".equalsIgnoreCase(ls_finpara))
...@@ -4060,95 +4081,109 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -4060,95 +4081,109 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
ls_rndTo = ls_rndTo.trim(); ls_rndTo = ls_rndTo.trim();
} }
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," + 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) ) " + " 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 ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ? , ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,? ,? ,?,?,?) " ; " VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ? , ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,? ,? ,?,?,?,?) " ;
pstmt = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
pstmt.setString( 1, ls_auto_tran_id); pstmt1.setString( 1, ls_auto_tran_id);
pstmt.setString( 2, transer ); pstmt1.setString( 2, transer );
pstmt.setTimestamp( 3, adt_credit_note ); pstmt1.setTimestamp( 3, adt_credit_note );
pstmt.setTimestamp( 4, ld_eff_date ); pstmt1.setTimestamp( 4, ld_eff_date );
pstmt.setString( 5, ls_fin_entity ); pstmt1.setString( 5, ls_fin_entity );
pstmt.setString( 6, as_site_code ); pstmt1.setString( 6, as_site_code );
pstmt.setString( 7, "C" ); pstmt1.setString( 7, "C" );
pstmt.setString( 8, ls_cust_code ); pstmt1.setString( 8, ls_cust_code );
pstmt.setString( 9, ls_acct_code ); pstmt1.setString( 9, ls_acct_code );
pstmt.setString( 10, ls_cctr_code ); pstmt1.setString( 10, ls_cctr_code );
pstmt.setDouble( 11, (lc_tot_net_amt + lc_process_fee) ); pstmt1.setDouble( 11, (lc_tot_net_amt + lc_process_fee) );
pstmt.setString( 12, ls_curr_code ); pstmt1.setString( 12, ls_curr_code );
pstmt.setDouble( 13, lc_exch_rate ); pstmt1.setDouble( 13, lc_exch_rate );
pstmt.setString( 14, remarks ); pstmt1.setString( 14, remarks );
pstmt.setString( 15, ls_drcr_flag); pstmt1.setString( 15, ls_drcr_flag);
pstmt.setString( 16, chgUser ); pstmt1.setString( 16, chgUser );
pstmt.setTimestamp( 17, currDate ); pstmt1.setTimestamp( 17, currDate );
pstmt.setString( 18, chgTerm ); pstmt1.setString( 18, chgTerm );
pstmt.setString( 19, ls_emp_code__aprv ); pstmt1.setString( 19, ls_emp_code__aprv );
pstmt.setTimestamp( 20, ld_eff_date ); pstmt1.setTimestamp( 20, ld_eff_date );
pstmt.setString( 21, as_tran_type); pstmt1.setString( 21, as_tran_type);
pstmt.setString( 22, ls_item_ser ); pstmt1.setString( 22, ls_item_ser );
pstmt.setDouble( 23, (lc_tot_net_amt + lc_process_fee) * lc_exch_rate ); pstmt1.setDouble( 23, (lc_tot_net_amt + lc_process_fee) * lc_exch_rate );
pstmt.setString( 24, ls_tran_id ); pstmt1.setString( 24, ls_tran_id );
pstmt.setString( 25, ls_adj_misc_crn ); pstmt1.setString( 25, ls_adj_misc_crn );
pstmt.setString( 26, ls_ret_ref ); pstmt1.setString( 26, ls_ret_ref );
pstmt.setString( 27, ls_rndoff ); pstmt1.setString( 27, ls_rndoff );
pstmt.setString( 28, ls_rndTo ); pstmt1.setString( 28, ls_rndTo );
pstmt1.setString( 29, "N" );
System.out.println("ls_fin_entity["+ls_fin_entity+"]");
int cnt=pstmt1.executeUpdate();
if(pstmt1 != null)
{
pstmt1.close();pstmt1 = null;
}
}
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+"]");
////////
if((ls_acct_code__pfee == null || ls_acct_code__pfee.length()== 0) || (ls_cctr_code__pfee == null || ls_cctr_code__pfee.length() == 0) )
{
/*ls_cctr_code__pfee = gbf_acct_detr_ttype(ls_itemcode,ls_itemser,'SRET', ls_trantype, as_site_code)
ls_acct_code__pfee = f_get_token(ls_cctr_code__pfee,'~t')*/
int cnt=pstmt.executeUpdate(); ls_cctr_code__pfee = finCommon.getAcctDetrTtype(ls_item_code, ls_item_ser, "SRET", ls_trantype, conn);
if(pstmt != null) if (ls_cctr_code__pfee != null && ls_cctr_code__pfee.trim().length() > 0)
{ {
pstmt.close();pstmt = null; String tokens [] = ls_cctr_code__pfee.split(",");
System.out.println("Length="+tokens.length);
if ( tokens.length >= 2)
{
ls_acct_code__pfee = tokens[0];
ls_cctr_code__pfee = tokens[1];
ls_acct_code__pfee = checkNullAndTrim(ls_acct_code__pfee);
ls_cctr_code__pfee = checkNullAndTrim(ls_cctr_code__pfee);
} }
else
{
ls_acct_code__pfee = ls_cctr_code__pfee.substring(0,ls_cctr_code__pfee.indexOf(","));
ls_cctr_code__pfee = ls_cctr_code__pfee.substring(ls_cctr_code__pfee.indexOf(",") + 1);
}
tokens = null;
} }
sql = "select a.cust_code__bill, a.eff_date, a.curr_code, a.exch_rate, a.anal_code, a.emp_code__aprv, a.item_ser, b.tran_id, b.quantity, " + }
" case when (b.net_amt) is null then 0 else (b.net_amt) end , b.tax_chap, b.tax_class, b.tax_env, b.quantity__stduom, b.rate__stduom, " + ls_det_cctr = finCommon.getAcctDetrTtype(ls_item_code, ls_item_ser, "SRET", ls_trantype, conn);
" b.discount,case when ( b.tax_amt) is null then 0 else ( b.tax_amt) end, b.reas_code, b.line_no, a.ret_opt, a.tran_type, b.item_code, " + if (ls_det_cctr != null && ls_det_cctr.trim().length() > 0)
" a.adj_misc_crn, b.lot_no, b.line_no__invtrace, b.lot_sl,a.ret_ref, b.unit from sreturn a , sreturndet b where a.tran_id = b.tran_id " +
" and a.tran_id >= ? and a.tran_id <= ? and a.tran_date >= ? and a.tran_date <= ? and a.cust_code >= ? and a.cust_code <= ? and a.site_code = ?" +
" and a.tran_type = ? and a.confirmed = 'Y' and a.ret_opt in ('C','D') and b.invoice_id is null and a.tran_id__crn is null order by a.cust_code, a.item_ser, a.tran_date, a.tran_id " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,as_tranid_from );
pstmt.setString(2,as_tranid_to );
pstmt.setDate(3, (java.sql.Date) adt_tran_date_from);
pstmt.setDate(4,(java.sql.Date) adt_tran_date_to );
pstmt.setString(5,as_cust_code_from );
pstmt.setString(6,as_cust_code_to );
pstmt.setString(7,as_site_code );
pstmt.setString(8,as_tran_type );
rs = pstmt.executeQuery();
if(rs.next())
{ {
ll_line_no ++; String tokens [] = ls_det_cctr.split(",");
ls_cust_code = checkNullAndTrim(rs.getString(1));
ld_eff_date = rs.getTimestamp(2);
ls_curr_code = checkNullAndTrim(rs.getString(3));
lc_exch_rate = rs.getDouble(4);
ls_anal_code = checkNullAndTrim(rs.getString(5));
ls_emp_code__aprv = checkNullAndTrim(rs.getString(6));
ls_item_ser = checkNullAndTrim(rs.getString(7));
ls_tran_id = checkNullAndTrim(rs.getString(8));
lc_quantity = checkNullAndTrim(rs.getString(9));
lc_net_amt = rs.getDouble(10);
ls_tax_chap = checkNullAndTrim(rs.getString(11));
ls_tax_class = checkNullAndTrim(rs.getString(12));
ls_tax_env = checkNullAndTrim(rs.getString(13));
lc_qty_stduom = rs.getDouble(14);
lc_rate_stduom = rs.getDouble(15);
lc_discount = rs.getDouble(16);
lc_tax_amt = rs.getDouble(17);
ls_reas_code = checkNullAndTrim(rs.getString(18));
ll_line_no_sret = checkNullAndTrim(rs.getString(19));
ls_ret_opt = checkNullAndTrim(rs.getString(20));
ls_trantype = checkNullAndTrim(rs.getString(21));
ls_item_code = checkNullAndTrim(rs.getString(22));
ls_adj_misc_crn = checkNullAndTrim(rs.getString(23));
ls_lot_no = checkNull(rs.getString(24));
ll_line_no_invtrace = checkNullAndTrim(rs.getString(25));
ls_lotsl = checkNullAndTrim(rs.getString(26));
ls_ret_ref = checkNullAndTrim(rs.getString(27));
ls_unit = checkNullAndTrim(rs.getString(28));
sql = "INSERT INTO MISC_DRCR_RDET(TRAN_ID, LINE_NO, ACCT_CODE, CCTR_CODE, AMOUNT, NET_AMT, TAX_AMT, TAX_CLASS, TAX_CHAP, TAX_ENV, REAS_CODE, ITEM_CODE, QUANTITY, RATE, LINE_NO__SRET, LINE_NO__INVTRACE, LOT_NO, LOT_SL, UNIT) )" + System.out.println("Length="+tokens.length);
if ( tokens.length >= 2)
{
ls_det_acct = tokens[0];
ls_det_cctr = tokens[1];
ls_det_acct = checkNullAndTrim(ls_det_acct);
ls_det_cctr = checkNullAndTrim(ls_det_cctr);
}
else
{
ls_det_acct = ls_det_cctr.substring(0,ls_det_cctr.indexOf(","));
ls_det_cctr = ls_det_cctr.substring(ls_det_cctr.indexOf(",") + 1);
}
tokens = null;
}
//// ended arun
sql = "INSERT INTO MISC_DRCR_RDET(TRAN_ID, LINE_NO, ACCT_CODE, CCTR_CODE, AMOUNT, NET_AMT, TAX_AMT, TAX_CLASS, TAX_CHAP, TAX_ENV, REAS_CODE, ITEM_CODE, QUANTITY, RATE, LINE_NO__SRET, LINE_NO__INVTRACE, LOT_NO, LOT_SL, UNIT)" +
" values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )"; " values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )";
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
...@@ -4192,7 +4227,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -4192,7 +4227,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt1.setString( 17, ls_lot_no); pstmt1.setString( 17, ls_lot_no);
pstmt1.setString( 18, ls_lotsl); pstmt1.setString( 18, ls_lotsl);
pstmt1.setString( 19, ls_unit); pstmt1.setString( 19, ls_unit);
lc_tot_net_amt = lc_tot_net_amt + lc_net_amt ;
int detCnt = pstmt1.executeUpdate(); int detCnt = pstmt1.executeUpdate();
if(pstmt1 != null) if(pstmt1 != null)
{ {
...@@ -4210,6 +4245,30 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -4210,6 +4245,30 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs = null; rs = null;
} }
///////////////////// arun
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+"]");
int s=pstmt1.executeUpdate();
if(s>0)
{
System.out.println("<-----------set the amount");
}
else
{
System.out.println("<----------- not set the amount");
}
System.out.println("<<-----------code ending------------->>");
////////////
if(("MI".equalsIgnoreCase(ls_adj_misc_crn) || "MC".equalsIgnoreCase(ls_adj_misc_crn)) && (ls_prevtranid != ls_tran_id)) 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 = ? " ; sql = "SELECT TRAN_ID,LINE_NO,REF_SER,REF_NO,ADJ_AMT,REF_BAL_AMT,mrp_value__adj FROM SRETURN_INV WHERE TRAN_ID = ? " ;
...@@ -4271,15 +4330,32 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC ...@@ -4271,15 +4330,32 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
ls_errcode = "DS000NR"; ls_errcode = "DS000NR";
} }
if( "Y".equalsIgnoreCase( as_post ) ) /* DrCrRcpConf drcrObj = new DrCrRcpConf();
errorString = drcrObj.confirm (ls_auto_tran_id, xtraParams, "" , conn);
System.out.println("After DrCrRcpConf---->["+errorString+"]");
*/
// added arun start
MiscDrCrRcpConf confDebitNote = new MiscDrCrRcpConf();
errorString= confDebitNote.confirm(ls_auto_tran_id,xtraParams, "" , conn);
System.out.println("After DrCrRcpConf---->["+errorString+"]");
System.out.println("errorString["+errorString+"]");
if(errorString != null && errorString.indexOf("CONFSUCCES") != -1)
{ {
ls_errcode = retrieveMiscDrcrRcp("misc_drcr_rcp",ls_auto_tran_id, xtraParams, "N"); errorString = "";
}
//ended arun
/*if( "Y".equalsIgnoreCase( as_post ) )
{
ls_errcode = retrieveMiscDrcrRcp("misc_drcr_rcp_cr",ls_auto_tran_id, xtraParams, "N");
if (ls_errcode != null && ls_errcode.trim().length() > 0) if (ls_errcode != null && ls_errcode.trim().length() > 0)
{ {
errorString = vdt.getErrorString("",ls_errcode,""); errorString = vdt.getErrorString("",ls_errcode,"");
return errorString; return errorString;
} }
} }*/
} }
catch(Exception e) catch(Exception e)
......
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