Skip to content

B
business-java
Commit 3e493bf9 authored by pdas's avatar pdas
Browse files
Options

REQUEST ID-DI2ASUN029 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98035 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 7f421521
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 8 deletions
webitm-dis/ibase/webitm/ejb/dis/PriceListGenIC.java
View file @ 3e493bf9
...@@ -106,6 +106,8 @@ public class PriceListGenIC extends ValidatorEJB implements PriceListGenLocal, P ...@@ -106,6 +106,8 @@ public class PriceListGenIC extends ValidatorEJB implements PriceListGenLocal, P
String validUptoStr = ""; String validUptoStr = "";
String effFromStr = ""; String effFromStr = "";
String minRateStr = ""; String minRateStr = "";
String maxRateStr = "";
int maxRate=0;
String rateStr = ""; String rateStr = "";
int rate = 0; int rate = 0;
int minRate = 0; int minRate = 0;
...@@ -370,7 +372,7 @@ public class PriceListGenIC extends ValidatorEJB implements PriceListGenLocal, P ...@@ -370,7 +372,7 @@ public class PriceListGenIC extends ValidatorEJB implements PriceListGenLocal, P
break; break;
} }
} }
else if (childNodeName.equalsIgnoreCase("min_qty")) { /*else if (childNodeName.equalsIgnoreCase("min_qty")) {
minQtyStr = genericUtility.getColumnValue("min_qty", minQtyStr = genericUtility.getColumnValue("min_qty",
dom); dom);
if(minQtyStr == null || minQtyStr.trim().length() == 0 ) if(minQtyStr == null || minQtyStr.trim().length() == 0 )
...@@ -383,11 +385,13 @@ public class PriceListGenIC extends ValidatorEJB implements PriceListGenLocal, P ...@@ -383,11 +385,13 @@ public class PriceListGenIC extends ValidatorEJB implements PriceListGenLocal, P
} }
// minQty = minQtyStr == null ? 0 : minQtyStr.trim().length() == 0 ? 0 : Integer.parseInt(minQtyStr.trim()); // minQty = minQtyStr == null ? 0 : minQtyStr.trim().length() == 0 ? 0 : Integer.parseInt(minQtyStr.trim());
} }*/
else if (childNodeName.equalsIgnoreCase("max_qty")) else if (childNodeName.equalsIgnoreCase("max_qty")||(childNodeName.equalsIgnoreCase("min_qty")))
{ {
maxQtyStr = genericUtility.getColumnValue("max_qty",dom); maxQtyStr = genericUtility.getColumnValue("max_qty",dom);
if(maxQtyStr == null || minQtyStr.trim().length() == 0 ) minQtyStr = genericUtility.getColumnValue("min_qty",
dom);
if(maxQtyStr == null || minQtyStr.trim().length() == 0 || minQtyStr == null || minQtyStr.trim().length() == 0 )
{ {
errCode = "NULLQTY"; errCode = "NULLQTY";
errList.add(errCode); errList.add(errCode);
...@@ -398,8 +402,11 @@ public class PriceListGenIC extends ValidatorEJB implements PriceListGenLocal, P ...@@ -398,8 +402,11 @@ public class PriceListGenIC extends ValidatorEJB implements PriceListGenLocal, P
//maxQty = maxQtyStr == null ? 0 : maxQtyStr.trim().length() == 0 ? 0 : Integer.parseInt(maxQtyStr.trim()); //maxQty = maxQtyStr == null ? 0 : maxQtyStr.trim().length() == 0 ? 0 : Integer.parseInt(maxQtyStr.trim());
if((minQtyStr.trim().length() > 0||minQtyStr !=null )&& (maxQtyStr.trim().length() >0 ||maxQtyStr != null ))
{
minQty = Integer.parseInt(minQtyStr.trim()); minQty = Integer.parseInt(minQtyStr.trim());
maxQty = Integer.parseInt(minQtyStr.trim()); maxQty = Integer.parseInt(maxQtyStr.trim());
if (maxQty < minQty) { if (maxQty < minQty) {
errCode = "VMMINQTY"; errCode = "VMMINQTY";
errList.add(errCode); errList.add(errCode);
...@@ -407,14 +414,18 @@ public class PriceListGenIC extends ValidatorEJB implements PriceListGenLocal, P ...@@ -407,14 +414,18 @@ public class PriceListGenIC extends ValidatorEJB implements PriceListGenLocal, P
break; break;
} }
} }
else if (childNodeName.equalsIgnoreCase("min_rate")) { }
else if ((childNodeName.equalsIgnoreCase("min_rate"))||(childNodeName.equalsIgnoreCase("rate"))||(childNodeName.equalsIgnoreCase("max_rate"))) {
minRateStr = genericUtility.getColumnValue("min_rate", minRateStr = genericUtility.getColumnValue("min_rate",
dom); dom);
maxRateStr = genericUtility.getColumnValue("max_rate",
dom);
rateStr = genericUtility.getColumnValue("rate", dom); rateStr = genericUtility.getColumnValue("rate", dom);
if((minRateStr.trim().length() > 0||minRateStr !=null )&& (rateStr.trim().length() >0 ||rateStr != null )) if((minRateStr.trim().length() > 0||minRateStr !=null )&& (rateStr.trim().length() >0 ||rateStr != null )&&(maxRateStr.trim().length() > 0||maxRateStr !=null ))
{ {
minRate = Integer.parseInt(minRateStr); minRate = Integer.parseInt(minRateStr);
rate = Integer.parseInt(rateStr); rate = Integer.parseInt(rateStr);
maxRate = Integer.parseInt(maxRateStr);
if(rate<0) if(rate<0)
{ {
errCode = "VTSUBCRATE"; errCode = "VTSUBCRATE";
...@@ -428,6 +439,12 @@ public class PriceListGenIC extends ValidatorEJB implements PriceListGenLocal, P ...@@ -428,6 +439,12 @@ public class PriceListGenIC extends ValidatorEJB implements PriceListGenLocal, P
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
break; break;
} }
if (maxRate < minRate) {
errCode = "VTRATE7";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
break;
}
} }
} }
else if (childNodeName.equalsIgnoreCase("valid_upto")) { else if (childNodeName.equalsIgnoreCase("valid_upto")) {
......
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