Skip to content

B
business-java
Commit 42776351 authored by cpatil's avatar cpatil
Browse files
Options

modify code for debit note 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98373 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d83ad9ed
Hide whitespace changes
Inline Side-by-side
Showing with 276 additions and 56 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/CreatePoVoucherAdvance.java
View file @ 42776351
...@@ -55,10 +55,14 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote ...@@ -55,10 +55,14 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
} }
public String createPoVoucher(String tranId, String xtraParams,Connection conn, String as_flag, int ad_advperc, Date day, String mileStoneId,String relAgnstTerm,String lineNoTerm)throws ITMException public String createPoVoucher(String tranId, String xtraParams,Connection conn, String as_flag, int ad_advperc, Date day, String mileStoneId,String relAgnstTerm,String lineNoTerm)throws ITMException
{
return createPoVoucher(tranId, xtraParams, conn, as_flag, Double.parseDouble(""+ad_advperc), day, mileStoneId, relAgnstTerm, lineNoTerm);
}
public String createPoVoucher(String tranId, String xtraParams,Connection conn, String as_flag, double ad_advperc, Date day, String mileStoneId,String relAgnstTerm,String lineNoTerm)throws ITMException
{ {
System.out.println("- createPoVoucher!! -----as_flag["+as_flag+"]mileStoneId["+mileStoneId+"]"); System.out.println("- createPoVoucher!! -----as_flag["+as_flag+"]mileStoneId["+mileStoneId+"]");
System.out.println("relAgnstTerm :"+relAgnstTerm); System.out.println("relAgnstTerm :"+relAgnstTerm);
...@@ -136,7 +140,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote ...@@ -136,7 +140,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
xmlBuff.append("<termId><![CDATA[").append(termid).append("]]></termId>"); xmlBuff.append("<termId><![CDATA[").append(termid).append("]]></termId>");
xmlBuff.append("<site_code><![CDATA[").append(loginSiteCode).append("]]></site_code>"); xmlBuff.append("<site_code><![CDATA[").append(loginSiteCode).append("]]></site_code>");
xmlBuff.append("</Detail0></Root>"); xmlBuff.append("</Detail0></Root>");
if (as_flag.equals("PR") && ( mileStoneId == null || mileStoneId.trim().length()==0)) if ( ( as_flag.equals("PR") || as_flag.equals("ML") ) && ( mileStoneId == null || mileStoneId.trim().length()==0))
{ {
sql = "select purc_order from porcp where tran_id=?"; sql = "select purc_order from porcp where tran_id=?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -296,7 +300,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote ...@@ -296,7 +300,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
//} //}
} }
//} //}
else if (as_flag.equals("PR") || as_flag.equals("QC")) else if (as_flag.equals("PR") || as_flag.equals("QC") || as_flag.equals("ML"))
{ {
System.out.println("@@@@@@264 as_flag["+as_flag+"]"); System.out.println("@@@@@@264 as_flag["+as_flag+"]");
...@@ -352,7 +356,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote ...@@ -352,7 +356,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
if (as_flag.equals("PO") || as_flag.equals("POPRO")) if (as_flag.equals("PO") || as_flag.equals("POPRO"))
{ {
code = "01"; code = "01";
} else if (as_flag.equals("PR")) } else if (as_flag.equals("PR") || as_flag.equals("ML"))
{ {
code = "02"; code = "02";
} else if (as_flag.equals("QC")) } else if (as_flag.equals("QC"))
...@@ -641,7 +645,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote ...@@ -641,7 +645,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
} }
edilink = true; edilink = true;
} }
else if (as_flag.equals("PR") || as_flag.equals("QC")) else if (as_flag.equals("PR") || as_flag.equals("QC") || as_flag.equals("ML"))
{ {
System.out.println("PR or QC as as_flag"); System.out.println("PR or QC as as_flag");
String sql1 = " Select porder.ord_date , porder.supp_code , (case when porcp.amount is null then 0 else porcp.amount end ) amount," String sql1 = " Select porder.ord_date , porder.supp_code , (case when porcp.amount is null then 0 else porcp.amount end ) amount,"
...@@ -659,7 +663,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote ...@@ -659,7 +663,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
+ "porder.site_code__bill,porder.item_ser,(case when porder.vouch_adv_amt is null then 0 else porder.vouch_adv_amt end)vouch_adv_amt, " + "porder.site_code__bill,porder.item_ser,(case when porder.vouch_adv_amt is null then 0 else porder.vouch_adv_amt end)vouch_adv_amt, "
+ "porder.tot_amt as amount ,porder.tot_amt, porder.advance, porder.pord_type, porder.provi_tran_id, " + "porder.tot_amt as amount ,porder.tot_amt, porder.advance, porder.pord_type, porder.provi_tran_id, "
+ " porder.purc_order" + " porder.purc_order"
// + ",(case when porcp.tax is null then 0 else porcp.tax end) tax " + ",(case when porder.tax_amt is null then 0 else porder.tax_amt end) tax "
+ " From porder" + " From porder"
+ " Where purc_order = ? And confirmed ='Y'"; + " Where purc_order = ? And confirmed ='Y'";
} }
...@@ -705,11 +709,11 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote ...@@ -705,11 +709,11 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
//ordAmt = rs.getDouble("ord_amt"); //ordAmt = rs.getDouble("ord_amt");
//poid = rs.getString("purc_order"); //poid = rs.getString("purc_order");
if( mileStoneId == null || mileStoneId.trim().length() == 0 ) // if( mileStoneId == null || mileStoneId.trim().length() == 0 )
{ // {
taxamt =rs1.getDouble("tax"); taxamt =rs1.getDouble("tax");
System.out.println("tax :"+taxamt); System.out.println("tax :"+taxamt);
} // }
} }
else else
...@@ -837,7 +841,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote ...@@ -837,7 +841,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
if (as_flag.equals("PO") || as_flag.equals("POPRO")) if (as_flag.equals("PO") || as_flag.equals("POPRO"))
{ {
code = "01"; code = "01";
} else if (as_flag.equals("PR")) } else if (as_flag.equals("PR") || as_flag.equals("ML") )
{ {
code = "02"; code = "02";
} else if (as_flag.equals("QC")) } else if (as_flag.equals("QC"))
...@@ -956,6 +960,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote ...@@ -956,6 +960,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
return errcode; return errcode;
} }
System.out.println("pay mode from supplier"); System.out.println("pay mode from supplier");
sql = "select pay_mode,acct_code__ap,cctr_code__ap,acct_code__ap_adv,cctr_code__ap_adv from supplier where supp_code = ?"; sql = "select pay_mode,acct_code__ap,cctr_code__ap,acct_code__ap_adv,cctr_code__ap_adv from supplier where supp_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, supp); pstmt.setString(1, supp);
...@@ -979,7 +984,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote ...@@ -979,7 +984,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
invacct = "N"; invacct = "N";
} }
/*
sql = "select ACCT_CODE__AP_ADV,CCTR_CODE__AP_ADV,acct_code__cr,cctr_code__cr from porddet where purc_order = ?"; sql = "select ACCT_CODE__AP_ADV,CCTR_CODE__AP_ADV,acct_code__cr,cctr_code__cr from porddet where purc_order = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId); pstmt.setString(1, tranId);
...@@ -995,6 +1000,11 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote ...@@ -995,6 +1000,11 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
*/
if ((acctap == null) || (invacct.trim().length() == 0)) if ((acctap == null) || (invacct.trim().length() == 0))
{ {
cctrapitem = this.finCommon.getAcctDetrTtype("", itemser,"PO", type, conn); cctrapitem = this.finCommon.getAcctDetrTtype("", itemser,"PO", type, conn);
...@@ -1034,8 +1044,33 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote ...@@ -1034,8 +1044,33 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
if (cctrap == "NULL" || cctrap.trim().length() == 0) { if (cctrap == "NULL" || cctrap.trim().length() == 0) {
cctrap = cctrapadv; cctrap = cctrapadv;
} }
//added by cpatil on 24/07/15 for account code setting
sql = "select pay_mode,acct_code__ap,cctr_code__ap,acct_code__ap_adv,cctr_code__ap_adv from supplier where supp_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, supp);
rs = pstmt.executeQuery();
if (rs.next())
{
paymode = rs.getString("pay_mode");
acctap = rs.getString("acct_code__ap");
cctrap = rs.getString("cctr_code__ap");
acctapadv = rs.getString("acct_code__ap_adv");
cctrapadv = rs.getString("cctr_code__ap_adv");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("@@@ supplier::acctap["+acctap+"]cctrap["+cctrap+"]acctapadv["+acctapadv+"]cctrapadv["+cctrapadv+"]");
if (errcode.trim().length() == 0) if (errcode.trim().length() == 0)
{ {
sql = "Select key_string from transetup where tran_window =?"; sql = "Select key_string from transetup where tran_window =?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, win); pstmt.setString(1, win);
...@@ -1239,7 +1274,30 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote ...@@ -1239,7 +1274,30 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
continue; continue;
}*/ }*/
System.out.println("@@@@advtype["+advtype+"]ordamt["+ordamt+"]advperc["+advperc+"]amount["+amount+"]"); System.out.println("@@@@advtype["+advtype+"]ordamt["+ordamt+"]advperc["+advperc+"]amount["+amount+"]");
if("ML".equalsIgnoreCase(as_flag))
{
/*String sql1 = " select amount from pur_milstn where PURC_ORDER = ? and LINE_NO__ORD= ? ";
pstmt1 = conn.prepareStatement(sql1);
pstmt1.setString(1, tranId);
pstmt1.setString(2, lineNoTerm);
rs1 = pstmt1.executeQuery();
if (rs1.next())
{
calRelAmt = rs1.getDouble("amount");
}
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;*/
calRelAmt = ad_advperc;
System.out.println("@@@@@@@@@@@pur_milstn calRelAmt["+calRelAmt+"]");
}
else
{
if(advtype.equalsIgnoreCase("01")) if(advtype.equalsIgnoreCase("01"))
{ {
calRelAmt=(ordamt * advperc)/100; // change by cpatil ordAmt to ordamt on 15/07/15 calRelAmt=(ordamt * advperc)/100; // change by cpatil ordAmt to ordamt on 15/07/15
...@@ -1259,7 +1317,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote ...@@ -1259,7 +1317,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
{ {
calRelAmt=advperc; calRelAmt=advperc;
} }
}
System.out.println("calRelAmt in voucher:"+calRelAmt); System.out.println("calRelAmt in voucher:"+calRelAmt);
...@@ -1304,6 +1362,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote ...@@ -1304,6 +1362,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
refSer="P-ADV"; refSer="P-ADV";
String[] authencate = new String[2]; String[] authencate = new String[2];
authencate[0] = ""; authencate[0] = "";
authencate[1] = ""; authencate[1] = "";
...@@ -1362,8 +1421,8 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote ...@@ -1362,8 +1421,8 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
xmlBuff.append("<paid><![CDATA[]]></paid>"); xmlBuff.append("<paid><![CDATA[]]></paid>");
//xmlBuff.append("<acct_code><![CDATA["+ (acctcodecr == null ? "" : acctcodecr)+ "]]></acct_code>"); //xmlBuff.append("<acct_code><![CDATA["+ (acctcodecr == null ? "" : acctcodecr)+ "]]></acct_code>");
//xmlBuff.append("<cctr_code><![CDATA[" + cctrcodecr+ "]]></cctr_code>"); //xmlBuff.append("<cctr_code><![CDATA[" + cctrcodecr+ "]]></cctr_code>");
xmlBuff.append("<acct_code><![CDATA["+ (acctapadv == null ? "" : acctapadv)+ "]]></acct_code>"); xmlBuff.append("<acct_code><![CDATA["+ (acctap == null ? "" : acctap)+ "]]></acct_code>");
xmlBuff.append("<cctr_code><![CDATA[" + cctrapadv+ "]]></cctr_code>"); xmlBuff.append("<cctr_code><![CDATA[" + cctrap + "]]></cctr_code>");
xmlBuff.append("<emp_code><![CDATA[]]></emp_code>"); xmlBuff.append("<emp_code><![CDATA[]]></emp_code>");
xmlBuff.append("<net_amt><![CDATA[" + String.valueOf(calRelAmt)+ "]]></net_amt>"); xmlBuff.append("<net_amt><![CDATA[" + String.valueOf(calRelAmt)+ "]]></net_amt>");
xmlBuff.append("<chg_date><![CDATA[" + sdf.format(new java.util.Date()).toString()+ "]]></chg_date>"); xmlBuff.append("<chg_date><![CDATA[" + sdf.format(new java.util.Date()).toString()+ "]]></chg_date>");
...@@ -1372,8 +1431,8 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote ...@@ -1372,8 +1431,8 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
xmlBuff.append("<chg_term><![CDATA["+ (termid == null ? "BASE" : termid)+ "]]></chg_term>"); xmlBuff.append("<chg_term><![CDATA["+ (termid == null ? "BASE" : termid)+ "]]></chg_term>");
xmlBuff.append("<net_amt__bc><![CDATA[" + String.valueOf(calRelAmt)+ "]]></net_amt__bc>"); xmlBuff.append("<net_amt__bc><![CDATA[" + String.valueOf(calRelAmt)+ "]]></net_amt__bc>");
xmlBuff.append("<diff_amt__exch><![CDATA["+ 0 +"]]></diff_amt__exch>"); xmlBuff.append("<diff_amt__exch><![CDATA["+ 0 +"]]></diff_amt__exch>");
xmlBuff.append("<cctr_code__adv><![CDATA["+ (cctrcodecr == null ? "" : cctrcodecr)+ "]]></cctr_code__adv>"); xmlBuff.append("<cctr_code__adv><![CDATA["+ (cctrapadv == null ? "" : cctrapadv)+ "]]></cctr_code__adv>");
xmlBuff.append("<acct_code__adv><![CDATA["+ (acctcodecr == null ? "" : acctcodecr)+ "]]></acct_code__adv>"); xmlBuff.append("<acct_code__adv><![CDATA["+ (acctapadv == null ? "" : acctapadv)+ "]]></acct_code__adv>");
xmlBuff.append("<supp_bill_amt><![CDATA[" + netamt+ "]]></supp_bill_amt>"); xmlBuff.append("<supp_bill_amt><![CDATA[" + netamt+ "]]></supp_bill_amt>");
xmlBuff.append("<exch_rate><![CDATA[" + exch+ "]]></exch_rate>"); xmlBuff.append("<exch_rate><![CDATA[" + exch+ "]]></exch_rate>");
xmlBuff.append("<tax_class><![CDATA["+ (taxclass == null ? "" : taxclass)+ "]]></tax_class>"); xmlBuff.append("<tax_class><![CDATA["+ (taxclass == null ? "" : taxclass)+ "]]></tax_class>");
...@@ -1396,12 +1455,13 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote ...@@ -1396,12 +1455,13 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
xmlBuff.append("<tot_amt><![CDATA[" + advperc+"]]></tot_amt>"); xmlBuff.append("<tot_amt><![CDATA[" + advperc+"]]></tot_amt>");
xmlBuff.append("<tax_amt><![CDATA[" + tax + "]]></tax_amt>"); xmlBuff.append("<tax_amt><![CDATA[" + tax + "]]></tax_amt>");
xmlBuff.append("</Detail2>");*/ xmlBuff.append("</Detail2>");*/
xmlBuff.append("<Detail4 dbID=\"\" domID=\"1\" objContext=\"4\" objName=\"voucher_adv\">"); xmlBuff.append("<Detail4 dbID=\"\" domID=\"1\" objContext=\"4\" objName=\"voucher_adv\">");
xmlBuff.append("<attribute pkNames=\"\" selected=\"N\" status=\"O\" updateFlag=\"A\"/>"); xmlBuff.append("<attribute pkNames=\"\" selected=\"N\" status=\"O\" updateFlag=\"A\"/>");
xmlBuff.append("<tran_id><![CDATA["+ (vouchid == null ? "" : vouchid) + "]]></tran_id>"); xmlBuff.append("<tran_id><![CDATA["+ (vouchid == null ? "" : vouchid) + "]]></tran_id>");
xmlBuff.append("<line_no><![CDATA["+ 1 + "]]></line_no>"); xmlBuff.append("<line_no><![CDATA["+ 1 + "]]></line_no>");
xmlBuff.append("<acct_code><![CDATA["+ (acctcodecr == null ? "" : acctcodecr)+ "]]></acct_code>"); xmlBuff.append("<acct_code><![CDATA["+ (acctapadv == null ? "" : acctapadv)+ "]]></acct_code>");
xmlBuff.append("<cctr_code><![CDATA[" + cctrcodecr+ "]]></cctr_code>"); xmlBuff.append("<cctr_code><![CDATA[" + cctrapadv+ "]]></cctr_code>");
xmlBuff.append("<amount><![CDATA[" + String.valueOf(calRelAmt)+ "]]></amount>"); xmlBuff.append("<amount><![CDATA[" + String.valueOf(calRelAmt)+ "]]></amount>");
xmlBuff.append("<emp_code><![CDATA[]]></emp_code>"); xmlBuff.append("<emp_code><![CDATA[]]></emp_code>");
xmlBuff.append("<tax_amt><![CDATA[" + tax + "]]></tax_amt>"); xmlBuff.append("<tax_amt><![CDATA[" + tax + "]]></tax_amt>");
......
webitm-dis/ibase/webitm/ejb/dis/adv/POMilestoneCnf.java
View file @ 42776351
...@@ -8,6 +8,7 @@ import ibase.webitm.ejb.ITMDBAccessLocal; ...@@ -8,6 +8,7 @@ import ibase.webitm.ejb.ITMDBAccessLocal;
import ibase.webitm.ejb.MasterStatefulLocal; import ibase.webitm.ejb.MasterStatefulLocal;
import ibase.webitm.ejb.dis.POrderMilestone; import ibase.webitm.ejb.dis.POrderMilestone;
import ibase.webitm.ejb.dis.adv.CreatePoVoucherAdvance; import ibase.webitm.ejb.dis.adv.CreatePoVoucherAdvance;
import ibase.webitm.ejb.fin.FinCommon;
import ibase.webitm.ejb.sys.UtilMethods; import ibase.webitm.ejb.sys.UtilMethods;
//import ibase.webitm.utility.GenericUtility; //import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
...@@ -28,6 +29,8 @@ import org.apache.axis.client.Service; ...@@ -28,6 +29,8 @@ import org.apache.axis.client.Service;
import org.apache.axis.client.Call; import org.apache.axis.client.Call;
import org.apache.axis.encoding.XMLType; import org.apache.axis.encoding.XMLType;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import javax.naming.InitialContext; import javax.naming.InitialContext;
import javax.xml.rpc.ParameterMode; import javax.xml.rpc.ParameterMode;
...@@ -194,10 +197,10 @@ public class POMilestoneCnf ...@@ -194,10 +197,10 @@ public class POMilestoneCnf
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
long timeDiff =0; int timeDiff =0;
// sql = " select delay_days from pur_milstn_resch where tran_id = ? "; // sql = " select delay_days from pur_milstn_resch where tran_id = ? ";
sql = " select pmr.delay_days from pur_milstn_resch pmr, pur_milstn pm " + /*sql = " select pmr.delay_days from pur_milstn_resch pmr, pur_milstn pm " +
" where pmr.tran_id = ? and pmr.tran_id = pm.tran_id " + " where pmr.tran_id = ? and pmr.tran_id = pm.tran_id " +
" and pm.wf_status <> 'C' "; " and pm.wf_status <> 'C' ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -211,7 +214,7 @@ public class POMilestoneCnf ...@@ -211,7 +214,7 @@ public class POMilestoneCnf
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
*/
// xml iterate // xml iterate
Document xmlDataAllDom= null; Document xmlDataAllDom= null;
if(xmlDataAll != null && xmlDataAll.trim().length()!=0) if(xmlDataAll != null && xmlDataAll.trim().length()!=0)
...@@ -220,6 +223,9 @@ public class POMilestoneCnf ...@@ -220,6 +223,9 @@ public class POMilestoneCnf
System.out.println("xmlDataAll" + xmlDataAll); System.out.println("xmlDataAll" + xmlDataAll);
} }
timeDiff = calculateDelayDays(xmlDataAll);
amount = 0; // testing amount = 0; // testing
paymentOpt = ""; paymentOpt = "";
System.out.println("@@@@ before paymentOpt["+paymentOpt+"]amount["+amount+"]"); System.out.println("@@@@ before paymentOpt["+paymentOpt+"]amount["+amount+"]");
...@@ -274,7 +280,7 @@ public class POMilestoneCnf ...@@ -274,7 +280,7 @@ public class POMilestoneCnf
} }
CreatePoVoucherAdvance createPoVouchAdv = new CreatePoVoucherAdvance(); CreatePoVoucherAdvance createPoVouchAdv = new CreatePoVoucherAdvance();
returnStr = createPoVouchAdv.createPoVoucher(purcOrder,xtraParams,conn,"PR", 0,today ,taskCode,relAgnst,lineNoOrd); returnStr = createPoVouchAdv.createPoVoucher(purcOrder,xtraParams,conn,"ML", amount,today ,taskCode,relAgnst,lineNoOrd);
System.out.println("CreatePoVoucherAdvance returnStr["+returnStr+"]"); System.out.println("CreatePoVoucherAdvance returnStr["+returnStr+"]");
if(returnStr.indexOf("Success") > -1 ) if(returnStr.indexOf("Success") > -1 )
...@@ -522,11 +528,15 @@ public class POMilestoneCnf ...@@ -522,11 +528,15 @@ public class POMilestoneCnf
if(returnStr.indexOf("Success") > -1 || returnStr.indexOf("VTSUCC1") > -1 || returnStr.indexOf("SucAmtZero") > -1 ) if(returnStr.indexOf("Success") > -1 || returnStr.indexOf("VTSUCC1") > -1 || returnStr.indexOf("SucAmtZero") > -1 )
{ {
java.util.Date date1= new java.util.Date();
Timestamp ts_now = new Timestamp(date1.getTime());
System.out.println("ts_now["+ts_now+"]");
sql = " update pur_milstn set wf_status = 'C' ,conf_date = ? ,status_date = ? , confirmed = 'Y' where tran_id = ? "; sql = " update pur_milstn set wf_status = 'C' ,conf_date = ? ,status_date = ? , confirmed = 'Y' where tran_id = ? ";
System.out.println("sql :"+sql ); System.out.println("sql :"+sql );
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1,newsysDate); pstmt.setTimestamp(1,newsysDate);
pstmt.setTimestamp(2,newsysDate); pstmt.setTimestamp(2,ts_now);
pstmt.setString(3,tranId); pstmt.setString(3,tranId);
int cnt = pstmt.executeUpdate(); int cnt = pstmt.executeUpdate();
pstmt.close(); pstmt.close();
...@@ -540,6 +550,98 @@ public class POMilestoneCnf ...@@ -540,6 +550,98 @@ public class POMilestoneCnf
} }
private int calculateDelayDays(String xmlDataAll) throws Exception
{
UtilMethods utilmethod = new UtilMethods();
System.out.println("@@@@@@@ calculateDelayDays Due Date ******");
NodeList parentNodeList = null;
NodeList childNodeList = null;
Node parentNode = null;
Node childNode = null;
String sql = "";
int delayDays=0,count = 0,count1 = 0;
Timestamp parsedReschDate = null;
int lineNo = 0;
String complDate="";
String dueDateOrgStr = "",taskCode = "";
Document dom = null;
PreparedStatement pstmt = null,pstmt1 = null,pstmt2 = null;
ResultSet rs=null,rs2=null;
int ctr=0;
int childNodeListLength;
String childNodeName = null,sqlMax = "",tranIdPending = "";
Timestamp dueDateHeader = null,reschDate = null;
Timestamp complDateNew = null,dueDateOrg = null;
String retString = "SUCCESS";
String sqlResch ="",dateFormat = "";
System.out.println("xmlString DOM-->>["+xmlDataAll+"]");
System.out.println("recalcDueDate called................");
E12GenericUtility genericUtility = new E12GenericUtility();
dom = genericUtility.parseString(xmlDataAll);// read xmldataAll
parentNodeList = dom.getElementsByTagName("Detail1");
parentNode = parentNodeList.item(0);
childNodeList = parentNode.getChildNodes();
childNodeListLength = childNodeList.getLength();
for(ctr = 0; ctr < childNodeListLength; ctr++)
{
childNode = childNodeList.item(ctr);
childNodeName = childNode.getNodeName();
System.out.println("Child name --->> "+childNodeName);
if(childNodeName.equalsIgnoreCase("compl_date"))
{
complDate = checkNull(genericUtility.getColumnValue("compl_date",dom));
System.out.println("complDate--->["+complDate+"]");
}
if(childNodeName.equalsIgnoreCase("task_code"))
{
taskCode = checkNull(genericUtility.getColumnValue("task_code",dom));
System.out.println("taskCode--->["+taskCode+"]");
}
if(childNodeName.equalsIgnoreCase("due_date"))
{
dueDateOrgStr = checkNull(genericUtility.getColumnValue("due_date",dom));
System.out.println("dueDateOrgStr--->["+dueDateOrgStr+"]");
}
if(childNodeName.equalsIgnoreCase("date_format"))
{
dateFormat = checkNull(genericUtility.getColumnValue("date_format",dom));
System.out.println("dateFormat--->["+dateFormat+"]");
}
}
if(complDate.length() > 0)//completion date is not null
{
complDateNew = Timestamp.valueOf(genericUtility.getValidDateString(complDate, dateFormat,genericUtility.getDBDateFormat()) + " 00:00:00.0");
System.out.println("completionDate ====parsed into sql format:::::"+complDateNew);
}
if(dueDateOrgStr.length() > 0)
{
dueDateOrg = Timestamp.valueOf(genericUtility.getValidDateString(dueDateOrgStr,dateFormat,genericUtility.getDBDateFormat()) + " 00:00:00.0");
System.out.println("Due Date Original ====parsed into sql format:::==="+dueDateOrg);
}
if(dueDateOrg.before(complDateNew))//if completion date is greater than due date original
{
System.out.println("days-----"+delayDays);
delayDays = (int)utilmethod.DaysAfter(dueDateOrg, complDateNew); //(int)countDaysBetween(dueDateOrg,complDateNew);
System.out.println("delayed days-----"+delayDays);
}
return delayDays;
}
private double penalatyAmount(Document xmlDataAllDom,String purcOrder,String relAmt,double datediff,String taskCode,Connection conn ) throws SQLException private double penalatyAmount(Document xmlDataAllDom,String purcOrder,String relAmt,double datediff,String taskCode,Connection conn ) throws SQLException
{ {
System.out.println("penalatyAmount().calculation.....called...datediff :"+datediff); System.out.println("penalatyAmount().calculation.....called...datediff :"+datediff);
...@@ -740,12 +842,12 @@ public class POMilestoneCnf ...@@ -740,12 +842,12 @@ public class POMilestoneCnf
double finChrge=0.0,minAmt=0.0,maxAmt=0.0,amtDet=0.0,taxAmtDet=0.0,amount=0.0,pentlyAmt=0.0; double finChrge=0.0,minAmt=0.0,maxAmt=0.0,amtDet=0.0,taxAmtDet=0.0,amount=0.0,pentlyAmt=0.0;
double exchRate = 0.0,billAmt=0.0,taxAmt=0.0,totAmt=0.0,netAMt=0.0; double exchRate = 0.0,billAmt=0.0,taxAmt=0.0,totAmt=0.0,netAMt=0.0;
Date taxDate=null,effDate=null; Date taxDate=null,effDate=null;
HashMap<String,String> vocDetMap = new HashMap<String,String>(); // HashMap<String,String> vocDetMap = new HashMap<String,String>();
boolean flag=false; boolean flag=false;
E12GenericUtility genericUtility = new E12GenericUtility(); E12GenericUtility genericUtility = new E12GenericUtility();
String taxClass="",taxChap="",taxEnv=""; String taxClass="",taxChap="",taxEnv="";
String tranIdDet=""; String tranIdDet="",acctCodeCr="",cctrCodeCr="",acctap="",cctrap="";
try try
{ {
...@@ -920,8 +1022,25 @@ public class POMilestoneCnf ...@@ -920,8 +1022,25 @@ public class POMilestoneCnf
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println("siteCode["+siteCode+"]finEntity["+finEntity+"]"); System.out.println("siteCode["+siteCode+"]finEntity["+finEntity+"]suppCode["+suppCode+"]");
sql = "select acct_code__ap,cctr_code__ap from supplier where supp_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, suppCode);
rs = pstmt.executeQuery();
if (rs.next())
{
acctap = rs.getString("acct_code__ap");
cctrap = rs.getString("cctr_code__ap");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
sql = " select CURR_CODE,EXCH_RATE , " + sql = " select CURR_CODE,EXCH_RATE , " +
" TAX_AMT,TOT_AMT,TAX_DATE ,TAX_CLASS,TAX_CHAP,TAX_ENV ," + " TAX_AMT,TOT_AMT,TAX_DATE ,TAX_CLASS,TAX_CHAP,TAX_ENV ," +
" PROJ_CODE from porder where PURC_ORDER = ?" ; " PROJ_CODE from porder where PURC_ORDER = ?" ;
...@@ -981,8 +1100,9 @@ public class POMilestoneCnf ...@@ -981,8 +1100,9 @@ public class POMilestoneCnf
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
sql = " select acct_code__dr,cctr_code__dr from porddet where purc_order= ? ";
sql = " select acct_code__dr,cctr_code__dr,acct_code__cr,cctr_code__cr from porddet where purc_order= ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,purcOrder); pstmt.setString(1,purcOrder);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -991,18 +1111,42 @@ public class POMilestoneCnf ...@@ -991,18 +1111,42 @@ public class POMilestoneCnf
acctCodeDr = rs.getString("acct_code__dr"); acctCodeDr = rs.getString("acct_code__dr");
cctrCodeDr = rs.getString("cctr_code__dr"); cctrCodeDr = rs.getString("cctr_code__dr");
acctCodeCr = rs.getString("acct_code__cr");
cctrCodeCr = rs.getString("cctr_code__cr");
acctCodeDr=acctCodeDr==null ? "" :acctCodeDr.trim(); acctCodeDr=acctCodeDr==null ? "" :acctCodeDr.trim();
cctrCodeDr=cctrCodeDr==null ? "" :cctrCodeDr.trim(); cctrCodeDr=cctrCodeDr==null ? "" :cctrCodeDr ;
acctCodeCr=acctCodeCr==null ? "" :acctCodeCr.trim();
cctrCodeCr=cctrCodeCr==null ? "" :cctrCodeCr ;
System.out.println("acctCodeDr :"+acctCodeDr); System.out.println("acctCodeDr :"+acctCodeDr);
System.out.println("cctCodeDr :"+cctrCodeDr); System.out.println("cctCodeDr :"+cctrCodeDr);
System.out.println("acctCodeCr :"+acctCodeCr);
System.out.println("cctrCodeCr :"+cctrCodeCr);
} }
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
/* sql = " select line_no,site_code,tax_amt,tax_chap,tax_class,tax_env,acct_code__dr," + FinCommon fincommon = new FinCommon();
String delayPenaltyAcct = fincommon.getFinparams("999999", "DELAY_PENALTY_ACCT", conn);
if(delayPenaltyAcct != null && delayPenaltyAcct.trim().length()>0 && !("NULLFOUND".equalsIgnoreCase(delayPenaltyAcct)))
{
acctCodeDr = delayPenaltyAcct;
cctrCodeDr = cctrCodeCr;
}
/*
sql = " select line_no,site_code,tax_amt,tax_chap,tax_class,tax_env,acct_code__dr," +
" cctr_code__dr from porddet where PURC_ORDER= ? " ; " cctr_code__dr from porddet where PURC_ORDER= ? " ;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -1062,7 +1206,7 @@ public class POMilestoneCnf ...@@ -1062,7 +1206,7 @@ public class POMilestoneCnf
vocDetMap.put("line_no"+cnt, lineNoDet); vocDetMap.put("line_no"+cnt, lineNoDet);
vocDetMap.put("acct_code"+cnt, acctCode); vocDetMap.put("acct_code"+cnt, acctCode);
vocDetMap.put("cctr_code"+cnt, cctrCode); vocDetMap.put("cctr_code"+cnt, cctrCode);
// vocDetMap.put("amount"+cnt, String.valueOf(amtDet)); vocDetMap.put("amount"+cnt, String.valueOf(amtDet));
vocDetMap.put("tax_amt"+cnt, String.valueOf(taxAmtDet)); vocDetMap.put("tax_amt"+cnt, String.valueOf(taxAmtDet));
vocDetMap.put("exch_rate"+cnt, exchRateDet); vocDetMap.put("exch_rate"+cnt, exchRateDet);
// vocDetMap.put("analysis1"+cnt, analysisDet1); // vocDetMap.put("analysis1"+cnt, analysisDet1);
...@@ -1077,8 +1221,10 @@ public class POMilestoneCnf ...@@ -1077,8 +1221,10 @@ public class POMilestoneCnf
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null;*/ pstmt = null;
*/
/*
double penaltyAmtDummy= pentlyAmt; double penaltyAmtDummy= pentlyAmt;
sql = " select tran_id,LINE_NO,ACCT_CODE,CCTR_CODE,AMOUNT,TAX_AMT,EXCH_RATE," + sql = " select tran_id,LINE_NO,ACCT_CODE,CCTR_CODE,AMOUNT,TAX_AMT,EXCH_RATE," +
"ANALYSIS1,ANALYSIS2,ANALYSIS3," + "ANALYSIS1,ANALYSIS2,ANALYSIS3," +
...@@ -1172,7 +1318,9 @@ public class POMilestoneCnf ...@@ -1172,7 +1318,9 @@ public class POMilestoneCnf
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println("@@@@@@@@@@@@@@ vocDetMap["+vocDetMap+"]"); */
// System.out.println("@@@@@@@@@@@@@@ vocDetMap["+vocDetMap+"]");
tranSer="DRNPAY"; tranSer="DRNPAY";
...@@ -1208,8 +1356,8 @@ public class POMilestoneCnf ...@@ -1208,8 +1356,8 @@ public class POMilestoneCnf
xmlBuff.append("<tran_ser><![CDATA[" + tranSer.trim()+ "]]></tran_ser>"); xmlBuff.append("<tran_ser><![CDATA[" + tranSer.trim()+ "]]></tran_ser>");
xmlBuff.append("<fin_entity><![CDATA[" + finEntity.trim()+ "]]></fin_entity>"); xmlBuff.append("<fin_entity><![CDATA[" + finEntity.trim()+ "]]></fin_entity>");
xmlBuff.append("<supp_code><![CDATA[" + suppCode.trim()+ "]]></supp_code>"); xmlBuff.append("<supp_code><![CDATA[" + suppCode.trim()+ "]]></supp_code>");
xmlBuff.append("<acct_code><![CDATA[" + acctCode.trim()+ "]]></acct_code>"); xmlBuff.append("<acct_code><![CDATA[" + acctCodeCr.trim()+ "]]></acct_code>");
xmlBuff.append("<cctr_code><![CDATA[" + cctrCode+ "]]></cctr_code>"); xmlBuff.append("<cctr_code><![CDATA[" + cctrCodeCr+ "]]></cctr_code>");
if(effDate == null) if(effDate == null)
{ {
xmlBuff.append("<eff_date><![CDATA[" + sdf.format(currentDate).toString() + "]]></eff_date>"); xmlBuff.append("<eff_date><![CDATA[" + sdf.format(currentDate).toString() + "]]></eff_date>");
...@@ -1220,7 +1368,8 @@ public class POMilestoneCnf ...@@ -1220,7 +1368,8 @@ public class POMilestoneCnf
} }
xmlBuff.append("<vouch_ser><![CDATA[]]></vouch_ser>"); xmlBuff.append("<vouch_ser><![CDATA[]]></vouch_ser>");
xmlBuff.append("<vouch_no><![CDATA[" + checkNull(voucherId)+ "]]></vouch_no>"); // xmlBuff.append("<vouch_no><![CDATA[" + checkNull(voucherId)+ "]]></vouch_no>");
xmlBuff.append("<vouch_no><![CDATA[]]></vouch_no>");
xmlBuff.append("<amount><![CDATA[" + pentlyAmt + "]]></amount>"); xmlBuff.append("<amount><![CDATA[" + pentlyAmt + "]]></amount>");
xmlBuff.append("<curr_code><![CDATA[" + checkNull(currCode)+ "]]></curr_code>"); xmlBuff.append("<curr_code><![CDATA[" + checkNull(currCode)+ "]]></curr_code>");
xmlBuff.append("<exch_rate><![CDATA[" + exchRate+ "]]></exch_rate>"); xmlBuff.append("<exch_rate><![CDATA[" + exchRate+ "]]></exch_rate>");
...@@ -1262,8 +1411,8 @@ public class POMilestoneCnf ...@@ -1262,8 +1411,8 @@ public class POMilestoneCnf
System.out.println("end of details 1"); System.out.println("end of details 1");
for (int itemCtr = 1; itemCtr <= cnt; itemCtr++) // for (int itemCtr = 1; itemCtr <= cnt; itemCtr++)
{ // {
lineNo++; lineNo++;
System.out.println("lineNo is " + lineNo); System.out.println("lineNo is " + lineNo);
// tempMap = (HashMap)tempList.get(itemCtr); // tempMap = (HashMap)tempList.get(itemCtr);
...@@ -1274,29 +1423,40 @@ public class POMilestoneCnf ...@@ -1274,29 +1423,40 @@ public class POMilestoneCnf
xmlBuff.append("<attribute pkNames=\"\" selected=\"N\" updateFlag=\"A\" status=\"N\" />"); xmlBuff.append("<attribute pkNames=\"\" selected=\"N\" updateFlag=\"A\" status=\"N\" />");
xmlBuff.append("<tran_id/>"); xmlBuff.append("<tran_id/>");
xmlBuff.append("<line_no>" + lineNo + "</line_no>"); xmlBuff.append("<line_no>" + lineNo + "</line_no>");
xmlBuff.append("<vouch_no><![CDATA["+vocDetMap.get("tran_id" + itemCtr)+"]]></vouch_no>"); xmlBuff.append("<vouch_no><![CDATA[]]></vouch_no>");
xmlBuff.append("<line_no__vou><![CDATA[]]></line_no__vou>");
// xmlBuff.append("<vouch_no><![CDATA["+vocDetMap.get("tran_id" + itemCtr)+"]]></vouch_no>");
// xmlBuff.append("<line_no__vou><![CDATA["+vocDetMap.get("line_no" + itemCtr)+"]]></line_no__vou>");
// xmlBuff.append("<vouch_no><![CDATA["+voucherId+"]]></vouch_no>"); // xmlBuff.append("<vouch_no><![CDATA["+voucherId+"]]></vouch_no>");
// xmlBuff.append("<line_no__vou><![CDATA["+lineNo+"]]></line_no__vou>"); // xmlBuff.append("<line_no__vou><![CDATA["+lineNo+"]]></line_no__vou>");
xmlBuff.append("<line_no__vou><![CDATA["+vocDetMap.get("line_no" + itemCtr)+"]]></line_no__vou>");
xmlBuff.append("<item_code><![CDATA[]]></item_code>"); xmlBuff.append("<item_code><![CDATA[]]></item_code>");
xmlBuff.append("<tax_class><![CDATA["+vocDetMap.get("tax_class" + itemCtr)+"]]></tax_class>"); // xmlBuff.append("<tax_class><![CDATA["+vocDetMap.get("tax_class" + itemCtr)+"]]></tax_class>");
xmlBuff.append("<tax_chap><![CDATA["+vocDetMap.get("tax_chap" + itemCtr)+"]]></tax_chap>"); // xmlBuff.append("<tax_chap><![CDATA["+vocDetMap.get("tax_chap" + itemCtr)+"]]></tax_chap>");
xmlBuff.append("<tax_env><![CDATA["+vocDetMap.get("tax_env" + itemCtr)+"]]></tax_env>"); // xmlBuff.append("<tax_env><![CDATA["+vocDetMap.get("tax_env" + itemCtr)+"]]></tax_env>");
xmlBuff.append("<drcr_amt><![CDATA["+vocDetMap.get("amount" + itemCtr)+"]]></drcr_amt>"); xmlBuff.append("<tax_class><![CDATA[]]></tax_class>");
xmlBuff.append("<tax_amt><![CDATA["+vocDetMap.get("tax_amt" + itemCtr)+"]]></tax_amt>"); xmlBuff.append("<tax_chap><![CDATA[]]></tax_chap>");
xmlBuff.append("<tax_env><![CDATA[]]></tax_env>");
xmlBuff.append("<drcr_amt><![CDATA["+pentlyAmt+"]]></drcr_amt>");
// xmlBuff.append("<tax_amt><![CDATA["+vocDetMap.get("tax_amt" + itemCtr)+"]]></tax_amt>");
xmlBuff.append("<tax_amt><![CDATA[0]]></tax_amt>");
// xmlBuff.append("<net_amt><![CDATA["+vocDetMap.get("amount" + itemCtr)+"]]></net_amt>"); // xmlBuff.append("<net_amt><![CDATA["+vocDetMap.get("amount" + itemCtr)+"]]></net_amt>");
xmlBuff.append("<net_amt><![CDATA[0]]></net_amt>"); // xmlBuff.append("<net_amt><![CDATA[0]]></net_amt>");
xmlBuff.append("<net_amt><![CDATA["+pentlyAmt+"]]></net_amt>");
xmlBuff.append("<reas_code><![CDATA[]]></reas_code>"); xmlBuff.append("<reas_code><![CDATA[]]></reas_code>");
xmlBuff.append("<acct_code><![CDATA["+acctCodeDr.trim()+"]]></acct_code>"); xmlBuff.append("<acct_code><![CDATA["+acctCodeDr.trim()+"]]></acct_code>");
xmlBuff.append("<cctr_code><![CDATA["+cctrCodeDr+"]]></cctr_code>"); xmlBuff.append("<cctr_code><![CDATA["+cctrCodeDr+"]]></cctr_code>");
xmlBuff.append("<amount><![CDATA["+vocDetMap.get("amount" + itemCtr)+"]]></amount>"); // xmlBuff.append("<amount><![CDATA["+vocDetMap.get("amount" + itemCtr)+"]]></amount>");
xmlBuff.append("<analysis3><![CDATA["+vocDetMap.get("analysis3" + itemCtr)+"]]></analysis3>"); xmlBuff.append("<amount><![CDATA["+pentlyAmt+"]]></amount>");
xmlBuff.append("<analysis2><![CDATA["+vocDetMap.get("analysis2" + itemCtr)+"]]></analysis2>"); // xmlBuff.append("<analysis3><![CDATA["+vocDetMap.get("analysis3" + itemCtr)+"]]></analysis3>");
xmlBuff.append("<analysis1><![CDATA["+vocDetMap.get("analysis1" + itemCtr)+"]]></analysis1>"); // xmlBuff.append("<analysis2><![CDATA["+vocDetMap.get("analysis2" + itemCtr)+"]]></analysis2>");
// xmlBuff.append("<analysis1><![CDATA["+vocDetMap.get("analysis1" + itemCtr)+"]]></analysis1>");
xmlBuff.append("</Detail2>"); xmlBuff.append("</Detail2>");
}// end of for loop
//}// end of for loop
System.out.println("end of details 2"); System.out.println("end of details 2");
......
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