Skip to content

B
business-java
Commit 7ac53483 authored by pdas's avatar pdas
Browse files
Options

Request ID-D14LSUN002 

Changes for po advance voucher creation with tax


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98178 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 74a36ffe
Show whitespace changes
Inline Side-by-side
Showing with 164 additions and 37 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/CreatePoVoucherAdvance.java
View file @ 7ac53483
......@@ -87,8 +87,8 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
SimpleDateFormat sdf = null;
String tran_Date =null;
java.sql.Timestamp tranDate = null ,today = null, chgdate = null, milestonedt = null, orddate = null,sysDate=null,sysDate1=null;
PreparedStatement pstmt = null, pstmtUp = null;
ResultSet rs = null;
PreparedStatement pstmt = null, pstmtUp = null,pstmt1 = null;
ResultSet rs = null, rs1 =null;
MasterStatefulLocal masterStatefulLocal = null;
StringBuffer xmlBuff = new StringBuffer();
......@@ -301,7 +301,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
System.out.println("@@@@@@264 as_flag["+as_flag+"]");
sql = " Select porder.ord_date , porder.supp_code , (case when porcp.amount is null then 0 else porcp.amount end ),"
+ "(case when porcp.tax is null then 0 else porcp.tax end),"
+ "(case when porcp.amount is null then 0 else porcp.amount end - case when porcp.tax is null then 0 else porcp.tax end),"
+ " porder.curr_code , porder.exch_rate , porder.cr_term , porder.proj_code,"
+ "porder.site_code__bill , porder.item_ser , (case when porder.vouch_adv_amt is null then 0 else porder.vouch_adv_amt end ),"
+ "porder.tot_amt , porder.advance , porder.pord_type , porder.provi_tran_id,"
......@@ -313,7 +313,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
tranDate = rs.getTimestamp("ord_date");
supp = rs.getString("supp_code");
amount = rs.getDouble("tot_amt");
lcordamt = rs.getDouble("tax");
lcordamt = rs.getDouble(4);
curr = rs.getString("curr_code");
exch = rs.getDouble("exch_rate");
crterm = rs.getString("cr_term");
......@@ -326,6 +326,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
type = rs.getString("pord_type");
provpo = rs.getString("provi_tran_id");
poid = rs.getString("purc_order");
tax= rs.getDouble("tax");
}
rs.close();
rs = null;
......@@ -450,6 +451,11 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
advtype = "F";
}
else if (advtype == "04")
{
advtype = "T";
}
}
if (tranId == provpo)
......@@ -638,13 +644,71 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
else if (as_flag.equals("PR") || as_flag.equals("QC"))
{
System.out.println("PR or QC as as_flag");
sql = " 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,"
+ "(case when porcp.amount is null then 0 else porcp.amount end - case when porcp.tax is null then 0 else porcp.tax end) netamount,"
+ " porder.curr_code , porder.exch_rate , porder.cr_term , porder.proj_code,"
+ " 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 , porder.advance , porder.pord_type , porder.provi_tran_id,"
+ " porder.purc_order From porder , porcp Where porder.purc_order = porcp.purc_order "
+ " porder.purc_order,(case when porcp.tax is null then 0 else porcp.tax end) tax From porder , porcp Where porder.purc_order = porcp.purc_order "
+ " And porder.confirmed ='Y' And porcp.tran_id = ? ";
pstmt1=conn.prepareStatement(sql1);
pstmt1.setString(1, porcpid);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
tranDate = rs1.getTimestamp("ord_date");
System.out.println("tranDate :"+tranDate);
supp = rs1.getString("supp_code");
System.out.println("supp :"+supp);
amount = rs1.getDouble("amount");
System.out.println("amount :"+amount);
ordamt = rs1.getDouble(4);
System.out.println("ordamt :"+ordamt);
curr = rs1.getString("curr_code");
System.out.println("curr :"+curr);
exch = rs1.getDouble("exch_rate");
System.out.println("exch :"+exch);
crterm = rs1.getString("cr_term");
System.out.println("crterm :"+crterm);
proj = rs1.getString("proj_code");
System.out.println("proj :"+proj);
site = rs1.getString("site_code__bill");
System.out.println("site :"+site);
itemser = rs1.getString("item_ser");
System.out.println("itemser :"+itemser);
vouchadvamt = rs1.getDouble("vouch_adv_amt");
System.out.println("vouchadvamt :"+vouchadvamt);
totalpoamt = rs1.getDouble("tot_amt");
System.out.println("totalpoamt :"+totalpoamt);
advance = rs1.getDouble("advance");
System.out.println("advance :"+advance);
type = rs1.getString("pord_type");
System.out.println("type :"+type);
provpo = rs1.getString("provi_tran_id");
System.out.println("provpo :"+provpo);
poid = rs1.getString("purc_order");
System.out.println("poid :"+poid);
//poid=porcpid;
//ordAmt = rs.getDouble("ord_amt");
//poid = rs.getString("purc_order");
taxamt =rs1.getDouble("tax");
System.out.println("tax :"+taxamt);
}
else
{
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
errcode = itmDBAccessLocal.getErrorString("","VTPORD3","");
return errcode;
}
if( mileStoneId != null && mileStoneId.trim().length() > 0 )
{
sql = "Select porder.ord_date , porder.supp_code , porder.tot_amt,porder.ord_amt,"
......@@ -652,7 +716,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.tot_amt as amount ,porder.tot_amt, porder.advance, porder.pord_type, porder.provi_tran_id From porder"
+ " Where purc_order = ? And confirmed ='Y'";
}
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, porcpid);
rs = pstmt.executeQuery();
......@@ -663,8 +727,8 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
System.out.println("supp :"+supp);
amount = rs.getDouble("amount");
System.out.println("amount :"+amount);
//lcordamt = rs.getDouble("netamount");
//System.out.println("lcordamt :"+lcordamt);
/*ordamt = rs.getDouble(4);
System.out.println("lcordamt :"+ordamt);*/
curr = rs.getString("curr_code");
System.out.println("curr :"+curr);
exch = rs.getDouble("exch_rate");
......@@ -692,10 +756,10 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
poid=porcpid;
tranDate = rs.getTimestamp("ord_date");
System.out.println("tranDate :"+tranDate);
ordAmt = rs.getDouble("ord_amt");
//poid = rs.getString("purc_order");
......@@ -710,11 +774,31 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
errcode = itmDBAccessLocal.getErrorString("","VTPORD3","");
return errcode;
}
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs1 != null)
{
rs1.close();
rs1 = null;
}
if(pstmt1!= null)
{
pstmt1.close();
pstmt1 = null;
}
}
System.out.println("@@@@@@@@@@@@@@@@@");
......@@ -961,7 +1045,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
rs = null;
pstmt.close();
pstmt = null;
System.out.println("Advtype>>>>>>>>>>>>" + advtype );
/*generator = new TransIDGenerator(xmlBuff.toString(),userId,CommonConstants.DB_NAME);
vouchid = generator.generateTranSeqID("VOUCH", "tran_id", key, conn);*/
if (errcode.trim().length() > 0) {
......@@ -977,8 +1061,19 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
advperc = ordamt * (ad_advperc / 100);
}
/*if (advtype == "T") {
System.out.println("Ord Amt>>>>>" + ordamt );
System.out.println("ad_advperc>>>>>" + ad_advperc );
System.out.println("tax>>>>>" + tax );
advperc = (ordamt * (ad_advperc / 100)) + tax;
}
System.out.println("Advperc>>>>>>>>>>>>>>>>>>>>>>>>" + advperc);*/
netamtbase = advperc * exch;
netamt = advperc;
System.out.println("Netamt>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" + netamt);
sql = "select sum(adv_amt) amt from voucher where tran_id Between '0' and 'Z'and vouch_type = 'A' and purc_order = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
......@@ -1065,6 +1160,7 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
taxclass = checkNull(rs.getString("tax_class"));
taxchap = checkNull(rs.getString("tax_chap"));
taxenv = checkNull(rs.getString("tax_env"));
System.out.println("taxenv>>>>>>>>>>" + taxenv);
sitecodeadv = checkNull(rs.getString("site_code__adv"));
System.out.println("lineno :"+lineno);
......@@ -1138,6 +1234,13 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
{
calRelAmt=(amount * advperc)/100;
}
else if(advtype.equalsIgnoreCase("04"))
{
System.out.println("TAX>>>>>>>>>>>>"+ taxamt );
System.out.println("Advperc11111>>>>>>>>>>" + advperc);
System.out.println("ORDER amount>>>>>>>>>>" + ordamt);
calRelAmt=(ordamt * advperc)/100 + taxamt;
}
else
{
calRelAmt=advperc;
......@@ -1156,6 +1259,11 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
advtype = "F";
}
else if (advtype == "04") {
advtype = "T";
}
if (advtype == "01") {
......@@ -1169,6 +1277,12 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
advtype = "F";
}
else if (advtype == "04") {
advtype = "T";
}
generator = new TransIDGenerator(xmlBuff.toString(),userId,CommonConstants.DB_NAME);
vouchid = generator.generateTranSeqID("VOUCH", "tran_id", key, conn);
......@@ -1277,6 +1391,9 @@ CreatePoVoucherAdvanceLocal, CreatePoVoucherAdvanceRemote
xmlBuff.append("<amount><![CDATA[" + String.valueOf(calRelAmt)+ "]]></amount>");
xmlBuff.append("<emp_code><![CDATA[]]></emp_code>");
xmlBuff.append("<tax_amt><![CDATA[" + tax + "]]></tax_amt>");
xmlBuff.append("<tax_class><![CDATA["+ (taxclass == null ? "" : taxclass)+ "]]></tax_class>");
xmlBuff.append("<tax_chap><![CDATA["+ (taxchap == null ? "" : taxchap) + "]]></tax_chap>");
xmlBuff.append("<tax_env><![CDATA["+ (taxenv == null ? "" : taxenv) + "]]></tax_env>");
xmlBuff.append("<apply_tax><![CDATA["+ (applytax == null ? "" : applytax)+ "]]></apply_tax>");
xmlBuff.append("</Detail4>");
xmlBuff.append("</Header0>");
......
webitm-dis/ibase/webitm/ejb/dis/adv/PoRcpConf.java
View file @ 7ac53483
......@@ -823,20 +823,27 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal,
"");
}
}
System.out.println("RetString>>>>>>>>>>>>>>>>>>>" +retString );
if (retString == null || retString.trim().length() == 0) {
System.out.println("RetString>>>>>>>" +retString );
InvAcct invAcct = new InvAcct();
retString = invAcct.acctPoRcpt(tranId, conn);
System.out.println("RetString1>>>>>>>" +retString );
if (retString != null
&& "CREATE-VOUCHER".equals(retString.trim())) {
CreatePoRcpVoucher createVouc = new CreatePoRcpVoucher();
retString = createVouc.createPoRcpVoucher(tranId,
xtraParams, conn);
System.out.println("RetString2>>>>>>>" +retString );
} else if (retString != null && retString.trim().length() > 0) {
retString = itmDBAccessLocal.getErrorString("", retString,
"");
System.out.println("RetString3>>>>>>>" +retString );
}
}
else if(( errcode == null || errcode.trim().length() == 0 ) && (err == null || err.trim().length() == 0 ) )
else if(( errcode == null || errcode.trim().length() == 0 ) && (err == null || err.trim().length() == 0 ) &&(retString == null || retString.trim().length() == 0) )
{
System.out.println("Voucher Created1");
sql="select count(1) AS count1 from pord_pay_term where purc_order = ? and rel_agnst = '02'";
......@@ -865,6 +872,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal,
pstmtSql = null;
}
}
/*
* // not required for Taro to be done later sql =
* "SELECT SALE_ORDER FROM PORDER A, PORCP B WHERE A.PURC_ORDER = B.PURC_ORDER AND B.TRAN_ID = ? "
......
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