Skip to content

B
business-java
Commit 1bf4ef94 authored by manohar's avatar manohar
Browse files
Options

Accounting with analysis 1,2,3 made proper as was not working. The key was not... 

Accounting with analysis 1,2,3 made proper as was not working. The key was not considering the analysis codes where creating new map


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93846 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6aa3bd63
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 15 deletions
webitm-fin/ibase/webitm/ejb/fin/InvAcct.java
View file @ 1bf4ef94
...@@ -475,11 +475,11 @@ public class InvAcct ...@@ -475,11 +475,11 @@ public class InvAcct
//ls_analysis1_cr = f_get_token(ls_analysis,'~t') //ls_analysis1_cr = f_get_token(ls_analysis,'~t')
//ls_analysis2_cr = f_get_token(ls_analysis,'~t') //ls_analysis2_cr = f_get_token(ls_analysis,'~t')
//ls_analysis3_cr = f_get_token(ls_analysis,'~t') //ls_analysis3_cr = f_get_token(ls_analysis,'~t')
System.out.println("@@@@CR return analysis["+analysis+"]"); //System.out.println("@@@@CR return analysis["+analysis+"]");
//analysisStr = analysis.split("@@@@@@1 analysis::["+analysis+"]"); //analysisStr = analysis.split("@@@@@@1 analysis::["+analysis+"]");
analysisStr = analysis.split("@"); analysisStr = analysis.split("@");
int len = analysisStr.length-1; int len = analysisStr.length-1;
System.out.println("@@@cr len["+len+"]"); //System.out.println("@@@cr len["+len+"]");
if( len > -1 ) if( len > -1 )
{ {
analysis1__cr = analysisStr[0]; analysis1__cr = analysisStr[0];
...@@ -504,7 +504,7 @@ public class InvAcct ...@@ -504,7 +504,7 @@ public class InvAcct
{ {
analysis3__cr =""; analysis3__cr ="";
} }
System.out.println("@@@@@CR analysis1__cr["+analysis1__cr+"]:::analysis2__cr["+analysis2__cr+"]::::analysis3__cr["+analysis3__cr+"]"); //System.out.println("@@@@@CR analysis1__cr["+analysis1__cr+"]:::analysis2__cr["+analysis2__cr+"]::::analysis3__cr["+analysis3__cr+"]");
//ls_analysis = nvo_fin.gbf_acct_analysis_ttype(ls_item,ls_tran_ser,ls_tran_type,'DR') //ls_analysis = nvo_fin.gbf_acct_analysis_ttype(ls_item,ls_tran_ser,ls_tran_type,'DR')
//analysis = gbf_acct_analysis_type( itemCode, tranSer, tranType, "DR", conn); //analysis = gbf_acct_analysis_type( itemCode, tranSer, tranType, "DR", conn);
...@@ -552,10 +552,12 @@ public class InvAcct ...@@ -552,10 +552,12 @@ public class InvAcct
tempMap = (HashMap) poRcpMap.get("A" + acctCodeDR + cctrCodeDR + analysis1__dr + analysis2__dr + analysis3__dr ); tempMap = (HashMap) poRcpMap.get("A" + acctCodeDR + cctrCodeDR + analysis1__dr + analysis2__dr + analysis3__dr );
grAmount = Double.parseDouble(tempMap.get("amount").toString()); grAmount = Double.parseDouble(tempMap.get("amount").toString());
System.out.println("tempMap[old] ==================== ["+tempMap+"]"); System.out.println("tempMap[old] ==================== ["+tempMap+"]");
System.out.println("grAmount[old] ==================== ["+grAmount+"]"); //System.out.println("grAmount[old] ==================== ["+grAmount+"]");
System.out.println("netAmount[new] ==================== ["+netAmount+"]"); //System.out.println("netAmount[new] ==================== ["+netAmount+"]");
tempMap.put("amount", grAmount + addAmount); tempMap.put("amount", grAmount + addAmount);
System.out.println("tempMap[new] ==================== ["+tempMap+"]"); System.out.println("tempMap[new] ==================== ["+tempMap+"]");
// 07/11/13 manoharan added as this has to be updated in the porcpmap
poRcpMap.put("A" + acctCodeDR + cctrCodeDR + analysis1__dr + analysis2__dr + analysis3__dr, tempMap);
} }
else else
{ {
...@@ -571,9 +573,10 @@ public class InvAcct ...@@ -571,9 +573,10 @@ public class InvAcct
// added by cpatil on 09-03-13 end // added by cpatil on 09-03-13 end
} }
poRcpMap.put("A" + acctCodeDR + cctrCodeDR, tempMap); //poRcpMap.put("A" + acctCodeDR + cctrCodeDR, tempMap); // 07/11/13 manoharan commented and added following line
poRcpMap.put("A" + acctCodeDR + cctrCodeDR + analysis1__dr + analysis2__dr + analysis3__dr, tempMap);
} }
System.out.println("poRcpMap[" + porcpDetCnt + "] 000==================== ["+poRcpMap+"]"); //System.out.println("poRcpMap[" + porcpDetCnt + "] 000==================== ["+poRcpMap+"]");
if ("S".equals(postType)) if ("S".equals(postType))
{ {
...@@ -590,6 +593,8 @@ public class InvAcct ...@@ -590,6 +593,8 @@ public class InvAcct
grAmount = Double.parseDouble(tempMap.get("amount").toString()); grAmount = Double.parseDouble(tempMap.get("amount").toString());
tempMap.put("amount", (grAmount + stdAmount)); tempMap.put("amount", (grAmount + stdAmount));
System.out.println("tempMap[new] ==================== ["+tempMap+"]"); System.out.println("tempMap[new] ==================== ["+tempMap+"]");
// 07/11/13 manoharan added as this has to be updated in the porcpmap
poRcpMap.put("X" + acctCodeDR + cctrCodeDR + analysis1__dr + analysis2__dr + analysis3__dr, tempMap);
} }
else else
{ {
...@@ -604,7 +609,8 @@ public class InvAcct ...@@ -604,7 +609,8 @@ public class InvAcct
tempMap.put("analysis3",analysis3__dr); tempMap.put("analysis3",analysis3__dr);
// added by cpatil on 09-03-13 end // added by cpatil on 09-03-13 end
} }
poRcpMap.put("X" + acctCodeDR + cctrCodeDR, tempMap); //poRcpMap.put("X" + acctCodeDR + cctrCodeDR, tempMap); // 07/11/13 manoharan commented and added following line
poRcpMap.put("X" + acctCodeDR + cctrCodeDR + analysis1__dr + analysis2__dr + analysis3__dr, tempMap);
System.out.println("poRcpMap[" + porcpDetCnt + "] 1 ==================== ["+poRcpMap+"]"); System.out.println("poRcpMap[" + porcpDetCnt + "] 1 ==================== ["+poRcpMap+"]");
} }
} }
...@@ -623,6 +629,8 @@ public class InvAcct ...@@ -623,6 +629,8 @@ public class InvAcct
System.out.println("netAmount[new] ==================== ["+netAmount+"]"); System.out.println("netAmount[new] ==================== ["+netAmount+"]");
tempMap.put("amount", grAmount + netAmount); tempMap.put("amount", grAmount + netAmount);
System.out.println("tempMap[new] ==================== ["+tempMap+"]"); System.out.println("tempMap[new] ==================== ["+tempMap+"]");
// 07/11/13 manoharan added as this has to be updated in the porcpmap
poRcpMap.put("X" + acctCodeDR + cctrCodeDR + analysis1__dr + analysis2__dr + analysis3__dr, tempMap);
} }
else else
{ {
...@@ -637,7 +645,8 @@ public class InvAcct ...@@ -637,7 +645,8 @@ public class InvAcct
tempMap.put("analysis3",analysis3__dr); tempMap.put("analysis3",analysis3__dr);
// added by cpatil on 09-03-13 end // added by cpatil on 09-03-13 end
} }
poRcpMap.put("X" + acctCodeDR + cctrCodeDR, tempMap); //poRcpMap.put("X" + acctCodeDR + cctrCodeDR, tempMap); // 07/11/13 manoharan commented and added following line
poRcpMap.put("X" + acctCodeDR + cctrCodeDR + analysis1__dr + analysis2__dr + analysis3__dr, tempMap);
System.out.println("poRcpMap[" + porcpDetCnt + "] 2 ==================== ["+poRcpMap+"]"); System.out.println("poRcpMap[" + porcpDetCnt + "] 2 ==================== ["+poRcpMap+"]");
} }
} }
...@@ -700,8 +709,10 @@ public class InvAcct ...@@ -700,8 +709,10 @@ public class InvAcct
} }
// the tax recovery amount is subtracted from the effect going to the inventory // the tax recovery amount is subtracted from the effect going to the inventory
///amish for std acct ///amish for std acct
tempMap = (HashMap) poRcpMap.get("X" + acctCodeDR + cctrCodeDR + analysis1__dr + analysis2__dr + analysis3__dr ); // 07/11/13 manoharan added
tempMap.put("amount", grAmount - recoAmount); tempMap.put("amount", grAmount - recoAmount);
poRcpMap.put("X" + acctCodeDR + cctrCodeDR, tempMap); //poRcpMap.put("X" + acctCodeDR + cctrCodeDR, tempMap); // 07/11/13 manoharan commented and added following line
poRcpMap.put("X" + acctCodeDR + cctrCodeDR + analysis1__dr + analysis2__dr + analysis3__dr, tempMap);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// 23/03/02 consider type additional cost should be posted // 23/03/02 consider type additional cost should be posted
...@@ -713,6 +724,8 @@ public class InvAcct ...@@ -713,6 +724,8 @@ public class InvAcct
System.out.println("tempMap[old] ==================== ["+tempMap+"]"); System.out.println("tempMap[old] ==================== ["+tempMap+"]");
tempMap.put("amount", grAmount + recoAmount); tempMap.put("amount", grAmount + recoAmount);
System.out.println("tempMap[new] ==================== ["+tempMap+"]"); System.out.println("tempMap[new] ==================== ["+tempMap+"]");
// 07/11/13 manoharan added following line as the porcpmap to be replaced with the new amount
poRcpMap.put("X" + acctCodeReco + ccrtCodeReco + analysis1__dr + analysis2__dr + analysis3__dr, tempMap);
} }
else else
{ {
...@@ -727,7 +740,8 @@ public class InvAcct ...@@ -727,7 +740,8 @@ public class InvAcct
tempMap.put("analysis3",analysis3__dr); tempMap.put("analysis3",analysis3__dr);
// added by cpatil on 09-03-13 end // added by cpatil on 09-03-13 end
} }
poRcpMap.put("X" + acctCodeReco + ccrtCodeReco, tempMap); //poRcpMap.put("X" + acctCodeReco + ccrtCodeReco, tempMap); // 07/11/13 manoharan commented and added following line
poRcpMap.put("X" + acctCodeReco + ccrtCodeReco + analysis1__dr + analysis2__dr + analysis3__dr, tempMap);
System.out.println("poRcpMap[" + porcpDetCnt + "] 3 ==================== ["+poRcpMap+"]"); System.out.println("poRcpMap[" + porcpDetCnt + "] 3 ==================== ["+poRcpMap+"]");
} }
rs1.close(); rs1.close();
...@@ -818,6 +832,8 @@ public class InvAcct ...@@ -818,6 +832,8 @@ public class InvAcct
System.out.println("tempMap[old] ==================== ["+tempMap+"]"); System.out.println("tempMap[old] ==================== ["+tempMap+"]");
tempMap.put("amount", grAmount + amountNP); tempMap.put("amount", grAmount + amountNP);
System.out.println("tempMap[new] ==================== ["+tempMap+"]"); System.out.println("tempMap[new] ==================== ["+tempMap+"]");
// 07/11/13 manoharan added following line as the porcpmap to be replaced with the new amount
poRcpMap.put("X" + acctCodeNP + cctrCodeNP + analysis1__dr + analysis2__dr + analysis3__dr, tempMap);
} }
else else
{ {
...@@ -832,7 +848,8 @@ public class InvAcct ...@@ -832,7 +848,8 @@ public class InvAcct
tempMap.put("analysis3",analysis3__dr); tempMap.put("analysis3",analysis3__dr);
// added by cpatil on 09-03-13 end // added by cpatil on 09-03-13 end
} }
poRcpMap.put("X" + acctCodeNP + cctrCodeNP, tempMap); //poRcpMap.put("X" + acctCodeNP + cctrCodeNP, tempMap); // 07/11/13 manoharan commented and added following line
poRcpMap.put("X" + acctCodeNP + cctrCodeNP + analysis1__dr + analysis2__dr + analysis3__dr, tempMap);
System.out.println("poRcpMap[" + porcpDetCnt + "] 4 ==================== ["+poRcpMap+"]"); System.out.println("poRcpMap[" + porcpDetCnt + "] 4 ==================== ["+poRcpMap+"]");
} }
rs1.close(); rs1.close();
...@@ -901,12 +918,15 @@ public class InvAcct ...@@ -901,12 +918,15 @@ public class InvAcct
Map.Entry poRcpMapEntry = null; Map.Entry poRcpMapEntry = null;
Set poRcpSet = poRcpMap.entrySet(); Set poRcpSet = poRcpMap.entrySet();
Iterator itrPoRcp = poRcpSet.iterator(); Iterator itrPoRcp = poRcpSet.iterator();
int glTraceCtr = 0;
System.out.println("07/11/13 poRcpMap final ==================== ["+poRcpMap+"]");
while(itrPoRcp.hasNext()) while(itrPoRcp.hasNext())
{ {
poRcpMapEntry = (Map.Entry)itrPoRcp.next(); poRcpMapEntry = (Map.Entry)itrPoRcp.next();
mapKey = (String)poRcpMapEntry.getKey(); mapKey = (String)poRcpMapEntry.getKey();
tempMap = (HashMap)poRcpMap.get(mapKey); tempMap = (HashMap)poRcpMap.get(mapKey);
glTraceCtr++;
System.out.println("manohar 07/11/13 glTraceCtr 1 [" + glTraceCtr + "] mapKey [" + mapKey + "] poRcpMapEntry [" + poRcpMapEntry + "] tempMap [" + tempMap + "]");
// Debit Entry for Inventory / credit entry for non payable taxes // Debit Entry for Inventory / credit entry for non payable taxes
acctCodeDR = (String) tempMap.get("acct_code"); acctCodeDR = (String) tempMap.get("acct_code");
cctrCodeDR = (String) tempMap.get("cctr_code"); cctrCodeDR = (String) tempMap.get("cctr_code");
...@@ -973,8 +993,9 @@ public class InvAcct ...@@ -973,8 +993,9 @@ public class InvAcct
glTraceMap.put("ref_ser",tranSer); glTraceMap.put("ref_ser",tranSer);
glTraceMap.put("ref_id",tranId); glTraceMap.put("ref_id",tranId);
glTraceMap.put("remarks",remarks); glTraceMap.put("remarks",remarks);
System.out.println("manohar 07/11/13 glTraceCtr before gltrace update 2 [" + glTraceCtr + "]");
errString = finCommon.glTraceUpdate(glTraceMap,conn); errString = finCommon.glTraceUpdate(glTraceMap,conn);
System.out.println("manohar 07/11/13 glTraceCtr after gltrace update 2 [" + glTraceCtr + "] errString [" + errString + "]");
glTraceMap = null; glTraceMap = null;
if(errString != null && errString.trim().length() > 0 ) if(errString != null && errString.trim().length() > 0 )
{ {
...@@ -995,6 +1016,7 @@ public class InvAcct ...@@ -995,6 +1016,7 @@ public class InvAcct
} }
//////////// 07/04/02 ////////////////////////////////////// //////////// 07/04/02 //////////////////////////////////////
} }
System.out.println("manohar 07/11/13 after posting poRcpMap netAmount [" + netAmount + "] errString [" + errString + "]");
if(errString != null && errString.trim().length() > 0 ) if(errString != null && errString.trim().length() > 0 )
{ {
return errString; return errString;
...@@ -1204,6 +1226,8 @@ public class InvAcct ...@@ -1204,6 +1226,8 @@ public class InvAcct
tempMap = (HashMap) poRcpMap.get("X" + acctCodeChrg + ccrtCodeReco + analysis1__cr + analysis2__cr + analysis3__cr ); tempMap = (HashMap) poRcpMap.get("X" + acctCodeChrg + ccrtCodeReco + analysis1__cr + analysis2__cr + analysis3__cr );
grAmount = Double.parseDouble(tempMap.get("amount").toString()); grAmount = Double.parseDouble(tempMap.get("amount").toString());
tempMap.put("amount", grAmount + tempValue); tempMap.put("amount", grAmount + tempValue);
// 07/11/13 manoharan added following line as the porcpmap to be replaced with the new amount
poRcpMap.put("A" + acctCodeChrg + cctrCodeChrg + analysis1__cr + analysis2__cr + analysis3__cr, tempMap);
} }
else else
{ {
...@@ -1218,7 +1242,8 @@ public class InvAcct ...@@ -1218,7 +1242,8 @@ public class InvAcct
tempMap.put("analysis3",analysis3__cr); tempMap.put("analysis3",analysis3__cr);
// added by cpatil on 09-03-13 end // added by cpatil on 09-03-13 end
} }
poRcpMap.put("A" + acctCodeChrg + cctrCodeChrg, tempMap); //poRcpMap.put("A" + acctCodeChrg + cctrCodeChrg, tempMap); // 07/11/13 manoharan commented and added following line
poRcpMap.put("A" + acctCodeChrg + cctrCodeChrg + analysis1__cr + analysis2__cr + analysis3__cr, tempMap);
} }
} }
} }
......
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