Skip to content

B
business-java
Commit 3d302e1d authored by gahmad's avatar gahmad
Browse files
Options

changes made at sun for wms 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91515 ce508802-f39f-4f6c-b175-0d175dae99d5
parent abaf44e2
Show whitespace changes
Inline Side-by-side
Showing with 106 additions and 65 deletions
webitm-fin/.project 0 → 100755
View file @ 3d302e1d
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>webitm-fin</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
webitm-fin/ibase/webitm/ejb/fin/CreatePoRcpVoucher.java
View file @ 3d302e1d
......@@ -765,26 +765,26 @@ public class CreatePoRcpVoucher
sdf = new java.text.SimpleDateFormat(genericUtility.getApplDateFormat());
xmlBuff.append("<tran_date><![CDATA[" + sdf.format(today) + "]]></tran_date>");
xmlBuff.append("<tran_type><![CDATA[" + tranType + "]]></tran_type>");
xmlBuff.append("<tran_type><![CDATA[" + (tranType==null?"":tranType) + "]]></tran_type>");
if ( receiptDate != null )
{
xmlBuff.append("<eff_date><![CDATA[" + sdf.format(receiptDate) + "]]></eff_date>");
}
xmlBuff.append("<supp_code><![CDATA[" + suppCodePay + "]]></supp_code>");
xmlBuff.append("<bill_no><![CDATA[" + invoiceNo + "]]></bill_no>");
xmlBuff.append("<supp_code><![CDATA[" + (suppCodePay==null?"":suppCodePay) + "]]></supp_code>");
xmlBuff.append("<bill_no><![CDATA[" + (invoiceNo==null?"":invoiceNo) + "]]></bill_no>");
if ( invoiceDate != null )
{
xmlBuff.append("<bill_date><![CDATA[" + sdf.format(invoiceDate) + "]]></bill_date>");
}
xmlBuff.append("<purc_order><![CDATA[" + purcOrder + "]]></purc_order>");
xmlBuff.append("<curr_code><![CDATA[" + currCode + "]]></curr_code>");
xmlBuff.append("<purc_order><![CDATA[" + (purcOrder==null?"":purcOrder) + "]]></purc_order>");
xmlBuff.append("<curr_code><![CDATA[" + (currCode==null?"":currCode) + "]]></curr_code>");
xmlBuff.append("<exch_rate><![CDATA[" + exchRate + "]]></exch_rate>");
xmlBuff.append("<acct_code><![CDATA[" + acctCodeAP + "]]></acct_code>");
xmlBuff.append("<cctr_code><![CDATA[" + ccrtCodeAP + "]]></cctr_code>");
xmlBuff.append("<bank_code><![CDATA[" + bankCode + "]]></bank_code>");
xmlBuff.append("<acct_code><![CDATA[" + (acctCodeAP==null?"":acctCodeAP) + "]]></acct_code>");
xmlBuff.append("<cctr_code><![CDATA[" + (ccrtCodeAP==null?"":ccrtCodeAP) + "]]></cctr_code>");
xmlBuff.append("<bank_code><![CDATA[" + (bankCode==null?"":bankCode) + "]]></bank_code>");
xmlBuff.append("<auto_pay><![CDATA[" + "Y" + "]]></auto_pay>");
xmlBuff.append("<adv_amt><![CDATA[0]]></adv_amt>");
xmlBuff.append("<cr_term><![CDATA[" + crTerm + "]]></cr_term>");
xmlBuff.append("<cr_term><![CDATA[" + (crTerm==null?"":crTerm) + "]]></cr_term>");
if ( dueDate != null )
{
xmlBuff.append("<due_date><![CDATA[" + sdf.format(dueDate) + "]]></due_date>");
......@@ -796,17 +796,17 @@ public class CreatePoRcpVoucher
xmlBuff.append("<tax_date><![CDATA[" + sdf.format(taxDate) + "]]></tax_date>");
}
xmlBuff.append("<vouch_type><![CDATA[P]]></vouch_type>");
xmlBuff.append("<anal_code><![CDATA[" + analCode + "]]></anal_code>");
xmlBuff.append("<proj_code><![CDATA[" + projCode + "]]></proj_code>");
xmlBuff.append("<anal_code><![CDATA[" + (analCode==null?"":analCode) + "]]></anal_code>");
xmlBuff.append("<proj_code><![CDATA[" + (projCode==null?"":projCode) + "]]></proj_code>");
xmlBuff.append("<confirmed><![CDATA[N]]></confirmed>");
xmlBuff.append("<pay_mode><![CDATA[" + payMode + "]]></pay_mode>");
xmlBuff.append("<rnd_off><![CDATA[" + roundOff + "]]></rnd_off>");
xmlBuff.append("<pay_mode><![CDATA[" + (payMode==null?"":payMode) + "]]></pay_mode>");
xmlBuff.append("<rnd_off><![CDATA[" + (roundOff==null?"":roundOff) + "]]></rnd_off>");
xmlBuff.append("<rnd_to><![CDATA[" + roundTo + "]]></rnd_to>");
xmlBuff.append("<tran_mode><![CDATA[A]]></tran_mode>");
xmlBuff.append("<acct_code__cf><![CDATA[" + acctCodeCFAP + "]]></acct_code__cf>");
xmlBuff.append("<cctr_code__cf><![CDATA[" + cctrCodeCFAP + "]]></cctr_code__cf>");
xmlBuff.append("<acct_code__cf><![CDATA[" + (acctCodeCFAP==null?"":acctCodeCFAP) + "]]></acct_code__cf>");
xmlBuff.append("<cctr_code__cf><![CDATA[" + (cctrCodeCFAP==null?"":cctrCodeCFAP) + "]]></cctr_code__cf>");
xmlBuff.append("<tran_id__rcp><![CDATA[" + tranId + "]]></tran_id__rcp>");
xmlBuff.append("<bank_code__pay><![CDATA[" + bankCodePay + "]]></bank_code__pay>");
xmlBuff.append("<bank_code__pay><![CDATA[" + (bankCodePay==null?"":bankCodePay) + "]]></bank_code__pay>");
xmlBuff.append("<bill_amt><![CDATA[" + amount + "]]></bill_amt>");
xmlBuff.append("<tax_amt><![CDATA[" + taxAmt + "]]></tax_amt>");
......@@ -816,8 +816,8 @@ public class CreatePoRcpVoucher
xmlBuff.append("<diff_amt__exch><![CDATA[0]]></diff_amt__exch>");
xmlBuff.append("<supp_bill_amt><![CDATA[" + suppBillAmount + "]]></supp_bill_amt>");
xmlBuff.append("<chg_user><![CDATA[" + userId + "]]></chg_user>");
xmlBuff.append("<chg_term><![CDATA[" + termId + "]]></chg_term>");
xmlBuff.append("<chg_user><![CDATA[" + (userId==null?"BASE":userId) + "]]></chg_user>");
xmlBuff.append("<chg_term><![CDATA[" + (termId==null?"BASE":termId) + "]]></chg_term>");
sdf = new java.text.SimpleDateFormat(genericUtility.getApplDateTimeFormat());
xmlBuff.append("<chg_date><![CDATA[" + sdf.format(today) + "]]></chg_date>");
......@@ -1173,21 +1173,21 @@ public class CreatePoRcpVoucher
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[" + tranId + "]]></prcp_id>");
xmlBuff.append("<line_no__rcp><![CDATA[" + rcpLine + "]]></line_no__rcp>");
xmlBuff.append("<item_code><![CDATA[" + rcpItemCode + "]]></item_code>");
xmlBuff.append("<unit><![CDATA[" + rcpUnit + "]]></unit>");
xmlBuff.append("<prcp_id><![CDATA[" + (tranId==null?"":tranId) + "]]></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[" + vouchQuantity + "]]></vouch_qty>");
xmlBuff.append("<rcp_rate><![CDATA[" + rcpRate + "]]></rcp_rate>");
xmlBuff.append("<vouch_rate><![CDATA[" + rcpRate + "]]></vouch_rate>");
xmlBuff.append("<purc_order><![CDATA[" + purcOrderDet + "]]></purc_order>");
xmlBuff.append("<line_no__pord><![CDATA[" + lineNoOrd + "]]></line_no__pord>");
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[" + vouchAmount + "]]></vouch_amt>");
xmlBuff.append("<rcp_amt><![CDATA[" + rcpAmount + "]]></rcp_amt>");
xmlBuff.append("<tax_class><![CDATA[" + taxClass + "]]></tax_class>");
xmlBuff.append("<tax_chap><![CDATA[" + taxChap + "]]></tax_chap>");
xmlBuff.append("<tax_env><![CDATA[" + taxEnv + "]]></tax_env>");
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>");
......@@ -1195,20 +1195,20 @@ public class CreatePoRcpVoucher
xmlBuff.append("<post_diff><![CDATA[I]]></post_diff>");
sdf = new java.text.SimpleDateFormat(genericUtility.getDBDateTimeFormat());
xmlBuff.append("<chg_date><![CDATA[" + sdf.format(today) + "]]></chg_date>");
xmlBuff.append("<chg_user><![CDATA[" + userId + "]]></chg_user>");
xmlBuff.append("<chg_term><![CDATA[" + termId + "]]></chg_term>");
xmlBuff.append("<item_ser><![CDATA[" + itemSer + "]]></item_ser>");
xmlBuff.append("<chg_user><![CDATA[" + (userId==null?"":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 + "]]></acct_code>");
xmlBuff.append("<cctr_code><![CDATA[" + ccrtCodePH + "]]></cctr_code>");
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 + "]]></dept_code>");
xmlBuff.append("<anal_code><![CDATA[" + analCode + "]]></anal_code>");
xmlBuff.append("<proj_code><![CDATA[" + projCode + "]]></proj_code>");
xmlBuff.append("<acct_code__diff><![CDATA[" + (acctCodePPV==null?"":acctCodePPV) + "]]></acct_code__diff>");
xmlBuff.append("<cctr_code__diff><![CDATA[" + (cctrCodePPV==null?"":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==null?"":projCode) + "]]></proj_code>");
xmlBuff.append("</Detail3>");
}
......@@ -1487,40 +1487,40 @@ public class CreatePoRcpVoucher
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 + "]]></prcp_id>");
xmlBuff.append("<line_no__rcp><![CDATA[" + rcpLine + "]]></line_no__rcp>");
xmlBuff.append("<item_code><![CDATA[" + rcpItemCode + "]]></item_code>");
xmlBuff.append("<unit><![CDATA[" + rcpUnit + "]]></unit>");
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[" + vouchQuantity + "]]></vouch_qty>");
xmlBuff.append("<rcp_rate><![CDATA[" + rcpRate + "]]></rcp_rate>");
xmlBuff.append("<vouch_rate><![CDATA[" + rcpRate + "]]></vouch_rate>");
xmlBuff.append("<purc_order><![CDATA[" + purcOrderDet + "]]></purc_order>");
xmlBuff.append("<line_no__pord><![CDATA[" + lineNoOrd + "]]></line_no__pord>");
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[" + vouchAmount + "]]></vouch_amt>");
xmlBuff.append("<rcp_amt><![CDATA[" + rcpAmount + "]]></rcp_amt>");
xmlBuff.append("<tax_class><![CDATA[" + taxClass + "]]></tax_class>");
xmlBuff.append("<tax_chap><![CDATA[" + taxChap + "]]></tax_chap>");
xmlBuff.append("<tax_env><![CDATA[" + taxEnv + "]]></tax_env>");
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 + "]]></chg_user>");
xmlBuff.append("<chg_term><![CDATA[" + termId + "]]></chg_term>");
xmlBuff.append("<item_ser><![CDATA[" + itemSer + "]]></item_ser>");
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 + "]]></acct_code>");
xmlBuff.append("<cctr_code><![CDATA[" + ccrtCodePH + "]]></cctr_code>");
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 + "]]></dept_code>");
xmlBuff.append("<anal_code><![CDATA[" + analCode + "]]></anal_code>");
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>");
......@@ -1530,6 +1530,10 @@ public class CreatePoRcpVoucher
pstmt.close();
pstmt = null;
} // P-RCP
xmlBuff.append("</Header0>");
xmlBuff.append("</group0>");
xmlBuff.append("</DocumentRoot>");
System.out.println("xmlBuff.toString() ["+xmlBuff.toString() + "]");
if (errString != null && errString.trim().length() > 0)
{
return errString;
......
webitm-fin/ibase/webitm/ejb/fin/InvAcct.java
View file @ 3d302e1d
......@@ -117,13 +117,14 @@ public class InvAcct
rs = null;
pstmt.close();
pstmt = null;
sql = "SELECT A.CURR_CODE FROM FINENT A, SITE B WHERE B.FIN_ENTITY = A.FIN_ENTITY AND B.SITE_CODE = ?";
sql = "SELECT A.CURR_CODE AS CURR_CODE FROM FINENT A, SITE B WHERE B.FIN_ENTITY = A.FIN_ENTITY AND B.SITE_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
rs = pstmt.executeQuery();
System.out.println("siteCode...>>>>>>>>>>>>>>>>>>>>>>::"+siteCode);
if(rs.next())
{
currCodeBase = rs.getString("CURR_CODE");
currCodeBase = rs.getString(1);
}
rs.close();
rs = null;
......@@ -311,8 +312,11 @@ public class InvAcct
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
int porcpDetCnt = 0;
while (rs.next())
{
porcpDetCnt++;
System.out.println("porcpDetCnt = ["+porcpDetCnt+"]");
// In below fetch ls_adr_prov,ls_acr_prov,ls_cdr_prov,ls_ccr_prov-Added by fatema - 03/04/2007-DI7SUN0018
itemCode = rs.getString("item_code");
lineNo = rs.getString("line_no");
......@@ -384,6 +388,7 @@ public class InvAcct
// Loop to process the Accounting Effect
// 28/03/02 mamoharan based on old object
amountCR = amountCR + netAmount;
System.out.println("amountCR = ["+amountCR+"]");
// Added by fatema - 03/04/2007 - DI7SUN0018
if (postProv != null && "Y".equals(postProv))
......@@ -426,7 +431,7 @@ public class InvAcct
{
cctrCodeDR = " ";
}
System.out.println("postType ==================== ["+postType+"]");
if ("S".equals(postType))
{
/// amish 05-10-04 // if post type is s then transaction to be post in base currency
......@@ -449,14 +454,18 @@ public class InvAcct
}
}
System.out.println("addAmount ==================== ["+addAmount+"]");
if (addAmount != 0)
{
if (poRcpMap.containsKey("A" + acctCodeDR + cctrCodeDR ))
{
tempMap = (HashMap) poRcpMap.get("A" + acctCodeDR + cctrCodeDR);
grAmount = Double.parseDouble(tempMap.get("amount").toString());
System.out.println("tempMap[old] ==================== ["+tempMap+"]");
System.out.println("grAmount[old] ==================== ["+grAmount+"]");
System.out.println("netAmount[new] ==================== ["+netAmount+"]");
tempMap.put("amount", grAmount + addAmount);
System.out.println("tempMap[new] ==================== ["+tempMap+"]");
}
else
{
......@@ -468,6 +477,7 @@ public class InvAcct
}
poRcpMap.put("A" + acctCodeDR + cctrCodeDR, tempMap);
}
System.out.println("poRcpMap[" + porcpDetCnt + "] 000==================== ["+poRcpMap+"]");
if ("S".equals(postType))
{
......@@ -480,8 +490,10 @@ public class InvAcct
if (poRcpMap.containsKey("X" + acctCodeDR + cctrCodeDR ))
{
tempMap = (HashMap) poRcpMap.get("X" + acctCodeDR + cctrCodeDR);
System.out.println("tempMap[old] ==================== ["+tempMap+"]");
grAmount = Double.parseDouble(tempMap.get("amount").toString());
tempMap.put("amount", grAmount + stdAmount);
tempMap.put("amount", (grAmount + stdAmount));
System.out.println("tempMap[new] ==================== ["+tempMap+"]");
}
else
{
......@@ -491,19 +503,25 @@ public class InvAcct
tempMap.put("cctr_code", cctrCodeDR);
tempMap.put("amount", stdAmount);
}
poRcpMap.put("A" + acctCodeDR + cctrCodeDR, tempMap);
poRcpMap.put("X" + acctCodeDR + cctrCodeDR, tempMap);
System.out.println("poRcpMap[" + porcpDetCnt + "] 1 ==================== ["+poRcpMap+"]");
}
}
else
{
System.out.println("netAmount ==================== ["+netAmount+"]");
if (netAmount != 0)
{
if (poRcpMap.containsKey("X" + acctCodeDR + cctrCodeDR ))
System.out.println("poRcpMap.containsKey(X + acctCodeDR + cctrCodeDR ) ==================== ["+(poRcpMap.containsKey("X" + acctCodeDR + cctrCodeDR ))+"]");
if ( poRcpMap.containsKey("X" + acctCodeDR + cctrCodeDR ) )
{
tempMap = (HashMap) poRcpMap.get("X" + acctCodeDR + cctrCodeDR);
grAmount = Double.parseDouble(tempMap.get("amount").toString());
System.out.println("tempMap[old] ==================== ["+tempMap+"]");
System.out.println("grAmount[old] ==================== ["+grAmount+"]");
System.out.println("netAmount[new] ==================== ["+netAmount+"]");
tempMap.put("amount", grAmount + netAmount);
System.out.println("tempMap[new] ==================== ["+tempMap+"]");
}
else
{
......@@ -513,10 +531,11 @@ public class InvAcct
tempMap.put("cctr_code", cctrCodeDR);
tempMap.put("amount", netAmount);
}
poRcpMap.put("A" + acctCodeDR + cctrCodeDR, tempMap);
poRcpMap.put("X" + acctCodeDR + cctrCodeDR, tempMap);
System.out.println("poRcpMap[" + porcpDetCnt + "] 2 ==================== ["+poRcpMap+"]");
}
}
System.out.println("postType ==================== ["+postType+"]");
if ("A".equals(postType))
{
......@@ -576,7 +595,7 @@ public class InvAcct
// the tax recovery amount is subtracted from the effect going to the inventory
///amish for std acct
tempMap.put("amount", grAmount - recoAmount);
poRcpMap.put("A" + acctCodeDR + cctrCodeDR, tempMap);
poRcpMap.put("X" + acctCodeDR + cctrCodeDR, tempMap);
////////////////////////////////////////////////////////////
// 23/03/02 consider type additional cost should be posted
......@@ -585,7 +604,9 @@ public class InvAcct
{
tempMap = (HashMap) poRcpMap.get("X" + acctCodeReco + ccrtCodeReco);
grAmount = Double.parseDouble(tempMap.get("amount").toString());
System.out.println("tempMap[old] ==================== ["+tempMap+"]");
tempMap.put("amount", grAmount + recoAmount);
System.out.println("tempMap[new] ==================== ["+tempMap+"]");
}
else
{
......@@ -596,6 +617,7 @@ public class InvAcct
tempMap.put("amount", recoAmount);
}
poRcpMap.put("X" + acctCodeReco + ccrtCodeReco, tempMap);
System.out.println("poRcpMap[" + porcpDetCnt + "] 3 ==================== ["+poRcpMap+"]");
}
rs1.close();
rs1 = null;
......@@ -682,7 +704,9 @@ public class InvAcct
{
tempMap = (HashMap) poRcpMap.get("X" + acctCodeReco + ccrtCodeReco);
grAmount = Double.parseDouble(tempMap.get("amount").toString());
System.out.println("tempMap[old] ==================== ["+tempMap+"]");
tempMap.put("amount", grAmount + amountNP);
System.out.println("tempMap[new] ==================== ["+tempMap+"]");
}
else
{
......@@ -693,12 +717,14 @@ public class InvAcct
tempMap.put("amount", amountNP);
}
poRcpMap.put("X" + acctCodeNP + cctrCodeNP, tempMap);
System.out.println("poRcpMap[" + porcpDetCnt + "] 4 ==================== ["+poRcpMap+"]");
}
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
} // post actual
System.out.println("errString ==================== ["+errString+"]");
///// this code if for posting ppv at grn
//// amish for standard accounting
......
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