Skip to content

B
business-java
Commit 28fb2d60 authored by agaikwad's avatar agaikwad
Browse files
Options

if cctr code value is null then set value is space. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@101801 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 27af50eb
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 42 deletions
webitm-fin/ibase/webitm/ejb/fin/FixedAssetTransfConf.java
View file @ 28fb2d60
...@@ -20,6 +20,7 @@ import java.sql.SQLException; ...@@ -20,6 +20,7 @@ import java.sql.SQLException;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
...@@ -255,15 +256,23 @@ public class FixedAssetTransfConf extends ActionHandlerEJB implements ...@@ -255,15 +256,23 @@ public class FixedAssetTransfConf extends ActionHandlerEJB implements
String prdtxfr = ""; String prdtxfr = "";
int count = 0; int count = 0;
int lineNo = 0; int lineNo = 0;
Timestamp currDate = new java.sql.Timestamp(System.currentTimeMillis()); //Timestamp currDate = new java.sql.Timestamp(System.currentTimeMillis());
Timestamp currDate =null;
SimpleDateFormat sdf = null; SimpleDateFormat sdf = null;
SimpleDateFormat sdf1 = null;
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
try try
{ {
Calendar currentDate = Calendar.getInstance();
sdf = new SimpleDateFormat(genericUtility.getApplDateFormat()); sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
String currAppdate = sdf.format(currDate); String sysDateStr = sdf.format(currentDate.getTime());
System.out.println("Now the date is :=> " + sysDateStr);
currDate = Timestamp.valueOf(genericUtility.getValidDateString(sysDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
//sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
// sdf1 = new SimpleDateFormat(genericUtility.getDBDateFormat());
//c Abhijit //String currAppdate = sdf.format(currDate);
System.out.println("xFrtype--->>[" + getXfrTypeG() + "]"); System.out.println("xFrtype--->>[" + getXfrTypeG() + "]");
System.out.println("SiteCodeFrom--->>[" + getSiteCodeG() + "]"); System.out.println("SiteCodeFrom--->>[" + getSiteCodeG() + "]");
...@@ -370,46 +379,44 @@ public class FixedAssetTransfConf extends ActionHandlerEJB implements ...@@ -370,46 +379,44 @@ public class FixedAssetTransfConf extends ActionHandlerEJB implements
if (rs1.next()) { if (rs1.next()) {
prdCdUpto = rs1.getString(1) == null ? "" : rs1 prdCdUpto = rs1.getString(1) == null ? "" : rs1
.getString(1); .getString(1);
System.out System.out.println("Period code from upto from procdate "+ prdCdUpto);
.println("Period code from upto from procdate "
+ prdCdUpto);
} }
pstmt1.close(); pstmt1.close();
rs1.close(); rs1.close();
pstmt1 = null; pstmt1 = null;
rs1 = null; rs1 = null;
String procDatest1="";
System.out.println("PeriodCodeupto" + prdCdUpto); System.out.println("PeriodCodeupto" + prdCdUpto);
procDatest = sdf.format(procDate2); // procDatest = sdf1.format(procDate2);
// procDatest1 = sdf.format(procDate2);
System.out.println("pROCdATE2 Application Format>>>" + procDatest);
System.out.println("pROCdATE2 Database format>>>" + procDatest);
if (prdCdUpto == "" || prdCdUpto.trim().length() == 0) { if (prdCdUpto == "" || prdCdUpto.trim().length() == 0) {
sql = "select code from period where '" sql = "select code from period where ? between fr_date and to_date";
+ procDatest
+ "' between fr_date and to_date";
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
pstmt1.setTimestamp(1, procDate2);
rs1 = pstmt1.executeQuery(); rs1 = pstmt1.executeQuery();
if (rs1.next()) { if (rs1.next()) {
prdCdUpto = rs1.getString(1) == null ? "" : rs1 prdCdUpto = rs1.getString(1) == null ? "" : rs1.getString(1);
.getString(1);
} }
pstmt1.close(); pstmt1.close();
rs1.close(); rs1.close();
pstmt1 = null; pstmt1 = null;
rs1 = null; rs1 = null;
System.out.println("Period code from upto from null condition "+ prdCdUpto);
System.out.println("pROCdATE2>>>" + procDatest); sql = "select code from period where fr_date = (select fr_date from period where code =" +
" (select acct_prd from period where ? between fr_date and to_date))";
sql = "select code from period where fr_date = (select fr_date from period where code = (select acct_prd from period where '"
+ currAppdate
+ "' between fr_date and to_date))";
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
pstmt1.setTimestamp(1, currDate);
rs1 = pstmt1.executeQuery(); rs1 = pstmt1.executeQuery();
if (rs1.next()) { if (rs1.next()) {
prdCdUpfr = rs1.getString(1) == null ? "" : rs1 prdCdUpfr = rs1.getString(1) == null ? "" : rs1.getString(1);
.getString(1);
System.out System.out
.println("Period code from upto from procdate" .println("Period code from upto from procdate"+ prdCdUpfr);
+ prdCdUpfr);
} }
pstmt1.close(); pstmt1.close();
rs1.close(); rs1.close();
...@@ -431,29 +438,26 @@ public class FixedAssetTransfConf extends ActionHandlerEJB implements ...@@ -431,29 +438,26 @@ public class FixedAssetTransfConf extends ActionHandlerEJB implements
* if (prdCdUpto1 < prdCdUpfr1) { prdCdUpto1 = * if (prdCdUpto1 < prdCdUpfr1) { prdCdUpto1 =
* prdCdUpfr1; } * prdCdUpfr1; }
*/ */
System.out System.out.println("prdCdUpfr.compareTo(prdCdUpto) > 0 >>> prdCdUpfr "+ prdCdUpfr+ ">>>>>prdCdUpto"+ prdCdUpto);
.println("prdCdUpfr.compareTo(prdCdUpto) > 0 >>> prdCdUpfr "
+ prdCdUpfr
+ ">>>>>prdCdUpto"
+ prdCdUpto);
if (prdCdUpfr.compareTo(prdCdUpto) > 0) { if (prdCdUpfr.compareTo(prdCdUpto) > 0) {
prdCdUpto = prdCdUpfr; prdCdUpto = prdCdUpfr;
} }
} }
sql = "select code from period where '" + currAppdate sql = "select code from period where ? between fr_date and to_date";
+ "' between fr_date and to_date";
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
pstmt1.setTimestamp(1, currDate);
rs1 = pstmt1.executeQuery(); rs1 = pstmt1.executeQuery();
if (rs1.next()) { if (rs1.next())
prdtxfr = rs1.getString(1) == null ? "" : rs1 {
.getString(1); prdtxfr = rs1.getString(1) == null ? "" : rs1.getString(1);
} }
pstmt1.close(); pstmt1.close();
rs1.close(); rs1.close();
pstmt1 = null; pstmt1 = null;
rs1 = null; rs1 = null;
System.out.println( ">>>>>prdtxfr"+ prdtxfr);
System.out.println("SiteCode>>>" + siteCode); System.out.println("SiteCode>>>" + siteCode);
System.out.println("itemSer>>>" + siteCode); System.out.println("itemSer>>>" + siteCode);
System.out.println("grpCode>>>" + grpCode); System.out.println("grpCode>>>" + grpCode);
...@@ -481,7 +485,7 @@ public class FixedAssetTransfConf extends ActionHandlerEJB implements ...@@ -481,7 +485,7 @@ public class FixedAssetTransfConf extends ActionHandlerEJB implements
recTabDetStrBuff.append("Y").append("\t"); recTabDetStrBuff.append("Y").append("\t");
recTabDetStrBuff.append("Y").append("\t"); recTabDetStrBuff.append("Y").append("\t");
recTabDetStrBuff.append("B").append("\t"); recTabDetStrBuff.append("B").append("\t");
recTabDetStrBuff.append(currAppdate).append("\n"); recTabDetStrBuff.append( currDate).append("\n");
// System.out.println("Trand_id"+tranId); // System.out.println("Trand_id"+tranId);
resultHdrString = recTabDetStrBuff.toString(); resultHdrString = recTabDetStrBuff.toString();
System.out.println("Data is:" + resultHdrString); System.out.println("Data is:" + resultHdrString);
...@@ -1359,10 +1363,9 @@ public class FixedAssetTransfConf extends ActionHandlerEJB implements ...@@ -1359,10 +1363,9 @@ public class FixedAssetTransfConf extends ActionHandlerEJB implements
return errorCodeL; return errorCodeL;
} }
if ("T".equalsIgnoreCase(xFrTypeL)) { if ("T".equalsIgnoreCase(xFrTypeL))
lsCctrCodeAr = fincommonObj.getAcctDetrDistTtype( {
getSiteCodeG(), getSiteCodeToG(), itemSerL, lsCctrCodeAr = fincommonObj.getAcctDetrDistTtype(getSiteCodeG(), getSiteCodeToG(), itemSerL,grpCodeL, itemCodeL, "FAXFRI", "", conn);
grpCodeL, itemCodeL, "FAXFRI", "", conn);
System.out.println("lsCctrCodeAr T------>>[" + lsCctrCodeAr System.out.println("lsCctrCodeAr T------>>[" + lsCctrCodeAr
+ "]"); + "]");
String[] code3 = lsCctrcode.split(","); String[] code3 = lsCctrcode.split(",");
...@@ -1977,6 +1980,7 @@ public class FixedAssetTransfConf extends ActionHandlerEJB implements ...@@ -1977,6 +1980,7 @@ public class FixedAssetTransfConf extends ActionHandlerEJB implements
String finEntityL ="",siteCode ="",siteCodeTo ="",siteCodeOld ="",xFrTypeL ="",currCodeL="",exchRateL =""; String finEntityL ="",siteCode ="",siteCodeTo ="",siteCodeOld ="",xFrTypeL ="",currCodeL="",exchRateL ="";
String cctrCodeMod ="",remarksL ="",errorCodeL =""; String cctrCodeMod ="",remarksL ="",errorCodeL ="";
String transerL = "FATRAN"; String transerL = "FATRAN";
String cctrCode="";//Added By abhijit
FinCommon fincommonObj = new FinCommon(); FinCommon fincommonObj = new FinCommon();
try try
{ {
...@@ -2035,7 +2039,15 @@ public class FixedAssetTransfConf extends ActionHandlerEJB implements ...@@ -2035,7 +2039,15 @@ public class FixedAssetTransfConf extends ActionHandlerEJB implements
glTraceMap.put("acct_code",tempHM.get("acctCode") ); glTraceMap.put("acct_code",tempHM.get("acctCode") );
glTraceMap.put("cr_amt",tempHM.get("cr_amt") ); glTraceMap.put("cr_amt",tempHM.get("cr_amt") );
glTraceMap.put("dr_amt",tempHM.get("dr_amt") ); glTraceMap.put("dr_amt",tempHM.get("dr_amt") );
glTraceMap.put("cctr_code",tempHM.get("cctrCode")); cctrCode=(String) tempHM.get("cctrCode");// Added By Abhijit Gaikwad
System.out.println("CctrCOde in wdvAmt Type is"+cctrCode);
if(cctrCode == null || cctrCode.trim().length()==0)
{
cctrCode=" ";
}
System.out.println("@@@@@CctrCOde in wdvAmt Type is"+cctrCode);
//glTraceMap.put("cctr_code",tempHM.get("cctrCode"));
glTraceMap.put("cctr_code",cctrCode);
glTraceMap.put("emp_code", ""); glTraceMap.put("emp_code", "");
glTraceMap.put("anal_code", ""); glTraceMap.put("anal_code", "");
glTraceMap.put("curr_code", currCodeL); glTraceMap.put("curr_code", currCodeL);
...@@ -2069,7 +2081,15 @@ public class FixedAssetTransfConf extends ActionHandlerEJB implements ...@@ -2069,7 +2081,15 @@ public class FixedAssetTransfConf extends ActionHandlerEJB implements
glTraceMap.put("sundry_type", "O"); glTraceMap.put("sundry_type", "O");
glTraceMap.put("sundry_code", ""); glTraceMap.put("sundry_code", "");
glTraceMap.put("acct_code", tempHM.get("acctCode")); glTraceMap.put("acct_code", tempHM.get("acctCode"));
glTraceMap.put("cctr_code", tempHM.get("cctrCode")); cctrCode=(String) tempHM.get("cctrCode");// Added By Abhijit Gaikwad
System.out.println("CctrCOde in depVal Type is"+cctrCode);
if(cctrCode == null || cctrCode.trim().length()==0)
{
cctrCode=" ";
}
System.out.println("@@@@CctrCOde in depVal Type is"+cctrCode);
glTraceMap.put("cctr_code",cctrCode);
//glTraceMap.put("cctr_code", tempHM.get("cctrCode"));
// System.out.println("CCtr Code>>>" + cctrAccCodeL); // System.out.println("CCtr Code>>>" + cctrAccCodeL);
glTraceMap.put("emp_code", ""); glTraceMap.put("emp_code", "");
glTraceMap.put("anal_code", ""); glTraceMap.put("anal_code", "");
...@@ -2098,9 +2118,15 @@ public class FixedAssetTransfConf extends ActionHandlerEJB implements ...@@ -2098,9 +2118,15 @@ public class FixedAssetTransfConf extends ActionHandlerEJB implements
glTraceMap.put("sundry_type", "O"); glTraceMap.put("sundry_type", "O");
glTraceMap.put("sundry_code", ""); glTraceMap.put("sundry_code", "");
glTraceMap.put("acct_code",tempHM.get("acctCode")); glTraceMap.put("acct_code",tempHM.get("acctCode"));
cctrCode=(String) tempHM.get("cctrCode");// Added By Abhijit Gaikwad
System.out.println("CctrCOde in modAmt Type is"+cctrCode);
glTraceMap.put("cctr_code",tempHM.get("cctrCode") ); if(cctrCode == null || cctrCode.trim().length()==0)
{
cctrCode=" ";
}
System.out.println("@@@@@@@@@CctrCOde in modAmt Type is"+cctrCode);
//glTraceMap.put("cctr_code",tempHM.get("cctrCode") );
glTraceMap.put("cctr_code",cctrCode );
glTraceMap.put("emp_code", ""); glTraceMap.put("emp_code", "");
glTraceMap.put("anal_code", ""); glTraceMap.put("anal_code", "");
glTraceMap.put("curr_code", currCodeL); glTraceMap.put("curr_code", currCodeL);
...@@ -2133,7 +2159,15 @@ public class FixedAssetTransfConf extends ActionHandlerEJB implements ...@@ -2133,7 +2159,15 @@ public class FixedAssetTransfConf extends ActionHandlerEJB implements
glTraceMap.put("sundry_type", "O"); glTraceMap.put("sundry_type", "O");
glTraceMap.put("sundry_code", ""); glTraceMap.put("sundry_code", "");
glTraceMap.put("acct_code", tempHM.get("acctCode")); glTraceMap.put("acct_code", tempHM.get("acctCode"));
glTraceMap.put("cctr_code", tempHM.get("cctrCode")); cctrCode=(String) tempHM.get("cctrCode");// Added By Abhijit Gaikwad
System.out.println("CctrCOde in totVal Type is"+cctrCode);
if(cctrCode == null || cctrCode.trim().length()==0)
{
cctrCode=" ";
}
System.out.println("@@@@@@@@CctrCOde in totVal Type is"+cctrCode);
glTraceMap.put("cctr_code",cctrCode );
//glTraceMap.put("cctr_code", tempHM.get("cctrCode"));
glTraceMap.put("emp_code", ""); glTraceMap.put("emp_code", "");
glTraceMap.put("anal_code", ""); glTraceMap.put("anal_code", "");
glTraceMap.put("curr_code", currCodeL); glTraceMap.put("curr_code", currCodeL);
......
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