Skip to content

B
business-java
Commit fcf01fab authored by cpatil's avatar cpatil
Browse files
Options

analysis parameter set 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93392 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 2ecdcfbf
Show whitespace changes
Inline Side-by-side
Showing with 123 additions and 2 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/JvConfirm.java
View file @ fcf01fab
......@@ -12,6 +12,7 @@ import ibase.webitm.ejb.*;
import ibase.system.config.*;
import javax.ejb.Stateless;
import ibase.webitm.ejb.fin.FinCommon;
import ibase.webitm.ejb.fin.InvAcct;
import ibase.utility.CommonConstants;
import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.utility.TransIDGenerator;
......@@ -137,6 +138,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
String lineNo = "" ,acctCode = "",cctrCode ="",drcrFlag ="",remarksDet = "";
String amount = "" ,empCode="" , analCode = "",sundryType = "",sundryCode = "",projCodeDet = "";
int cnt = 0;
String itemCode=""; // added by cpatil on 01/07/13
String analysis1="", analysis2="", analysis3=""; // added by cpatil on 01/07/13
try
{
itmDBAccessEJB = new ITMDBAccessEJB();
......@@ -227,7 +230,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
//brow-start
sql = "select j.line_no ,j.acct_code ,j.cctr_code ,j.drcr_flag , "
+" j.amount ,j.emp_code ,j.anal_code ,j.sundry_type ,j.sundry_code,j.remarks, "
+" j.proj_code,j.site_code__jv "
+" j.proj_code,j.site_code__jv , j.item_code,j.analysis1,j.analysis2,j.analysis3 " // added by cpatil on 01/07/13
+" from jourdet j "
+" where j.tran_id = ? "
+" order by line_no asc ";
......@@ -251,7 +254,11 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
String siteCodeJv = "";
siteCodeJv = rs.getString("site_code__jv");
itemCode = rs.getString("item_code"); // added by cpatil on 01/07/13
analysis1 = rs.getString("analysis1"); // added by cpatil on 09/07/13
analysis2 = rs.getString("analysis2"); // added by cpatil on 09/07/13
analysis3 = rs.getString("analysis3"); // added by cpatil on 09/07/13
System.out.println("@@@@@ detail lineNo["+lineNo+"]:::ItemCode["+itemCode+"]:::analysis1["+analysis1+"]:::analysis2["+analysis2+"]::::analysis3["+analysis3+"]"); // added by cpatil on 01/07/13
amt = Double.parseDouble (amount);
System.out.println("amount :::"+amt);
......@@ -278,8 +285,16 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
//
jourdetMap.put("site_code__jv",siteCodeJv);
//
// // added by cpatil on 01/07/13
jourdetMap.put("item_code",itemCode);
// // added by cpatil on 09/07/13
jourdetMap.put("analysis1",analysis1);
jourdetMap.put("analysis2",analysis2);
jourdetMap.put("analysis3",analysis3);
//
jourdetList.add(jourdetMap);
}
rs.close();
rs = null;
......@@ -420,6 +435,13 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
java.sql.Timestamp toDay = null;
java.sql.Timestamp revDt = null;
StringBuffer xmlBuff = null;
// added by cpatil on 01/07/13 start
String detItemCode="";
String analysis="";
String[] analysisStr =null;
String analysis1__dr="",analysis2__dr="",analysis3__dr="",analysis1__cr="",analysis2__cr="",analysis3__cr="" ;
String analysis1="",analysis2="",analysis3="";
// added by cpatil on 01/07/13 end
try
{
sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
......@@ -443,6 +465,12 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
detRemarks = (String) detListMap.get("remarks");
detProjCode = (String) detListMap.get("proj_code");
amtDbl = Double.parseDouble(detAmount);
detItemCode = (String) detListMap.get("item_code"); // added by cpatil on 01/07/13
tranType = (String) journalMap.get("tran_type"); // added by cpatil on 01/07/13
analysis1 = (String) detListMap.get("analysis1"); // added by cpatil on 01/07/13
analysis2 = (String) detListMap.get("analysis2"); // added by cpatil on 01/07/13
analysis3 = (String) detListMap.get("analysis3"); // added by cpatil on 01/07/13
System.out.println("@@@@@cpatil from detail ItemCode["+detItemCode+"]:::analysis1["+analysis1+"]:::analysis2["+analysis2+"]::::analysis3["+analysis3+"]"); // added by cpatil on 01/07/13
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")));
......@@ -456,6 +484,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
glTraceMap.put("anal_code",detAnalCode == null ? "":detAnalCode);
glTraceMap.put("curr_code",(journalMap.get("curr_code") == null ? "":journalMap.get("curr_code")));
glTraceMap.put("exch_rate",(journalMap.get("exch_rate") == null ? "":journalMap.get("exch_rate")));
if ("D".equalsIgnoreCase (detDrcrFlag))
{
glTraceMap.put("dr_amt",Math.abs(Double.parseDouble(detAmount)));
......@@ -480,6 +509,98 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
}
glTraceMap.put("proj_code",detProjCode);
// added by cpatil on 01/07/13 start
if( detItemCode != null && detItemCode.trim().length() > 0 )
{
System.out.println("@@@@@@ inside if condition of item");
InvAcct invAcct = new InvAcct();
if ("D".equalsIgnoreCase (detDrcrFlag))
{
analysis = invAcct.AcctAnalysisType(detItemCode,"JOUR", tranType, "DR", conn);
//analysis = invAcct.gbf_acct_analysis_type(detItemCode,"JOUR", tranType, "DR", conn);
//AcctAnalysisType
System.out.println("@@@@DR return analysis["+analysis+"]");
analysisStr = analysis.split("@");
int len = analysisStr.length-1;
System.out.println("@@@DR len["+len+"]");
if( len > -1 )
{
analysis1__dr = analysisStr[0];
}
else
{
analysis1__dr = "";
}
if( len > 0 )
{
analysis2__dr = analysisStr[1];
}
else
{
analysis2__dr = "";
}
if( len > 1)
{
analysis3__dr = analysisStr[2];
}
else
{
analysis3__dr ="";
}
System.out.println("@@@@@dr analysis1__dr["+analysis1__dr+"]:::analysis2__dr["+analysis2__dr+"]::::analysis3__dr["+analysis3__dr+"]");
glTraceMap.put("analysis1",analysis1__dr);
glTraceMap.put("analysis2",analysis2__dr);
glTraceMap.put("analysis3",analysis3__dr);
}
else
{
analysis = invAcct.AcctAnalysisType(detItemCode, "JOUR", tranType, "CR", conn);
//analysis = invAcct.gbf_acct_analysis_type(detItemCode, "JOUR", tranType, "CR", conn);
System.out.println("@@@@CR return analysis["+analysis+"]");
analysisStr = analysis.split("@");
int len = analysisStr.length-1;
System.out.println("@@@cr len["+len+"]");
if( len > -1 )
{
analysis1__cr = analysisStr[0];
}
else
{
analysis1__cr = "";
}
if( len > 0 )
{
analysis2__cr = analysisStr[1];
}
else
{
analysis2__cr = "";
}
if( len > 1)
{
analysis3__cr = analysisStr[2];
}
else
{
analysis3__cr ="";
}
System.out.println("@@@@@CR analysis1__cr["+analysis1__cr+"]:::analysis2__cr["+analysis2__cr+"]::::analysis3__cr["+analysis3__cr+"]");
glTraceMap.put("analysis1",analysis1__cr);
glTraceMap.put("analysis2",analysis2__cr);
glTraceMap.put("analysis3",analysis3__cr);
}
}
else
{
System.out.println("@@@@@into else part ItemCode["+detItemCode+"]:::analysis1["+analysis1+"]:::analysis2["+analysis2+"]::::analysis3["+analysis3+"]");
glTraceMap.put("analysis1",analysis1);
glTraceMap.put("analysis2",analysis2);
glTraceMap.put("analysis3",analysis3);
}
// added by cpatil on 01/07/13 end
errString = Fcommon.glTraceUpdate(glTraceMap,conn);
if(errString != null && errString.trim().length() > 0)
{
......
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