Skip to content

B
business-java
Commit 848b2e96 authored by mmhatre's avatar mmhatre
Browse files
Options

issue fixed for credit note has been tax calculated 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@216229 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ec67eea2
Hide whitespace changes
Inline Side-by-side
Showing with 260 additions and 164 deletions
webitm-dis/src/ibase/webitm/ejb/dis/adv/SalesReturnConfirm.java
View file @ 848b2e96
......@@ -2773,7 +2773,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if (merrcode == null || merrcode.trim().length() == 0 )
{
//System.out.println("inside merrcode");
sql = " select tran_id from drcr_rcp where sreturn_no = ?";
sql = " select tran_id from drcr_rcp where sreturn_no = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,msalereturn );
rs = pstmt.executeQuery();
......@@ -2821,6 +2821,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();
pstmt = null;
}
//System.out.println("sum(net_amt)"+lc_crnamt+" sr"+lc_sramt);
if (Math.abs(lc_crnamt - lc_sramt) > 1 )
{
//errorString = vdt.getErrorString("","VTSRCRAMT","");
......@@ -4018,19 +4020,21 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
lb_flag = false;
}
//System.out.println("lb_flag-->"+lb_flag);
System.out.println("lb_flag-->"+lb_flag);
if (lb_flag == false)
{
lc_drcr_amt = (lc_qty_stduom * lc_rate_stduom) - ((lc_qty_stduom * lc_rate_stduom) * lc_discount / 100);
lc_tot_net_amt = lc_tot_net_amt + lc_net_amt ;
}
if (lb_flag == true)
{
lc_tot_net_amt = lc_tot_net_amt + lc_amt + lc_tax_amt;
}
//System.out.println("DRCR_RCP---lc_tot_net_amt["+lc_tot_net_amt+"] lc_amt ["+lc_amt+"] lc_tax_amt["+lc_tax_amt+"] lc_drcr_amt["+lc_drcr_amt+"]"
//+ "lc_qty_stduom["+lc_qty_stduom+"] lc_rate_stduom["+lc_rate_stduom+"] lc_discount["+lc_discount+"]");
System.out.println("DRCR_RCP---lc_tot_net_amt["+lc_tot_net_amt+"] lc_amt ["+lc_amt+"] lc_tax_amt["+lc_tax_amt+"] lc_drcr_amt["+lc_drcr_amt+"]"
+ "lc_qty_stduom["+lc_qty_stduom+"] lc_rate_stduom["+lc_rate_stduom+"] lc_discount["+lc_discount+"]");
//Added by wasim on 01-JUN-2017 as amount calculation was not migrated [END]
......@@ -4302,8 +4306,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt1.setDouble( 10, lc_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>");
/* 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);
......@@ -5676,6 +5680,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
String currDateStr = sdfAppl.format(currDate);
chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId");
//chgDate= new java.sql.Timestamp(System.currentTimeMillis()) ;
chgDate = new java.sql.Timestamp(new java.util.Date().getTime());
sql="select tran_date,fin_entity,cust_code,acct_code,cctr_code,eff_date,invoice_id,amount, "+
" curr_code,exch_rate,remarks,site_code,anal_code,drcr_flag,tran_id__rcv,confirmed,conf_date, "+
......@@ -5747,12 +5753,18 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
transer = "DRNRCP";
tranwin = "W_DRCRRCP_DR";
WINDOW = "T_DRCRRCP_DRHO";
//tranIdAs = generateTranId("W_DRCRRCP_CR",siteCode,drcrFlag,currDateStr,conn);
tranIdNew = generateTranId("w_drcrrcp_cr",siteCode,drcrFlag,currDateStr,conn);
//System.out.println("tran id auto generated>>>>>"+tranIdNew);
}
else if ("C".equalsIgnoreCase(drcrFlag))
{
transer = "CRNRCP";
tranwin = "W_DRCRRCP_CR";
WINDOW = "T_DRCRRCP_CRHO";
//tranIdAs = generateTranId("W_DRCRRCP_CR",siteCode,drcrFlag,currDateStr,conn);
tranIdNew = generateTranId("w_drcrrcp_cr",siteCode,drcrFlag,currDateStr,conn);
//System.out.println("tran id auto generated>>>>>"+tranIdNew);
}
/* if ("D".equalsIgnoreCase(drcr_flag))
......@@ -5907,7 +5919,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs=null;
sql="select invoice_id from invoice where parent__tran_id= ? ";
/*sql="select invoice_id from invoice where parent__tran_id= ? ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, invoiceId);
rs=pstmt.executeQuery();
......@@ -5922,8 +5934,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
if(parentTranIdAs== null || parentTranIdAs.trim().length() == 0)
{
return errString;
}
/* sql=" insert into drcr_rcp (tran_id,tran_date,fin_entity,cust_code,acct_code,cctr_code,eff_date,invoice_id,amount, "
}*/
sql=" insert into drcr_rcp (tran_id,tran_date,fin_entity,cust_code,acct_code,cctr_code,eff_date,invoice_id,amount, "
+" curr_code,exch_rate,remarks,site_code,anal_code,drcr_flag,tran_id__rcv,confirmed, "
+" emp_code__aprv,tran_type,tran_ser,due_date,cr_term,chg_date,chg_user,chg_term,add_date,add_user, "
+" add_term,amount__bc,item_ser,round_adj,sreturn_no,adj_recv,gp_ser,gp_no,gp_date,parent__tran_id, "
......@@ -5931,66 +5943,67 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
+" drcr_type,ord_billback_amt,ord_offinv_amt,line_billback_amt,line_offinv_amt,edi_stat) "
+ "values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, tran_id_new);
pstmt.setTimestamp(2, tran_date);
pstmt.setString(3, fin_entity);
pstmt.setString(4, cust_code);
pstmt.setString(5, acct_code);
pstmt.setString(6, cctr_code);
pstmt.setTimestamp(7, eff_date);
pstmt.setString(8, parent_tran_id);
pstmt.setString(1, tranIdNew);
//pstmt.setString(1, tranIdAs);
pstmt.setTimestamp(2, tranDate);
pstmt.setString(3, finEntity);
pstmt.setString(4, custCode);
pstmt.setString(5, acctCode);
pstmt.setString(6, cctrCode);
pstmt.setTimestamp(7, effDate);
pstmt.setString(8, invoiceId);
pstmt.setDouble(9, amount);
pstmt.setString(10, curr_code);
pstmt.setDouble(11, exch_rate);
pstmt.setString(10, currCode);
pstmt.setDouble(11, exchRate);
pstmt.setString(12, remarks);
pstmt.setString(13, site_code);
pstmt.setString(14,anal_code);
pstmt.setString(15, drcr_flag);
pstmt.setString(16, tran_id__rcv);
pstmt.setString(13, siteCodeAs);
pstmt.setString(14,analCode);
pstmt.setString(15, drcrFlag);
pstmt.setString(16, tranIdRcv);
pstmt.setString(17, "N");
pstmt.setString(18, emp_code__aprv);
pstmt.setString(19, tran_type);
pstmt.setString(20, tran_ser);
pstmt.setTimestamp(21, due_date);
pstmt.setString(22, cr_term);
pstmt.setTimestamp(23, chg_date);
pstmt.setString(18, empCodeAprv);
pstmt.setString(19, tranType);
pstmt.setString(20, tranSer);
pstmt.setTimestamp(21, dueDate);
pstmt.setString(22, crTerm);
pstmt.setTimestamp(23, chgDate);
pstmt.setString(24, chgUser);
pstmt.setString(25, chgTerm);
pstmt.setTimestamp(26, chg_date);
pstmt.setTimestamp(26, chgDate);
pstmt.setString(27, chgUser);
pstmt.setString(28, chgTerm);
pstmt.setDouble(29, amount__bc);
pstmt.setString(30, item_ser);
pstmt.setDouble(29, amountBc);
pstmt.setString(30, itemSer);
pstmt.setDouble(31, 0);
pstmt.setString(32, sreturn_no);
pstmt.setString(33, adj_recv);
pstmt.setString(34, gp_ser);
pstmt.setString(35, gp_no);
pstmt.setTimestamp(36, gp_date);
pstmt.setString(32, " ");
pstmt.setString(33, adjRecv);
pstmt.setString(34, gpSer);
pstmt.setString(35, gpNo);
pstmt.setTimestamp(36, gpDate);
pstmt.setString(37, tranIdAs);
pstmt.setString(38, rev__tran);
pstmt.setString(39, cust_ref_no);
pstmt.setTimestamp(40, cust_ref_date);
pstmt.setDouble(41, cust_ref_amt);
pstmt.setString(42, rnd_off);
pstmt.setString(43, rnd_to);
pstmt.setString(44, sundry_type);
pstmt.setString(45, cust_code);
pstmt.setString(46, site_code__drcr);
pstmt.setString(47, drcr_type);
pstmt.setDouble(48, ord_billback_amt);
pstmt.setDouble(49, ord_offinv_amt);
pstmt.setDouble(50, line_billback_amt);
pstmt.setDouble(51, line_offinv_amt);
pstmt.setString(52, edi_stat);
pstmt.setString(38, revTran);
pstmt.setString(39, custRefNo);
pstmt.setTimestamp(40, custRefDate);
pstmt.setDouble(41, custRefAmt);
pstmt.setString(42, rndOff);
pstmt.setString(43, rndTo);
pstmt.setString(44, sundryType);
pstmt.setString(45, custCode);
pstmt.setString(46, siteCodeDrcr);
pstmt.setString(47, drcrType);
pstmt.setDouble(48, ordBillbackAmt);
pstmt.setDouble(49, ordOffinvAmt);
pstmt.setDouble(50, lineBillbackAmt);
pstmt.setDouble(51, lineOffinvAmt);
pstmt.setString(52, ediStat);
pstmt.executeUpdate();
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}*/
}
xmlBuff.append("<?xml version='1.0' encoding='ISO-8859-1'?><DocumentRoot>");
/*xmlBuff.append("<?xml version='1.0' encoding='ISO-8859-1'?><DocumentRoot>");
xmlBuff.append("<description>Datawindow Root</description>");
xmlBuff.append("<group0>");
xmlBuff.append("<description>Group0 description</description>");
......@@ -6063,10 +6076,10 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
xmlBuff.append("<parent__tran_id>").append("<![CDATA[" + tranIdAs + "]]>").append("</parent__tran_id>");
xmlBuff.append("<rev__tran>").append("<![CDATA[" + revTran + "]]>").append("</rev__tran>");
//xmlBuff.append("<cust_ref_no>").append("<![CDATA[" + custRefNo + "]]>").append("</cust_ref_no>");
/*if(custRefDate !=null)
if(custRefDate !=null)
{
xmlBuff.append("<cust_ref_date>").append("<![CDATA[" + sdfAppl.format(custRefDate).toString() + "]]>").append("</cust_ref_date>");
}*/
}
//xmlBuff.append("<cust_ref_amt>").append("<![CDATA[" + custRefAmt + "]]>").append("</cust_ref_amt>");
xmlBuff.append("<rnd_off>").append("<![CDATA[" + rndOff + "]]>").append("</rnd_off>");
xmlBuff.append("<rnd_to>").append("<![CDATA[" + rndTo + "]]>").append("</rnd_to>");
......@@ -6081,7 +6094,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
xmlBuff.append("<edi_stat>").append("<![CDATA[" + ediStat + "]]>").append("</edi_stat>");
xmlBuff.append("</Detail1>");
xmlBuff.append("\n");
xmlBuff.append("\n");*/
sql="select tran_type,tax_date from sreturn where tran_id= ? ";
pstmt=conn.prepareStatement(sql);
......@@ -6131,9 +6144,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
" discount,line_no__sret,line_no__invtrace,lot_no,lot_sl,tran_id__rcp,billback_amt,offinv_amt " +
" from drcr_rdet " +
" where tran_id = ? ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, tranIdAs);
rs=pstmt.executeQuery();
pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1, tranIdAs);
rs=pstmt1.executeQuery();
while(rs.next())
{
lineNo=rs.getInt("line_no");
......@@ -6167,20 +6180,60 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
netAmt=0;
}
if(amount==0)
{
amount=0;
netAmt=netAmt-taxAmt;
}
if(!lbFlag)
{
taxEnvSr=taxEnv;
}
System.out.println("manish tran id>>>>"+tranIdNew+"\ntran id"+tranId+"\ntran id "+tranIdAs+"\ntranid"+tranIdRcp+"\ntranid"+tranIdRcv);
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,COST_RATE,RATE__STD,QUANTITY,RATE,RATE__CLG, " +
" DISCOUNT,LINE_NO__SRET,LINE_NO__INVTRACE,LOT_NO,LOT_SL,TRAN_ID__RCP,BILLBACK_AMT,OFFINV_AMT) "+
" Values (?,?,?,?,?,?, "+
" ?,?,?,?,?,?,?,?, "+
"?,?,?,?,?,?,?, "+
"?,?,?,?,? ) ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, tranIdNew);
pstmt.setInt(2, lineNo);
pstmt.setString(3, invoiceId);
pstmt.setInt(4, lineNoInv);
pstmt.setString(5, itemCode);
pstmt.setString(6, salesPers);
pstmt.setString(7, " ");
pstmt.setString(8, " ");
pstmt.setString(9, " ");
pstmt.setDouble(10, drcrAmt);
pstmt.setDouble(11, 0);
pstmt.setDouble(12, drcrAmt);
pstmt.setString(13, reasCode);
pstmt.setDouble(14,costRate);
pstmt.setDouble(15, rateStd);
pstmt.setDouble(16, quantity);
pstmt.setDouble(17, rate);
pstmt.setDouble(18, rateClg);
pstmt.setDouble(19, discount);
pstmt.setInt(20, lineNoSret);
pstmt.setNull(21, Types.INTEGER);
// pstmt.setInt(21,0);
pstmt.setString(22, lotNo);
pstmt.setString(23, lotSl);
pstmt.setString(24, tranId);
pstmt.setDouble(25, billbackAmt);
pstmt.setDouble(26, offinvAmt);
pstmt.executeUpdate();
if(pstmt!=null)
{
pstmt.close();
pstmt = null;
}
xmlBuff.append("<Detail2 dbID=\"\" domID=\""+lineNo+"\" objContext=\"2\" objName=\"drcrrcp_cr\">");
/* xmlBuff.append("<Detail2 dbID=\"\" domID=\""+lineNo+"\" objContext=\"2\" objName=\"drcrrcp_cr\">");
xmlBuff.append("<attribute pkNames=\"\" selected=\"N\" status=\"N\" updateFlag=\"A\"/>");
//xmlBuff.append("<tran_id>").append("<![CDATA[" + tranIdNew + "]]>").append("</tran_id>");
......@@ -6214,12 +6267,38 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
xmlBuff.append("<offinv_amt>").append("<![CDATA[" + offinvAmt + "]]>").append("</offinv_amt>");
xmlBuff.append("</Detail2>");
xmlBuff.append("\n");
xmlBuff.append("\n");*/
}
rs.close();
rs = null;
pstmt1.close();
pstmt1 = null;
sql="select SUM(DRCR_AMT) from drcr_rdet where tran_id= ? ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, tranIdNew);
rs=pstmt.executeQuery();
if(rs.next())
{
amount=rs.getDouble(1);
}
pstmt.close();
pstmt = null;
pstmt=null;
rs.close();
rs=null;
amountBc=amount *exchRate;
sql=" update drcr_rcp set amount = ? ,amount__bc= ? where tran_id = ? ";
pstmt=conn.prepareStatement(sql);
pstmt.setDouble(1,amount);
pstmt.setDouble(2,amountBc);
pstmt.setString(3,tranIdNew);
pstmt.executeUpdate();
pstmt.close();
pstmt=null;
//System.out.println("--xmlString--"+xmlBuff.toString());
/*errorString = saveData(xtraParams,siteCodeAs,xmlBuff.toString(),conn);
//System.out.println("@@@@@2: retString:"+errorString);
......@@ -6295,9 +6374,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
sql="select line_no,ref_ser,ref_no,ref_bal_amt,adj_amt,mrp_value__adj "+
" from drcr_rcpinv where tran_id= ? ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, tranIdAs);
rs=pstmt.executeQuery();
pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1, tranIdAs);
rs=pstmt1.executeQuery();
while(rs.next())
{
lineNo=rs.getInt("line_no");
......@@ -6307,7 +6386,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
adjAmt=rs.getDouble("adj_amt");
mrpValueAdj=rs.getDouble("mrp_value__adj");
/*
sql="insert into drcr_rcpinv (tran_id, line_no,ref_ser,ref_no,ref_bal_amt,adj_amt,mrp_value__adj) "+
" Values (?,?,?,?,?,?,?) ";
......@@ -6325,8 +6404,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
pstmt.close();
pstmt = null;
}*/
xmlBuff.append("<Detail3 dbID=\"\" domID=\""+lineNo+"\" objContext=\"3\" objName=\"drcrrcp_cr\">");
}
/* xmlBuff.append("<Detail3 dbID=\"\" domID=\""+lineNo+"\" objContext=\"3\" objName=\"drcrrcp_cr\">");
xmlBuff.append("<attribute pkNames=\"\" selected=\"N\" status=\"N\" updateFlag=\"A\"/>");
// xmlBuff.append("<tran_id><![CDATA["+ tranIdNew +"]]></tran_id>");
xmlBuff.append("<line_no><![CDATA["+ lineNo +"]]></line_no>");
......@@ -6335,7 +6414,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
xmlBuff.append("<ref_bal_amt><![CDATA["+ refBalAmt +"]]></ref_bal_amt>");
xmlBuff.append("<adj_amt><![CDATA["+ adjAmt +"]]></adj_amt>");
xmlBuff.append("<mrp_val__adj><![CDATA["+ mrpValueAdj +"]]></mrp_val__adj>");
xmlBuff.append("</Detail3>");
xmlBuff.append("</Detail3>");*/
/*sql="update drcr_rcp " +
......@@ -6359,18 +6438,18 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
// errString = saveData(xtraParams,siteCodeAs,xmlString,conn);
*/
}
pstmt.close();
pstmt=null;
pstmt1.close();
pstmt1=null;
rs.close();
rs=null;
xmlBuff.append("</Header0>");
/*xmlBuff.append("</Header0>");
xmlBuff.append("</group0>");
xmlBuff.append("</DocumentRoot>");
errString = saveData(xtraParams,siteCodeAs,xmlBuff.toString(),conn);
*/
//errString = saveData(xtraParams,siteCodeAs,xmlBuff.toString(),conn);
//System.out.println("@@@@@2: retString:"+errorString);
//System.out.println("--retString finished--");
if (errString.indexOf("Success") > -1)
/*if (errString.indexOf("Success") > -1)
{
System.out.println("@@@@@@3: Success"+errString);
Document dom = genericUtility.parseString(errString);
......@@ -6382,7 +6461,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
//System.out.println("[SuccessSuccess" + errorString + "]");
conn.rollback();
return errString;
}
} */
//errString = nvo_misc.gbf_retrieve_misc_drcr_rcp(ls_tran_id_new, ls_tran_id_new,1,siteCodeAs);
DrCrRcpConf drcrObj = new DrCrRcpConf();
errString = drcrObj.confirm (tranIdNew, xtraParams, "" , conn);
......@@ -6392,7 +6471,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
errString = "";
}
if(errString.trim().length()==0)
/*if(errString.trim().length()==0)
{
sql=" update sreturn "+
" set tran_id__crn = ? "+
......@@ -6403,7 +6482,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.executeUpdate();
pstmt.close();
pstmt=null;
}
}*/
}
catch(Exception e)
......@@ -6469,7 +6548,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
String currDateStr = sdfAppl.format(currDate);
chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId");
//chgDate= new java.sql.Timestamp(System.currentTimeMillis()) ;
chgDate = new java.sql.Timestamp(new java.util.Date().getTime());
sql="select 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, "+
......@@ -6534,12 +6614,18 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
transer = "MDRCRD";
tranwin = "W_MISC_DRCR_RCP_DR";
window = "T_MISC_DRCR_RCP_DRHO";
//ls_auto_tran_id = generateTranId("w_misc_drcr_rcp_cr",as_site_code,ls_drcr_flag,currDateStr,conn);
tranIdNew = generateTranId("w_misc_drcr_rcp_cr",siteCode,drcrFlag,currDateStr,conn);
}
else if ("C".equalsIgnoreCase(drcrFlag))
{
transer = "MDRCRC";
tranwin = "W_MISC_DRCR_RCP_CR";
window = "T_MISC_DRCR_RCP_CRHO";
//ls_auto_tran_id = generateTranId("w_misc_drcr_rcp_cr",as_site_code,ls_drcr_flag,currDateStr,conn);
tranIdNew = generateTranId("w_misc_drcr_rcp_cr",siteCode,drcrFlag,currDateStr,conn);
}
sql="select key_string from transetup where upper(tran_window) = ? " ;
......@@ -6614,6 +6700,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
ls_errcode = gf_error_location(ls_errcode)
end if*/
System.out.println("tranid manish"+tranIdNew);
sql="select count(*) from site_customer where site_code__ch = ? and site_code = ? and channel_partner = 'Y' ";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1, siteCodeAs);
......@@ -6702,58 +6790,59 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt.close();
pstmt = null;
/* sql = " insert into MISC_DRCR_RCP (tran_id,tran_ser,tran_date,eff_date,fin_entity,site_code,sundry_type,sundry_code,acct_code," +
//MISC_DRCR_RCP
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,tran_id__rcv,confirmed,chg_user,chg_date,chg_term," +
" emp_code__aprv,due_date,tran_type,item_ser,amount__bc,sreturn_no,adj_misc_crn,adj_amount,parent__tran_id,rev__tran," +
" round_adj,cust_ref_no,cust_ref_date,cust_ref_amt,rnd_off,rnd_to,ref_no__cr,wf_status,cust_code__dlv,cust_pord,pord_date," +
" edi_stat,sale_order,add_date,add_user,add_term) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,) ";
*/
/* pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tran_id);
pstmt.setString(2,tran_ser);
pstmt.setTimestamp(3,tran_date);
pstmt.setTimestamp(4,eff_date);
pstmt.setString(5,fin_entity);
pstmt = conn.prepareStatement(sql);
//pstmt.setString(1,tranId);
pstmt.setString(1,tranIdNew);
pstmt.setString(2,tranSer);
pstmt.setTimestamp(3,tranDate);
pstmt.setTimestamp(4,effDate);
pstmt.setString(5,finEntity);
pstmt.setString(6,siteCodeAs);
pstmt.setString(7,sundry_type);
pstmt.setString(8,sundry_code);
pstmt.setString(9,acct_code);
pstmt.setString(10,cctr_code);
pstmt.setString(7,sundryType);
pstmt.setString(8,sundryCode);
pstmt.setString(9,acctCode);
pstmt.setString(10,cctrCode);
pstmt.setDouble(11,amount);
pstmt.setString(12,curr_code);
pstmt.setDouble(13,exch_rate);
pstmt.setString(12,currCode);
pstmt.setDouble(13,exchRate);
pstmt.setString(14,remarks);
pstmt.setString(15,drcr_flag);
pstmt.setString(16,tran_id__rcv);
pstmt.setString(15,drcrFlag);
pstmt.setString(16,tranIdRcv);
pstmt.setString(17,"N");
pstmt.setString(18,chgUser);
//pstmt.setTimestamp(19,chg_date);
pstmt.setTimestamp(19,currDate);
pstmt.setString(20,chgTerm);
pstmt.setString(21,emp_code__aprv);
pstmt.setTimestamp(22,due_date);
pstmt.setString(23,tran_type);
pstmt.setString(24,item_ser);
pstmt.setDouble(25,amount__bc);
pstmt.setString(21,empCodeAprv);
pstmt.setTimestamp(22,dueDate);
pstmt.setString(23,tranType);
pstmt.setString(24,itemSer);
pstmt.setDouble(25,amountBc);
pstmt.setString(26," ");
pstmt.setString(27,adjmisccrn);
pstmt.setDouble(28,adj_amount);
pstmt.setDouble(28,adjAmount);
pstmt.setString(29,tranIdAs);
pstmt.setString(30,rev__tran);
pstmt.setString(30,revTran);
pstmt.setDouble(31,0);
pstmt.setString(32,cust_ref_no);
pstmt.setTimestamp(33,cust_ref_date);
pstmt.setDouble(34,cust_ref_amt);
pstmt.setString(35,rnd_off);
pstmt.setDouble(36,rnd_to);
pstmt.setString(37,ref_no__cr);
pstmt.setString(38,wf_status);
pstmt.setString(39,cust_code);
pstmt.setString(40,cust_pord);
pstmt.setTimestamp(41,pord_date);
pstmt.setString(42,edi_stat);
pstmt.setString(43,sale_order);
pstmt.setString(32,custRefNo);
pstmt.setTimestamp(33,custRefDate);
pstmt.setDouble(34,custRefAmt);
pstmt.setString(35,rndOff);
pstmt.setDouble(36,rndTo);
pstmt.setString(37,refNoCr);
pstmt.setString(38,wfStatus);
pstmt.setString(39,custCode);
pstmt.setString(40,custPord);
pstmt.setTimestamp(41,pordDate);
pstmt.setString(42,ediStat);
pstmt.setString(43,saleOrder);
// pstmt.setTimestamp(44,chg_date);
pstmt.setTimestamp(44,currDate);
pstmt.setString(45,chgUser);
......@@ -6764,9 +6853,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
pstmt.close();
pstmt = null;
}*/
}
xmlBuff.append("<?xml version='1.0' encoding='ISO-8859-1'?><DocumentRoot>");
/*xmlBuff.append("<?xml version='1.0' encoding='ISO-8859-1'?><DocumentRoot>");
xmlBuff.append("<description>Datawindow Root</description>");
xmlBuff.append("<group0>");
xmlBuff.append("<description>Group0 description</description>");
......@@ -6851,7 +6940,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
xmlBuff.append("<add_user>").append("<![CDATA[" + chgUser + "]]>").append("</add_user>");
xmlBuff.append("<add_term>").append("<![CDATA[" + chgTerm + "]]>").append("</add_term>");
xmlBuff.append("</Detail1>");
xmlBuff.append("\n");
xmlBuff.append("\n");*/
sql="select tran_type,tax_date from sreturn where tran_id= ? ";
......@@ -6953,36 +7042,38 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
taxEnvSr=taxEnv;
}
/* sql="insert into misc_drcr_rdet (tran_id,line_no,acct_code,cctr_code,amount,anal_code,emp_code, " +
sql="insert into misc_drcr_rdet (tran_id,line_no,acct_code,cctr_code,amount,anal_code,emp_code, " +
" reas_code,tax_amt,net_amt,tax_class,tax_chap,tax_env,ref_no,item_code,quantity, " +
" rate,line_no__sret,line_no__invtrace,lot_no,analysis1,analysis2,analysis3,lot_sl,unit) " +
" Values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";*/
" Values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
/*pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tran_id);
pstmt.setInt(2, line_no);
pstmt.setString(3, acct_code);
pstmt.setString(4, cctr_code);
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranIdNew);
pstmt.setInt(2, lineNo);
pstmt.setString(3, acctCode);
pstmt.setString(4, cctrCode);
pstmt.setDouble(5, amountdet);
pstmt.setString(6, anal_code);
pstmt.setString(7, emp_code);
pstmt.setString(8, reas_code);
pstmt.setDouble(9, tax_amt);
pstmt.setDouble(10, net_amt);
pstmt.setString(11, tax_class);
pstmt.setString(12, tax_chap);
pstmt.setString(13, tax_env_sr);
pstmt.setString(14, ref_no);
pstmt.setString(15, item_code);
pstmt.setString(6, analCode);
pstmt.setString(7, empCode);
pstmt.setString(8, reasCode);
pstmt.setDouble(9, 0);
netAmt=netAmt-taxAmt;
pstmt.setDouble(10, netAmt);
pstmt.setString(11, " ");
pstmt.setString(12, " ");
pstmt.setString(13, " ");
pstmt.setString(14, refNo);
pstmt.setString(15, itemCode);
pstmt.setDouble(16, quantity);
pstmt.setDouble(17, rate);
pstmt.setInt(18, line_no__sret);
pstmt.setInt(19, line_no__invtrace);
pstmt.setString(20, lot_no);
pstmt.setInt(18, lineNoSret);
pstmt.setNull(19,Types.INTEGER );
// pstmt.setInt(19, 0);
pstmt.setString(20, lotNo);
pstmt.setString(21, analysis1);
pstmt.setString(22, analysis2);
pstmt.setString(23, analysis3);
pstmt.setString(24, lot_sl);
pstmt.setString(24, lotSl);
pstmt.setString(25, unit);
pstmt.executeUpdate();
......@@ -6990,9 +7081,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
pstmt.close();
pstmt = null;
}*/
}
xmlBuff.append("<Detail2 dbID=\"\" domID=\""+lineNo+"\" objContext=\"2\" objName=\"misc_drcr_rcp_cr\">");
/*xmlBuff.append("<Detail2 dbID=\"\" domID=\""+lineNo+"\" objContext=\"2\" objName=\"misc_drcr_rcp_cr\">");
xmlBuff.append("<attribute pkNames=\"\" selected=\"N\" status=\"N\" updateFlag=\"A\"/>");
xmlBuff.append("<misc_drcr_rcp_dr/>");
......@@ -7005,11 +7096,11 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
xmlBuff.append("<anal_code>").append("<![CDATA[" + analCode + "]]>").append("</anal_code>");
xmlBuff.append("<emp_code>").append("<![CDATA[" + empCode + "]]>").append("</emp_code>");
xmlBuff.append("<reas_code>").append("<![CDATA[" + reasCode + "]]>").append("</reas_code>");
xmlBuff.append("<tax_amt>").append("<![CDATA[" + taxAmt + "]]>").append("</tax_amt>");
//xmlBuff.append("<tax_amt>").append("<![CDATA[" + taxAmt + "]]>").append("</tax_amt>");
xmlBuff.append("<net_amt>").append("<![CDATA[" + netAmt + "]]>").append("</net_amt>");
xmlBuff.append("<tax_class><![CDATA["+ taxClass +"]]></tax_class>");
xmlBuff.append("<tax_chap><![CDATA["+ taxChap +"]]></tax_chap>");
xmlBuff.append("<tax_env><![CDATA["+ taxEnvSr +"]]></tax_env>");
// xmlBuff.append("<tax_class><![CDATA["+ taxClass +"]]></tax_class>");
//xmlBuff.append("<tax_chap><![CDATA["+ taxChap +"]]></tax_chap>");
//xmlBuff.append("<tax_env><![CDATA["+ taxEnvSr +"]]></tax_env>");
xmlBuff.append("<ref_no><![CDATA["+ refNo +"]]></ref_no>");
xmlBuff.append("<item_code>").append("<![CDATA[" + itemCode + "]]>").append("</item_code>");
xmlBuff.append("<quantity>").append("<![CDATA[" + quantity + "]]>").append("</quantity>");
......@@ -7023,7 +7114,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
xmlBuff.append("<lot_sl>").append("<![CDATA[" + lotSl + "]]>").append("</lot_sl>");
xmlBuff.append("<unit>").append("<![CDATA[" + unit + "]]>").append("</unit>");
xmlBuff.append("</Detail2>");
xmlBuff.append("\n");
xmlBuff.append("\n");*/
/*if(taxEnvSr.trim().length()>0 && taxEnvSr!=null)
......@@ -7065,6 +7158,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
}
totNetAmt=totNetAmt+netAmt+taxAmtdet;
sql=" update misc_drcr_rdet" +
" set tax_amt = ?," +
" net_amt = (net_amt + (? - ?))" +
......@@ -7086,10 +7180,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
rs.close();
rs=null;
/*fetch c_misc_drcr_rcpdet into :ll_line_no,:ls_acct_code,:ls_cctr_code,:lc_amountdet,:ls_anal_code,:ls_emp_code,
:ls_reas_code,:lc_tax_amt,:lc_net_amt,:ls_tax_class,:ls_tax_chap,:ls_tax_env,:ls_ref_no,:ls_item_code,:lc_quantity,
:lc_rate,:ll_line_no__sret,:ll_line_no__invtrace,:ls_lot_no,:ls_analysis1,:ls_analysis2,:ls_analysis3,:ls_lot_sl,:ls_unit;*/
sql="select line_no,ref_ser,ref_no,ref_bal_amt,adj_amt,mrp_value__adj "+
" from misc_drcr_rcpinv where tran_id= ? ";
pstmt=conn.prepareStatement(sql);
......@@ -7104,7 +7197,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
adjAmtRcpinv=rs.getDouble("adj_amt");
mrpValueAdjRcpinv=rs.getDouble("mrp_value__adj");
/*
sql="insert into misc_drcr_rcpinv (tran_id, line_no,ref_ser,ref_no,ref_bal_amt,adj_amt,mrp_value__adj) "+
" Values (?,?,?,?,?,?,?) ";
......@@ -7122,15 +7215,18 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
{
pstmt.close();
pstmt = null;
}*/
xmlBuff.append("<Detail3 dbID=\"\" domID=\""+lineNoRcpinv+"\" objContext=\"3\" objName=\"misc_drcr_rcp_cr\">");
}
/*xmlBuff.append("<Detail3 dbID=\"\" domID=\""+lineNoRcpinv+"\" objContext=\"3\" objName=\"misc_drcr_rcp_cr\">");
xmlBuff.append("<line_no><![CDATA["+ lineNoRcpinv +"]]></line_no>");
xmlBuff.append("<ref_ser><![CDATA["+ refSerRcpinv +"]]></ref_ser>");
xmlBuff.append("<ref_no><![CDATA["+ refNoRcpinv +"]]></ref_no>");
xmlBuff.append("<ref_bal_amt><![CDATA["+ refBalAmtRcpinv +"]]></ref_bal_amt>");
xmlBuff.append("<adj_amt><![CDATA["+ adjAmtRcpinv +"]]></adj_amt>");
xmlBuff.append("<mrp_val__adj><![CDATA["+ mrpValueAdjRcpinv +"]]></mrp_val__adj>");
xmlBuff.append("</Detail3>");
xmlBuff.append("</Detail3>");*/
//fetch c_misc_drcr_rcpinv into :ll_line_no_rcpinv,:ls_ref_ser_rcpinv,:ls_ref_no_rcpinv,:lc_ref_bal_amt_rcpinv,:lc_adj_amt_rcpinv,:lc_mrp_value__adj_rcpinv ;
/*sql="update misc_drcr_rcp " +
......@@ -7150,9 +7246,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
pstmt=null;
rs.close();
rs=null;
xmlBuff.append("</Header0>");
/* xmlBuff.append("</Header0>");
xmlBuff.append("</group0>");
xmlBuff.append("</DocumentRoot>");
xmlBuff.append("</DocumentRoot>");*/
String xmlString = xmlBuff.toString().trim().replaceFirst("^([\\W]+)<","<");
String drNtTranId="";
// errString = saveData(xtraParams,siteCodeAs,xmlString,conn);
......
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