Skip to content

B
business-java
Commit 41450e16 authored by vdhoble's avatar vdhoble
Browse files
Options

NEW CHANGES 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97670 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 3fba4876
Hide whitespace changes
Inline Side-by-side
Showing with 174 additions and 48 deletions
webitm-fin/ibase/webitm/ejb/fin/CreatePoRcpVoucher.java
View file @ 41450e16
......@@ -1226,52 +1226,9 @@ public class CreatePoRcpVoucher
{
return errString;
}
//Changes by Vishakha 24-MAR-2015
String tranidRef = "";
sql = "select tran_id__ref from porcp where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
while(rs.next())
{
tranidRef = rs.getString("tran_id__ref");
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
String tranString = "",tranSerVal = "";
if ("P-RCP".equals(tranSer.trim()))
{
tranString = "and porcp.tran_id__ref = '"+tranId+"'";
tranSerVal = "P-RET";
}
if ("P-RET".equals(tranSer.trim()))
{
System.out.println("Insiding*****into P-RET");
rcpDiscAmt = -1 * rcpDiscAmt ;
rcpTaxAmount = -1 * rcpTaxAmount;
rcpNetAmount = -1 * rcpNetAmount;
vouchQuantity = -1 * vouchQuantity;
vouchAmount = -1 * vouchAmount;
taxMultiplier = -1;
rcpQtyStd = -1 * rcpQtyStd;
// 07-06-04 sign of amount to be changed
rcpAmount = -1 * rcpAmount;
System.out.println("AFTER******pRET rcpDiscAmt***"+rcpDiscAmt+" rcpTaxAmount***"+rcpTaxAmount+" rcpNetAmount***"+rcpNetAmount+ " vouchQuantity***" + " vouchAmount***"+vouchAmount+" rcpQtyStd***"+rcpQtyStd+" rcpAmount***"+rcpAmount);
tranString = " and porcp.tran_id = '"+tranidRef+"'";
tranSerVal = "P-RCP";
}
//if ("P-RCP".equals(tranSer.trim()))
//{
//Updating voucher detail for return
// select porcpdet.tran_id,line_no,porcpdet.purc_order,line_no__ord,item_code,quantity,
// unit,rate,nvl(porcpdet.discount,0),porcpdet.tax_amt,net_amt,quantity__stduom,rate__stduom,
......@@ -1293,13 +1250,13 @@ public class CreatePoRcpVoucher
+ " acct_code__prov_dr,cctr_code__prov_dr,acct_code__prov_cr,cctr_code__prov_cr "
+ " from porcp, porcpdet "
+ " where porcp.tran_id = porcpdet.tran_id "
+ tranString
+ " and porcp.tran_ser = '"+tranSerVal+"' "
+ " and tran_id__ref = ? "
+ " and porcp.tran_ser = 'P-RET' "
+ " and confirmed = 'Y' and (vouch_created = 'N' or vouch_created is null)" ;
// In below fetch-acctCodeProvDR,cctrCodeProvDR,acctCodeProvCR,cctrCodeProvCR-Added By fatema - 04/04/2007 - DI7SUN0018
pstmt = conn.prepareStatement(sql);
//pstmt.setString(1, tranId);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
while(rs.next())
{
......@@ -1577,7 +1534,176 @@ public class CreatePoRcpVoucher
rs = null;
pstmt.close();
pstmt = null;
//} // P-RCP
} // P-RCP
//**************************iF P-RET**************
if ("P-RET".equals(tranSer.trim()))
{
System.out.println("Insiding*****into P-RET");
rcpDiscAmt = -1 * rcpDiscAmt ;
rcpTaxAmount = -1 * rcpTaxAmount;
rcpNetAmount = -1 * rcpNetAmount;
vouchQuantity = -1 * vouchQuantity;
vouchAmount = -1 * vouchAmount;
taxMultiplier = -1;
rcpQtyStd = -1 * rcpQtyStd;
// 07-06-04 sign of amount to be changed
rcpAmount = -1 * rcpAmount;
System.out.println("AFTER******pRET rcpDiscAmt***"+rcpDiscAmt+" rcpTaxAmount***"+rcpTaxAmount+" rcpNetAmount***"+rcpNetAmount+ " vouchQuantity***" + " vouchAmount***"+vouchAmount+" rcpQtyStd***"+rcpQtyStd+" rcpAmount***"+rcpAmount);
String tranidRef = "";
sql = "select tran_id__ref from porcp where tran_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
while(rs.next())
{
tranidRef = rs.getString("tran_id__ref");
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
sql = "select porcpdet.tran_id,line_no,porcpdet.purc_order,line_no__ord,item_code,quantity, "
+ " unit,rate,(case when porcpdet.discount is null then 0 else porcpdet.discount end) as discount, "
+ " porcpdet.tax_amt,net_amt,quantity__stduom,rate__stduom, "
+ " acct_code__dr,cctr_code__dr,ret_opt,dept_code, acct_code__cr,cctr_code__cr, "
+ " acct_code__prov_dr,cctr_code__prov_dr,acct_code__prov_cr,cctr_code__prov_cr "
+ " from porcp, porcpdet "
+ " where porcp.tran_id = porcpdet.tran_id "
+ " and porcp.tran_id = '"+tranidRef+"' "
+ " and porcp.tran_ser = 'P-RCP' "
+ " and confirmed = 'Y' and (vouch_created = 'N' or vouch_created is null)" ;
// In below fetch-acctCodeProvDR,cctrCodeProvDR,acctCodeProvCR,cctrCodeProvCR-Added By fatema - 04/04/2007 - DI7SUN0018
pstmt = conn.prepareStatement(sql);
//pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
while(rs.next())
{
returnId = rs.getString("TRAN_ID");
rcpLine = rs.getString("LINE_NO");
purcOrderDet = rs.getString("PURC_ORDER");
lineNoOrd = rs.getString("LINE_NO__ORD");
rcpItemCode = rs.getString("ITEM_CODE");
rcpQuantity = rs.getDouble("QUANTITY");
rcpUnit = rs.getString("UNIT");
rcpRate = rs.getDouble("RATE");
rcpDiscount = rs.getDouble("DISCOUNT");
rcpTaxAmount = rs.getDouble("TAX_AMT");
rcpNetAmount = rs.getDouble("NET_AMT");
rcpQtyStd = rs.getDouble("QUANTITY__STDUOM");
rcpRateStd = rs.getDouble("RATE__STDUOM");
acctCodeDR = rs.getString("acct_code__dr");
cctrCodeDR = rs.getString("cctr_code__dr");
deptCode = rs.getString("dept_code");
acctCodeCR = rs.getString("acct_code__cr");
cctrCodeCR = rs.getString("cctr_code__cr");
acctCodeProvDR = rs.getString("acct_code__prov_dr");
cctrCodeProvDR = rs.getString("cctr_code__prov_dr");
acctCodeProvCR = rs.getString("acct_code__prov_cr");
cctrCodeProvCR = rs.getString("cctr_code__prov_cr");
if ("R".equals(retOpt))
{
continue;
}
//amish 06-08-05 if inv online then
if ("Y".equals(invOnLine))
{
// Added by fatema - 04/04/2007 - DI7SUN0018
if ("Y".equals(postProv))
{
acctCodePH = acctCodeProvCR;
ccrtCodePH = cctrCodeProvCR;
}
else // Ended by fatema - 04/04/2007 - DI7SUN0018
{
acctCodePH = acctCodeCR;
ccrtCodePH = cctrCodeCR;
} // Added by fatema - 04/04/2007 - DI7SUN0018
}
else
{
acctCodePH = acctCodeDR;
ccrtCodePH = cctrCodeDR;
}
// amit - 27/08/02
rateDiscount = getPurcRate(purcOrderDet,rcpItemCode,purcRate,purcDisc, conn);
purcRate = rateDiscount[0];
purcDisc = rateDiscount[1];
if (purcRate != -999)
{
purcRateStd = rcpRateStd * purcRate / rcpRate;
rcpRate = purcRate;
rcpRateStd = purcRateStd;
rcpDiscount = purcDisc;
}
ctr++;
xmlBuff.append("<Detail3 dbID='' domID=\"1\" objName=\"voucher\" objContext=\"2\">");
xmlBuff.append("<attribute pkNames=\"\" selected=\"N\" updateFlag=\"A\" status=\"N\" />");
xmlBuff.append("<tran_id/>");
xmlBuff.append("<line_no>"+(ctr)+"</line_no>");
xmlBuff.append("<prcp_id><![CDATA[" + (returnId==null?"":returnId) + "]]></prcp_id>");
xmlBuff.append("<line_no__rcp><![CDATA[" + (rcpLine==null?"":rcpLine) + "]]></line_no__rcp>");
xmlBuff.append("<item_code><![CDATA[" + (rcpItemCode==null?"":rcpItemCode) + "]]></item_code>");
xmlBuff.append("<unit><![CDATA[" + (rcpUnit==null?"":rcpUnit) + "]]></unit>");
xmlBuff.append("<rcp_qty><![CDATA[" + rcpQuantity + "]]></rcp_qty>");
xmlBuff.append("<vouch_qty><![CDATA[" + rcpQuantity + "]]></vouch_qty>");
xmlBuff.append("<rcp_rate><![CDATA[" + rcpRate + "]]></rcp_rate>");
xmlBuff.append("<vouch_rate><![CDATA[" + rcpRate + "]]></vouch_rate>");
xmlBuff.append("<purc_order><![CDATA[" + (purcOrderDet==null?"":purcOrderDet) + "]]></purc_order>");
xmlBuff.append("<line_no__pord><![CDATA[" + (lineNoOrd==null?"":lineNoOrd) + "]]></line_no__pord>");
xmlBuff.append("<vouch_amt><![CDATA[" + rcpAmount + "]]></vouch_amt>");
xmlBuff.append("<rcp_amt><![CDATA[" + rcpNetAmount + "]]></rcp_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("<discount><![CDATA[" + rcpDiscount + "]]></discount>");
xmlBuff.append("<disc_amt><![CDATA[" + rcpDiscAmt + "]]></disc_amt>");
xmlBuff.append("<tax_amt><![CDATA[" + rcpTaxAmount + "]]></tax_amt>");
xmlBuff.append("<net_amt><![CDATA[" + rcpNetAmount + "]]></net_amt>");
xmlBuff.append("<post_diff><![CDATA[I]]></post_diff>");
xmlBuff.append("<chg_date><![CDATA[" + chgDate + "]]></chg_date>");
xmlBuff.append("<chg_user><![CDATA[" + (userId==null?"BASE":userId) + "]]></chg_user>");
xmlBuff.append("<chg_term><![CDATA[" + (termId==null?"BASE":termId) + "]]></chg_term>");
xmlBuff.append("<item_ser><![CDATA[" + (itemSer==null?"":itemSer) + "]]></item_ser>");
xmlBuff.append("<vouch_qty__stduom><![CDATA[" + rcpQtyStd + "]]></vouch_qty__stduom>");
xmlBuff.append("<vouch_rate__stduom><![CDATA[" + rcpRateStd + "]]></vouch_rate__stduom>");
xmlBuff.append("<acct_code><![CDATA[" + (acctCodePH==null?"":acctCodePH) + "]]></acct_code>");
xmlBuff.append("<cctr_code><![CDATA[" + (ccrtCodePH==null?"":ccrtCodePH) + "]]></cctr_code>");
xmlBuff.append("<rate__clg><![CDATA[" + rateClg + "]]></rate__clg>");
xmlBuff.append("<std_rate><![CDATA[" + stdRate + "]]></std_rate>");
//xmlBuff.append("<acct_code__diff><![CDATA[" + acctCodePPV + "]]></acct_code__diff>");
//xmlBuff.append("<cctr_code__diff><![CDATA[" + cctrCodePPV + "]]></cctr_code__diff>");
xmlBuff.append("<dept_code><![CDATA[" + (deptCode==null?"":deptCode) + "]]></dept_code>");
xmlBuff.append("<anal_code><![CDATA[" + (analCode==null?"":analCode) + "]]></anal_code>");
//xmlBuff.append("<proj_code><![CDATA[" + projCode + "]]></proj_code>");
xmlBuff.append("</Detail3>");
} // return details
rs.close();
rs = null;
pstmt.close();
pstmt = null;
} // P-RET
......
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