Skip to content

B
business-java
Commit 181da5c8 authored by ssalve's avatar ssalve
Browse files
Options

Sarita: Added by sarita on 31MAY2018 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@185729 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b773b0dd
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 15 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/CostCtrAllocIC.java
View file @ 181da5c8
......@@ -617,6 +617,7 @@ public class CostCtrAllocIC extends ValidatorEJB implements CostCtrAllocICRemote
boolean isresult = true;
int cnt=0;
double allocPercent=0;
String effFrom = "", validUpto = "";//Added by sarita on 31 MAY 2018
try
{
conn = getConnection();
......@@ -855,12 +856,16 @@ public class CostCtrAllocIC extends ValidatorEJB implements CostCtrAllocICRemote
+" and eff_from >= ? "
+" and valid_upto <= ? ";*/
//Done changes by sarita on [02-MAY-2018] to change eff_from and valid_upto '>= , <=' validation.
sSQL = "select tran_id,cctr_code__from, sgroup_code,group_code,acct_cat, acct_code, alloc_basis, res_basis from costalloc_bas "
/*sSQL = "select tran_id,cctr_code__from, sgroup_code,group_code,acct_cat, acct_code, alloc_basis, res_basis from costalloc_bas "
+ " where site_code = ? "
+" and eff_from <= ? "
+" and valid_upto >= ? ";*/
//Added by sarita on [31-MAY-2018] to get to_date and from_date
sSQL = "select tran_id,cctr_code__from, sgroup_code,group_code,acct_cat, acct_code, alloc_basis, res_basis,eff_from,valid_upto from costalloc_bas "
+ " where site_code = ? "
+" and eff_from <= ? "
+" and valid_upto >= ? ";
pstmt = conn.prepareStatement(sSQL);
pstmt.setString(1,siteCode);
pstmt.setTimestamp(2,fromDateTimestamp);
......@@ -883,6 +888,10 @@ public class CostCtrAllocIC extends ValidatorEJB implements CostCtrAllocICRemote
System.out.println("siteCode::["+siteCode+"]"+"traidMst::["+rs.getString("tran_id")+"]"+"resBas::["+rs.getString("res_basis")+"]"+"allocBas::["+rs.getString("alloc_basis")+"]"+"Account Category ::["+rs.getString("acct_cat")+"]");
cctrDataList = getCostCenterList(siteCode, rs.getString("tran_id"), rs.getString("res_basis"), rs.getString("alloc_basis"), conn);
dataMap.put("cctr_list", cctrDataList);
//Added by sarita on 31-MAY-2018 [START]
dataMap.put("eff_from", rs.getString("eff_from"));
dataMap.put("valid_upto", rs.getString("valid_upto"));
//Added by sarita on 31-MAY-2018 [END]
cosAllocationList.add(dataMap);
}
......@@ -919,8 +928,12 @@ public class CostCtrAllocIC extends ValidatorEJB implements CostCtrAllocICRemote
resBasis = (String)tempMap.get("res_basis");
tranIDMst = (String)tempMap.get("tran_id");
/*ArrayList cctrList = (ArrayList)tempMap.get("cctr_list");
System.out.println("cctrList :::------------------"+cctrList+"]")*/;
//Added by sarita on 31-MAY-2018 [START]
effFrom = (String)tempMap.get("eff_from");
validUpto = (String)tempMap.get("valid_upto");
//Added by sarita on 31-MAY-2018 [END]
ArrayList<HashMap> accountDataList = getAllocationAmt(siteCode ,groupCode,subGroupCode ,accCatGrp,acctCode,acctPeriod,finEntity,cctrCodeFrm,prdCode ,conn);
System.out.println("accountList :::////////////////////////"+accountDataList.toString());
......@@ -964,8 +977,12 @@ public class CostCtrAllocIC extends ValidatorEJB implements CostCtrAllocICRemote
valueXmlString.append("<tran_id_mst><![CDATA[" ).append(checkNull(tranIDMst)).append( "]]></tran_id_mst>\r\n" );
valueXmlString.append("<prd_code><![CDATA[" ).append(checkNull(prdCode)).append( "]]></prd_code>\r\n" );
valueXmlString.append("<site_code><![CDATA[" ).append(checkNull(siteCode)).append( "]]></site_code>\r\n" );
valueXmlString.append("<from_date><![CDATA[" ).append(checkNull("")).append( "]]></from_date>\r\n" );
valueXmlString.append("<to_date><![CDATA[" ).append(checkNull("")).append( "]]></to_date>\r\n" );
//Commented and added by sarita to set from_date and to_date on 31-MAY-2018 [START]
/*valueXmlString.append("<from_date><![CDATA[" ).append(checkNull("")).append( "]]></from_date>\r\n" );
valueXmlString.append("<to_date><![CDATA[" ).append(checkNull("")).append( "]]></to_date>\r\n" );*/
valueXmlString.append("<from_date><![CDATA[" ).append(checkNull(effFrom)).append( "]]></from_date>\r\n" );
valueXmlString.append("<to_date><![CDATA[" ).append(checkNull(validUpto)).append( "]]></to_date>\r\n" );
//Commented and added by sarita to set from_date and to_date on 31-MAY-2018 [END]
valueXmlString.append("<acct_code><![CDATA[" ).append(checkNull(acctCodeGet)).append( "]]></acct_code>\r\n" );
valueXmlString.append("<cctr_code><![CDATA[" ).append(checkNull(cctrCodeFrm)).append( "]]></cctr_code>\r\n" );
valueXmlString.append("<exp_head><![CDATA[" ).append(checkNull(acctCodeGetDescr)).append( "]]></exp_head>\r\n" );
......@@ -981,16 +998,12 @@ public class CostCtrAllocIC extends ValidatorEJB implements CostCtrAllocICRemote
valueXmlString.append(detail3 + "\r\n");
}//for(int acctCtr =0;acctCtr <accountListLength;acctCtr++)
}
}//for (int cCtr = 0; cCtr < listLength; cCtr++)
}
}
break;
}
case 3 :
......@@ -1449,7 +1462,6 @@ public class CostCtrAllocIC extends ValidatorEJB implements CostCtrAllocICRemote
StringBuffer valueXmlString = new StringBuffer("");
int domIDDet =0;
FinCommon finCommon = new FinCommon();
try
{
cctrDataList = getCostCenterList(siteCode, traidMst, resBas, allocBas, conn);
......@@ -1472,7 +1484,8 @@ public class CostCtrAllocIC extends ValidatorEJB implements CostCtrAllocICRemote
domIDDet++;
cctrDataMap = (HashMap)cctrDataList.get(cctrCnt);
ccctrCode = (String)cctrDataMap.get("cctr_code");
cctrsDescription = (String)cctrDataMap.get("cctr_descr");
cctrsDescription = (String)cctrDataMap.get("cctr_descr"); System.out.println("ccctrCode :["+ccctrCode+"] \t cctrsDescription["+cctrsDescription+"]");
valueXmlString.append("<Detail3 domID='" + domIDDet + "' selected=\"Y\">\r\n");
//valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\"/>\r\n");
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"A\" status=\"N\"/>\r\n");
......
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