Skip to content

B
business-java
Commit 67e1d907 authored by nkhan's avatar nkhan
Browse files
Options

Added by Nasruddin khan 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@102653 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5372d589
Show whitespace changes
Inline Side-by-side
Showing with 131 additions and 96 deletions
webitm-dis/ibase/webitm/ejb/dis/CommissiondetIC.java
View file @ 67e1d907
...@@ -96,6 +96,9 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca ...@@ -96,6 +96,9 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca
double maxAmount = 0.0; double maxAmount = 0.0;
double minAmount = 0.0; double minAmount = 0.0;
double commPercentage = 0.0; double commPercentage = 0.0;
NodeList detailNodeList = null;
NodeList detail3childNodeList = null;
Node detail3parentNode = null;
try try
{ {
...@@ -224,15 +227,36 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca ...@@ -224,15 +227,36 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca
} }
} }
if (childNodeName.equalsIgnoreCase("comm_criteria"))
{
commCriteria = this.genericUtility.getColumnValue("comm_criteria", dom);
System.out.println("Commision Criteria [" + commCriteria);
if ((commCriteria != null) && (commCriteria.trim().length() > 0))
{
detailNodeList = dom2.getElementsByTagName("Detail3");
System.out.println("detailNodeList ::" + detailNodeList);
if ((detailNodeList != null) && (detailNodeList.getLength() > 0) && (commCriteria.equalsIgnoreCase("I")))
{
errString = itmDBAccessEJB.getErrorString("", "VTRECINCOM", userId);
break;
}
}
if ((commCriteria != null) && (commCriteria.trim().length() > 0))
{
detailNodeList = dom2.getElementsByTagName("Detail2");
if ((detailNodeList != null) && (detailNodeList.getLength() > 0) && (commCriteria.equalsIgnoreCase("V")))
{
errString = itmDBAccessEJB.getErrorString("", "VTRECINDET", userId);
break;
}
}
}
} // end for } // end for
break; break;
case 2: case 2:
parentNodeList = dom.getElementsByTagName("Detail2"); parentNodeList = dom.getElementsByTagName("Detail2");
parentNode = parentNodeList.item(0); parentNode = parentNodeList.item(0);
childNodeList = parentNode.getChildNodes(); childNodeList = parentNode.getChildNodes();
...@@ -565,66 +589,10 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca ...@@ -565,66 +589,10 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca
break; break;
} }
}
} //end eff_date
else if(childNodeName.equalsIgnoreCase("valid_upto")) // start valid_upto
{
System.out.println("@@@@@@@@@@ date validation : valid upto");
effDateStr =genericUtility.getColumnValue("eff_date",dom);
validUptoStr =genericUtility.getColumnValue("valid_upto",dom);
lineNo = genericUtility.getColumnValue("line_no",dom);
if((effDateStr != null) && (validUptoStr != null))
{
effDate= Timestamp.valueOf(genericUtility.getValidDateString(effDateStr, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0");
validUpto= Timestamp.valueOf(genericUtility.getValidDateString(validUptoStr, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0");
System.out.println("effDate date is :=> " + effDate);
System.out.println("validUpto date is :=> " + validUpto);
if( !validUpto.after(effDate) && !( validUpto.equals(effDate) ) )
{
//Valid upto cannot be less than effective date
errString = itmDBAccessEJB.getErrorString("","INVEFDATE",userId);
break ;
}
if(effDate.equals(validUpto)){
errString = itmDBAccessEJB.getErrorString("","INVEFDATE",userId);
break ;
}
}
else
{
//Date cannot be empty. Please enter valid date.
errString = itmDBAccessEJB.getErrorString("","VMVALDTNUL",userId);
break ;
}
} // end valid_upto
else if(childNodeName.equalsIgnoreCase("min_amt"))
{ // start if min_amt
minAmount = Double.parseDouble(checkNllOrBlank(genericUtility.getColumnValue("min_amt",dom)));
maxAmount = Double.parseDouble(checkNllOrBlank(genericUtility.getColumnValue("max_amt",dom)));
System.out.println("Minimum amount ["+ minAmount + "]Minimum amount ["+ minAmount + "]" );
if( minAmount <= 0 ){
errString = itmDBAccessEJB.getErrorString("","VTMINAMT",userId);
break ;
}
if(minAmount >= maxAmount){
errString = itmDBAccessEJB.getErrorString("","VTMINAMT",userId);
break ;
}
else
{
String effdatestr = genericUtility.getColumnValue( "eff_date", dom ) != null ? genericUtility.getColumnValue( "eff_date", dom ) : null; String effdatestr = genericUtility.getColumnValue( "eff_date", dom ) != null ? genericUtility.getColumnValue( "eff_date", dom ) : null;
String vuptodatestr = genericUtility.getColumnValue( "valid_upto", dom ) != null ? genericUtility.getColumnValue( "valid_upto", dom ) : null; String vuptodatestr = genericUtility.getColumnValue( "valid_upto", dom ) != null ? genericUtility.getColumnValue( "valid_upto", dom ) : null;
//if(effdatestr != null && vuptodatestr!=null)
//{
String updateFlag =""; String updateFlag ="";
String lineNo1 = genericUtility.getColumnValue( "line_no", dom ) != null ? genericUtility.getColumnValue( "line_no", dom ) : ""; String lineNo1 = genericUtility.getColumnValue( "line_no", dom ) != null ? genericUtility.getColumnValue( "line_no", dom ) : "";
...@@ -670,35 +638,87 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca ...@@ -670,35 +638,87 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca
if( efDtDomTimeStp.compareTo ( efDtDetTimeStp ) >= 0 && efDtDomTimeStp.compareTo ( vuptodtDetTimeStp ) <= 0) if( efDtDomTimeStp.compareTo ( efDtDetTimeStp ) >= 0 && efDtDomTimeStp.compareTo ( vuptodtDetTimeStp ) <= 0)
{ {
errString = itmDBAccessEJB.getErrorString("","INVEFDATE",userId);
errString = itmDBAccessEJB.getErrorString("","VMEFVUTDAT",userId);
break ; break ;
} }
if( efDtDomTimeStp.compareTo ( efDtDetTimeStp ) <= 0 && vuptodtDomTimeStp.compareTo ( vuptodtDetTimeStp ) >= 0) if( efDtDomTimeStp.compareTo ( efDtDetTimeStp ) <= 0 && vuptodtDomTimeStp.compareTo ( vuptodtDetTimeStp ) >= 0)
{ {
errString = itmDBAccessEJB.getErrorString("","INVEFDATE",userId);
System.out.println(" vuptodtDetTimeStp ::"+vuptodtDetTimeStp);
errString = itmDBAccessEJB.getErrorString("","VMEFVUTDAT",userId);
break ; break ;
} }
if( vuptodtDomTimeStp.compareTo ( efDtDetTimeStp ) >= 0 && vuptodtDomTimeStp.compareTo ( vuptodtDetTimeStp ) < 0) if( vuptodtDomTimeStp.compareTo ( efDtDetTimeStp ) >= 0 && vuptodtDomTimeStp.compareTo ( vuptodtDetTimeStp ) < 0)
{ {
errString = itmDBAccessEJB.getErrorString("","INVEFDATE",userId); errString = itmDBAccessEJB.getErrorString("","VMEFVUTDAT",userId);
break ; break ;
} }
if( efDtDomTimeStp.compareTo ( efDtDetTimeStp ) == 0 || vuptodtDomTimeStp.compareTo ( vuptodtDetTimeStp ) == 0) if( efDtDomTimeStp.compareTo ( efDtDetTimeStp ) == 0 || vuptodtDomTimeStp.compareTo ( vuptodtDetTimeStp ) == 0)
{ {
errString = itmDBAccessEJB.getErrorString("","INVEFDATE",userId); errString = itmDBAccessEJB.getErrorString("","VMEFVUTDAT",userId);
break ; break ;
} }
/* if( deprDet.equals(deprtype) && assetCode.equalsIgnoreCase( assetDet ) )
}
}
}
}
} //end eff_date
else if(childNodeName.equalsIgnoreCase("valid_upto")) // start valid_upto
{
System.out.println("@@@@@@@@@@ date validation : valid upto");
effDateStr =genericUtility.getColumnValue("eff_date",dom);
validUptoStr =genericUtility.getColumnValue("valid_upto",dom);
lineNo = genericUtility.getColumnValue("line_no",dom);
if((effDateStr != null) && (validUptoStr != null))
{
effDate= Timestamp.valueOf(genericUtility.getValidDateString(effDateStr, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0");
validUpto= Timestamp.valueOf(genericUtility.getValidDateString(validUptoStr, genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.0");
System.out.println("effDate date is :=> " + effDate);
System.out.println("validUpto date is :=> " + validUpto);
if( !validUpto.after(effDate) && !( validUpto.equals(effDate) ) )
{ {
errString = itmDBAccessEJB.getErrorString("depr_type","VTDEPRDUP",userId); //Valid upto cannot be less than effective date
errString = itmDBAccessEJB.getErrorString("","INVEFDATE",userId);
break ; break ;
} */
} }
if(effDate.equals(validUpto)){
errString = itmDBAccessEJB.getErrorString("","INVEFDATE",userId);
break ;
} }
} }
else
{
//Date cannot be empty. Please enter valid date.
errString = itmDBAccessEJB.getErrorString("","VMVALDTNUL",userId);
break ;
} }
} // end valid_upto
else if(childNodeName.equalsIgnoreCase("min_amt"))
{ // start if min_amt
minAmount = Double.parseDouble(checkNllOrBlank(genericUtility.getColumnValue("min_amt",dom)));
maxAmount = Double.parseDouble(checkNllOrBlank(genericUtility.getColumnValue("max_amt",dom)));
System.out.println("Minimum amount ["+ minAmount + "]Minimum amount ["+ minAmount + "]" );
if( minAmount <= 0 ){
errString = itmDBAccessEJB.getErrorString("","VTMINAMT",userId);
break ;
}
if(minAmount >= maxAmount){
errString = itmDBAccessEJB.getErrorString("","VTMINAMT",userId);
break ;
}
} // end min_amt } // end min_amt
else if(childNodeName.equalsIgnoreCase("max_amt")){ // start if max_amt else if(childNodeName.equalsIgnoreCase("max_amt")){ // start if max_amt
minAmount = Double.parseDouble(checkNllOrBlank(genericUtility.getColumnValue("min_amt",dom))); minAmount = Double.parseDouble(checkNllOrBlank(genericUtility.getColumnValue("min_amt",dom)));
...@@ -716,8 +736,6 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca ...@@ -716,8 +736,6 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca
break ; break ;
} }
} // end if max_amt } // end if max_amt
commCriteria = genericUtility.getColumnValue("comm_criteria", dom1); commCriteria = genericUtility.getColumnValue("comm_criteria", dom1);
System.out.println("commCriteria ::: ["+commCriteria); System.out.println("commCriteria ::: ["+commCriteria);
if(commCriteria != null && commCriteria.trim().length()>0){ if(commCriteria != null && commCriteria.trim().length()>0){
...@@ -728,11 +746,8 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca ...@@ -728,11 +746,8 @@ public class CommissiondetIC extends ValidatorEJB implements CommissiondetICLoca
} }
} }
} }
// changed by Nasruddin khan [19/JUL/16 D16DFOR001] END // changed by Nasruddin khan [19/JUL/16 D16DFOR001] END
break; break;
} //END switch } //END switch
......
webitm-dis/module-resource/sql/D16DFOR001.sql
View file @ 67e1d907
...@@ -247,3 +247,23 @@ values ( ...@@ -247,3 +247,23 @@ values (
'BASE' ); 'BASE' );
insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,CHG_DATE,CHG_USER,CHG_TERM)
values ('VTRECINDET',
'INVALID COMMISION CRITEREA',
'Records Exsit in Detail Value Wise',
'E',
sysdate,
'BASE',
'BASE');
insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,CHG_DATE,CHG_USER,CHG_TERM)
values ('VTRECINCOM',
'INVALID COMMISION CRITEREA',
'Records Exsit in Detail Item Wise',
'E',
sysdate,
'BASE',
'BASE');
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