Skip to content

B
business-java
Commit 9232c781 authored by manohar's avatar manohar
Browse files
Options

other site related changes and bug fixing for cr/dr mismatch checking 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92495 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1d7b1c36
Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 29 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/JvConfirm.java
View file @ 9232c781
...@@ -524,7 +524,9 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -524,7 +524,9 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
}// end of for loop }// end of for loop
if (jourdetList.size() > 0 ) if (jourdetList.size() > 0 )
{ {
if (errString != null && errString.indexOf("Error") != -1 ) // 08/01/13 manoharan wrong condition
//if (errString != null && errString.indexOf("Error") != -1 )
if (errString == null || errString.indexOf("Error") != -1 )
{ {
errString = Fcommon.checkGlTranDrCr("JOUR",tranId,conn); errString = Fcommon.checkGlTranDrCr("JOUR",tranId,conn);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
...@@ -965,6 +967,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -965,6 +967,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
String finEntityFr = "",acctCodeRcp = "",acctCodePay = "",autoConf="",siteCodeRev=""; String finEntityFr = "",acctCodeRcp = "",acctCodePay = "",autoConf="",siteCodeRev="";
String acctCode = "",finEntity = ""; String acctCode = "",finEntity = "";
FinCommon Fcommon = new FinCommon(); FinCommon Fcommon = new FinCommon();
// 08/01/13 manoharan net effect of total dr/cr to be posted to summary entry
double totDrAmount = 0, totCrAmount = 0, hdrAmount = 0;
try try
{ {
sdf = new SimpleDateFormat(genericUtility.getApplDateFormat()); sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
...@@ -1075,7 +1079,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1075,7 +1079,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
totDrAmount = 0;
totCrAmount = 0;
sql =" select acct_code,drcr_flag,amount,sundry_type,sundry_code,cctr_code,emp_code,anal_code,remarks,proj_code " sql =" select acct_code,drcr_flag,amount,sundry_type,sundry_code,cctr_code,emp_code,anal_code,remarks,proj_code "
+" from jourdet where site_code__jv = ? and tran_id = ? " ; +" from jourdet where site_code__jv = ? and tran_id = ? " ;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -1097,8 +1102,18 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1097,8 +1102,18 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
detProjCode = rs.getString(10); detProjCode = rs.getString(10);
/* calculating total amount*/ /* calculating total amount*/
detAmount = detAmount + amount ; // 08/01/13 manoharan dr/cr total to be calculated separately
System.out.println ("detAmount is : : : "+ detAmount); //detAmount = detAmount + amount ;
if ("D".equalsIgnoreCase (detDrcrFlag))
{
totDrAmount += amount;
}
else
{
totCrAmount += amount;
}
System.out.println ("totCrAmount ["+ totCrAmount + "] totDrAmount [" + totDrAmount + "]");
glTraceMap.put("tran_date",(journalMap.get("tran_date") == null ? "":journalMap.get("tran_date"))); glTraceMap.put("tran_date",(journalMap.get("tran_date") == null ? "":journalMap.get("tran_date")));
glTraceMap.put("eff_date",(journalMap.get("eff_date") == null ? "":journalMap.get("eff_date"))); glTraceMap.put("eff_date",(journalMap.get("eff_date") == null ? "":journalMap.get("eff_date")));
...@@ -1188,8 +1203,23 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1188,8 +1203,23 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
// 08/01/13 manoharan
if (totDrAmount >= totCrAmount) //("D".equalsIgnoreCase (detDrcrFlag))
{
detAmount = totDrAmount - totCrAmount;
detDrcrFlag = "C";
hdrAmount = totDrAmount;
}
else
{
detAmount = totCrAmount - totDrAmount;
detDrcrFlag = "D";
hdrAmount = totCrAmount;
}
System.out.println ("totCrAmount ["+ totCrAmount + "] totDrAmount [" + totDrAmount + "]");
if(cnt1 > 0 ) //if(cnt1 > 0 ) // 08/01/13 manoharan commented
if(cnt1 > 0 && detAmount != 0)
{ {
glTraceMap.put("tran_date",(journalMap.get("tran_date") == null ? "":journalMap.get("tran_date"))); glTraceMap.put("tran_date",(journalMap.get("tran_date") == null ? "":journalMap.get("tran_date")));
glTraceMap.put("eff_date",(journalMap.get("eff_date") == null ? "":journalMap.get("eff_date"))); glTraceMap.put("eff_date",(journalMap.get("eff_date") == null ? "":journalMap.get("eff_date")));
...@@ -1206,13 +1236,19 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1206,13 +1236,19 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
glTraceMap.put("exch_rate",(journalMap.get("exch_rate") == null ? "":journalMap.get("exch_rate"))); glTraceMap.put("exch_rate",(journalMap.get("exch_rate") == null ? "":journalMap.get("exch_rate")));
if("D".equalsIgnoreCase(detDrcrFlag)) if("D".equalsIgnoreCase(detDrcrFlag))
{ {
glTraceMap.put("dr_amt","0"); // 08/01/13 manoharan commented as value assigned properly above
glTraceMap.put("cr_amt",detAmount); //glTraceMap.put("dr_amt","0");
//glTraceMap.put("cr_amt",detAmount);
glTraceMap.put("dr_amt",detAmount);
glTraceMap.put("cr_amt","0");
} }
else else
{ {
glTraceMap.put("dr_amt",detAmount); // 08/01/13 manoharan commented as value assigned properly above
glTraceMap.put("cr_amt","0"); //glTraceMap.put("dr_amt",detAmount);
//glTraceMap.put("cr_amt","0");
glTraceMap.put("dr_amt","0");
glTraceMap.put("cr_amt",detAmount);
} }
glTraceMap.put("ref_type","F"); glTraceMap.put("ref_type","F");
glTraceMap.put("ref_ser","JOUR"); glTraceMap.put("ref_ser","JOUR");
...@@ -1240,7 +1276,9 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1240,7 +1276,9 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
sundryBalMap.put("cctr_code",detCctrCode); sundryBalMap.put("cctr_code",detCctrCode);
sundryBalMap.put("curr_code ",journalMap.get("curr_code")); sundryBalMap.put("curr_code ",journalMap.get("curr_code"));
sundryBalMap.put("exch_rate",journalMap.get("exch_rate")); sundryBalMap.put("exch_rate",journalMap.get("exch_rate"));
if ("D".equalsIgnoreCase(detDrcrFlag)) // 08/01/13 manoharan taken care off above
//if ("D".equalsIgnoreCase(detDrcrFlag))
if ("C".equalsIgnoreCase(detDrcrFlag))
{ {
sundryBalMap.put("dr_amt","0"); sundryBalMap.put("dr_amt","0");
sundryBalMap.put("cr_amt",detAmount); sundryBalMap.put("cr_amt",detAmount);
...@@ -1263,7 +1301,9 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1263,7 +1301,9 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
/* accounting effect for site code - end */ /* accounting effect for site code - end */
if (jourdetList.size() > 0 ) if (jourdetList.size() > 0 )
{ {
if (errString != null && errString.indexOf("Error") != -1 ) // 08/01/13 manoharan wrong condition
//if (errString != null && errString.indexOf("Error") != -1 )
if (errString == null || errString.indexOf("Error") != -1 )
{ {
errString = Fcommon.checkGlTranDrCr("JOUR",tranId,conn); errString = Fcommon.checkGlTranDrCr("JOUR",tranId,conn);
if(errString != null && errString.trim().length() > 0) if(errString != null && errString.trim().length() > 0)
...@@ -1371,8 +1411,12 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1371,8 +1411,12 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
pstmt.setString(4,FinEntitySite); pstmt.setString(4,FinEntitySite);
//changed at 12/08/11 by chandni //changed at 12/08/11 by chandni
pstmt.setString(5,siteCodeFor); pstmt.setString(5,siteCodeFor);
pstmt.setDouble(6,detAmount); // set total amount of detail. // 08/01/13 manoharan net total amount
pstmt.setDouble(7,detAmount); //pstmt.setDouble(6,detAmount); // set total amount of detail.
//pstmt.setDouble(7,detAmount);
pstmt.setDouble(6,hdrAmount); // set total amount of detail.
pstmt.setDouble(7,hdrAmount);
pstmt.setString(8,detRemarks); pstmt.setString(8,detRemarks);
pstmt.setString(9,"N"); pstmt.setString(9,"N");
pstmt.setString(10,"V"); pstmt.setString(10,"V");
...@@ -1398,8 +1442,11 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1398,8 +1442,11 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
jMap.put("ref_ser",revRefSer); jMap.put("ref_ser",revRefSer);
jMap.put("ref_no",tranId); jMap.put("ref_no",tranId);
jMap.put("reversible","N"); jMap.put("reversible","N");
jMap.put("dr_amt",detAmount); // 08/01/13 manoharan header total
jMap.put("cr_amt",detAmount); //jMap.put("dr_amt",detAmount);
//jMap.put("cr_amt",detAmount);
jMap.put("dr_amt",hdrAmount);
jMap.put("cr_amt",hdrAmount);
jMap.put("curr_code",(journalMap.get("curr_code") == null ? "":journalMap.get("curr_code"))); jMap.put("curr_code",(journalMap.get("curr_code") == null ? "":journalMap.get("curr_code")));
jMap.put("status","V"); jMap.put("status","V");
jMap.put("remarks",detRemarks); jMap.put("remarks",detRemarks);
...@@ -1428,6 +1475,9 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1428,6 +1475,9 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
System.out.println(" SQL for jourdet insert for acct effect :: "+sql); System.out.println(" SQL for jourdet insert for acct effect :: "+sql);
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
// 08/01/13 manoharan re initialize
totDrAmount = 0;
totCrAmount = 0;
sql1 =" select acct_code,drcr_flag,amount,sundry_type,sundry_code,cctr_code,emp_code,anal_code,remarks,proj_code " sql1 =" select acct_code,drcr_flag,amount,sundry_type,sundry_code,cctr_code,emp_code,anal_code,remarks,proj_code "
+" from jourdet where site_code__jv = ? and tran_id = ?" ; +" from jourdet where site_code__jv = ? and tran_id = ?" ;
...@@ -1450,7 +1500,17 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1450,7 +1500,17 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
/* calculating total amount*/ /* calculating total amount*/
amount = Double.parseDouble (amountStr); amount = Double.parseDouble (amountStr);
totAmount = totAmount + amount ; // 08/01/13 manoharan dr/cr total to be calculated separately
//totAmount = totAmount + amount ;
if ("D".equalsIgnoreCase (detDrcrFlag))
{
totDrAmount += amount;
}
else
{
totCrAmount += amount;
}
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranIDSer); // new generated tran_id pstmt.setString(1,tranIDSer); // new generated tran_id
...@@ -1495,16 +1555,31 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1495,16 +1555,31 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
/* A/C effect for ibca-rcp acctcode with total amount */ /* A/C effect for ibca-rcp acctcode with total amount */
// 08/01/13 manoharan
if (totDrAmount >= totCrAmount) //("D".equalsIgnoreCase (detDrcrFlag))
{
detAmount = totDrAmount - totCrAmount;
detDrcrFlag = "C";
hdrAmount = totDrAmount;
}
else
{
detAmount = totCrAmount - totDrAmount;
detDrcrFlag = "D";
hdrAmount = totCrAmount;
}
System.out.println ("totCrAmount ["+ totCrAmount + "] totDrAmount [" + totDrAmount + "]");
if(cnt1 > 0) if(cnt1 > 0)
{ {
if("C".equalsIgnoreCase(detDrcrFlag)) // 08/01/13 manoharan already taken care off above
{ //if("C".equalsIgnoreCase(detDrcrFlag))
detDrcrFlag = "D"; //{
} // detDrcrFlag = "D";
else //}
{ //else
detDrcrFlag = "C"; //{
} // detDrcrFlag = "C";
//}
System.out.println("detDrcrFlag AFTER SWAP insert:: "+detDrcrFlag); System.out.println("detDrcrFlag AFTER SWAP insert:: "+detDrcrFlag);
cnt1++; cnt1++;
sql = "insert into jourdet " sql = "insert into jourdet "
...@@ -1521,7 +1596,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1521,7 +1596,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
pstmt.setString(5,acctCodeRcp); // IBCA-RCP ACCTCODE pstmt.setString(5,acctCodeRcp); // IBCA-RCP ACCTCODE
pstmt.setString(6,detCctrCode); pstmt.setString(6,detCctrCode);
pstmt.setString(7,detDrcrFlag); pstmt.setString(7,detDrcrFlag);
pstmt.setDouble(8,totAmount); // 08/01/13 manoharan
//pstmt.setDouble(8,totAmount);
pstmt.setDouble(8,detAmount);
pstmt.setString(9,(String)glTraceMap.get("emp_code")); pstmt.setString(9,(String)glTraceMap.get("emp_code"));
pstmt.setString(10,(String)glTraceMap.get("anal_code")); pstmt.setString(10,(String)glTraceMap.get("anal_code"));
pstmt.setString(11,detRemarks); pstmt.setString(11,detRemarks);
...@@ -1546,13 +1624,18 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1546,13 +1624,18 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
glTraceMap.put("exch_rate",(journalMap.get("exch_rate") == null ? "":journalMap.get("exch_rate"))); glTraceMap.put("exch_rate",(journalMap.get("exch_rate") == null ? "":journalMap.get("exch_rate")));
if ("D".equalsIgnoreCase (detDrcrFlag)) if ("D".equalsIgnoreCase (detDrcrFlag))
{ {
glTraceMap.put("dr_amt",totAmount); // 08/01/13 manoharan
//glTraceMap.put("dr_amt",totAmount);
glTraceMap.put("dr_amt",detAmount);
glTraceMap.put("cr_amt","0"); glTraceMap.put("cr_amt","0");
} }
else else
{ {
glTraceMap.put("dr_amt","0"); glTraceMap.put("dr_amt","0");
glTraceMap.put("cr_amt",totAmount); // 08/01/13 manoharan
//glTraceMap.put("cr_amt",totAmount);
glTraceMap.put("cr_amt",detAmount);
} }
glTraceMap.put("ref_type","F"); glTraceMap.put("ref_type","F");
glTraceMap.put("ref_ser","JOUR"); glTraceMap.put("ref_ser","JOUR");
...@@ -1581,12 +1664,16 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1581,12 +1664,16 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
if ("D".equalsIgnoreCase(detDrcrFlag)) if ("D".equalsIgnoreCase(detDrcrFlag))
{ {
sundryBalMap.put("dr_amt",0.0); sundryBalMap.put("dr_amt",0.0);
sundryBalMap.put("cr_amt",totAmount); // 08/01/13 manoharan
//sundryBalMap.put("cr_amt",totAmount);
sundryBalMap.put("cr_amt",detAmount);
} }
else else
{ {
sundryBalMap.put("cr_amt",0.0); sundryBalMap.put("cr_amt",0.0);
sundryBalMap.put("dr_amt",totAmount); // 08/01/13 manoharan
//sundryBalMap.put("dr_amt",totAmount);
sundryBalMap.put("dr_amt",detAmount);
} }
sundryBalMap.put("adv_amt",0.0); sundryBalMap.put("adv_amt",0.0);
sundryBalMap.put("contact_code",Fcommon.getContactCode(detSundryType,detSundryCode,conn)); sundryBalMap.put("contact_code",Fcommon.getContactCode(detSundryType,detSundryCode,conn));
......
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