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
Expand all Hide 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/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,7 +477,8 @@ public class InvAcct
}
poRcpMap.put("A" + acctCodeDR + cctrCodeDR, tempMap);
}
System.out.println("poRcpMap[" + porcpDetCnt + "] 000==================== ["+poRcpMap+"]");
if ("S".equals(postType))
{
// post inventory at standards
......@@ -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