Skip to content

B
business-java
Commit 2874d71f authored by kshinde's avatar kshinde
Browse files
Options

added validation for maximum order value should not exceed in detail and... 

added validation for maximum order value should not exceed in detail and protecting detail columns on header

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@191980 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f7371c99
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 9 deletions
webitm-dis/ibase/webitm/ejb/dis/SOrderForm.java
View file @ 2874d71f
......@@ -2243,9 +2243,25 @@ public class SOrderForm extends ValidatorEJB implements SOrderFormLocal, SOrderF
}//end totqty
else if ( childNodeName.equalsIgnoreCase("ord_value") )
{
double detOrdSumVal=0;
Node currDetail1 = null;
NodeList detailList1 = dom2.getElementsByTagName("Detail2");
int noOfDetails = detailList1.getLength();
// System.out.println("Dom print"+genericUtility.serializeDom(dom2));
// System.out.println("current dom print"+genericUtility.serializeDom(dom));
for (int ctr1 = 0; ctr1 < noOfDetails; ctr1++)
{
currDetail1 = detailList1.item(ctr1);
double eachOrdVal = Double.parseDouble(genericUtility.getColumnValueFromNode("ord_value", currDetail1));
detOrdSumVal=detOrdSumVal+eachOrdVal;
}
System.out.println("detOrdSumVal======"+detOrdSumVal);
ordValue = genericUtility.getColumnValue("ord_value",dom);
totValue = genericUtility.getColumnValue("tot_value",dom);
maxOrdValue = genericUtility.getColumnValue("max_ord_value",dom);
totValue = genericUtility.getColumnValue("tot_value",dom1);
maxOrdValue = genericUtility.getColumnValue("max_ord_value",dom1);
System.out.println("ordVal"+ordValue+"tot_val"+totValue+"maxOrdVal"+maxOrdValue);
if(ordValue != null && ordValue.trim().length() > 0)
{
OrdValue = Double.parseDouble(ordValue);
......@@ -2258,7 +2274,7 @@ public class SOrderForm extends ValidatorEJB implements SOrderFormLocal, SOrderF
{
MaxOrdValue = Double.parseDouble(maxOrdValue); // lcOrdValueO not clear
}
if( ( MaxOrdValue != 0) && ( ( OrdValue + TotValue - lcOrdValueO ) > MaxOrdValue ) )
if( ( MaxOrdValue != 0) && ( (detOrdSumVal ) > MaxOrdValue ) )
{
errCode = "VTMXORDAMT";
errString = getErrorString("ord_value",errCode,userId);
......@@ -2550,7 +2566,7 @@ public class SOrderForm extends ValidatorEJB implements SOrderFormLocal, SOrderF
double intQty =0.0;
double looseQty =0.0;
double acIntegralQty =0.0;
String lsStr = null;
String lsStr = null,maxOrdVal="";
double acShipperQty = 0.0;
double sumRatio=0;
String loginSiteDescr = null;
......@@ -2931,11 +2947,12 @@ public class SOrderForm extends ValidatorEJB implements SOrderFormLocal, SOrderF
orderType = genericUtility.getColumnValue("trans_mode",dom);
maxOrdVal = genericUtility.getColumnValue("max_ord_value",dom);
//valueXmlString.append("<trans_mode protect =\"1\">").append(orderType).append("</trans_mode>");
//valueXmlString.append("<max_ord_value protect =\"1\">").append("</max_ord_value>");
valueXmlString.append("<trans_mode protect =\"" + ( detCount > 0 ? "1" : "0" ) + "\">").append(orderType).append("</trans_mode>");
valueXmlString.append("<max_ord_value protect =\"" + ( detCount > 0 ? "1" : "0" ) + "\">").append("</max_ord_value>");
valueXmlString.append("<max_ord_value protect =\"" + ( detCount > 0 ? "1" : "0" ) + "\">").append(maxOrdVal).append("</max_ord_value>");
//changed by rajendra for retain old value
orderType = genericUtility.getColumnValue("order_type",dom);
......@@ -2963,9 +2980,6 @@ public class SOrderForm extends ValidatorEJB implements SOrderFormLocal, SOrderF
}
}
disparmVal = distCommon.getDisparams("999999","SALES_BANGLA",conn);
System.out.println("getDisparams()....disparmVal..."+disparmVal);
......@@ -3370,7 +3384,20 @@ public class SOrderForm extends ValidatorEJB implements SOrderFormLocal, SOrderF
break;
case 2:
custCode=genericUtility.getColumnValue("cust_code", dom1);
siteCode=genericUtility.getColumnValue("site_code", dom1);
siteCodeShip=genericUtility.getColumnValue("site_code__ship", dom1);
itemSer = genericUtility.getColumnValue("item_ser", dom1);
orderType = genericUtility.getColumnValue("order_type", dom1);
valueXmlString.append("<Detail1>");
valueXmlString.append("<cust_code protect =\"1\">").append("<![CDATA["+custCode+"]]>").append("</cust_code>");
valueXmlString.append("<site_code protect =\"1\">").append("<![CDATA["+siteCode+"]]>").append("</site_code>");
valueXmlString.append("<site_code__ship protect =\"1\">").append("<![CDATA["+siteCodeShip+"]]>").append("</site_code__ship>");
valueXmlString.append("<itemSer protect =\"1\">").append("<![CDATA["+itemSer+"]]>").append("</itemSer>");
valueXmlString.append("<order_type protect =\"1\">").append("<![CDATA["+orderType+"]]>").append("</order_type>");
valueXmlString.append("</Detail1>");
parentNodeList = dom.getElementsByTagName("Detail2");
parentNode = parentNodeList.item(0);
childNodeList = parentNode.getChildNodes();
......
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