source merge mail by Sumit Sarkar

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92537 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/DistributionRoute.java

@@ -469,12 +469,24 @@ public class DistributionRoute extends ValidatorEJB implements DistributionRoute
 					else if(childNodeName.equalsIgnoreCase("max_weight")) 
 					{
 						maxWeight = checkNull(genericUtility.getColumnValue("max_weight", dom));
+						minWeight = checkNull(genericUtility.getColumnValue("min_weight", dom));
 						if(maxWeight == null || maxWeight.trim().length() == 0)
 						{
 							errCode = "VTMAXWTBK";
 							errList.add(errCode);
 							errFields.add(childNodeName.toLowerCase());
 						}
+						//Changed by sumit on 21/01/13 adding validation to prevent not less than min weight start
+						else
+						{
+							if( minWeight != null && minWeight.trim().length() > 0 && Double.parseDouble(maxWeight) < Double.parseDouble(minWeight))
+							{
+								errCode = "VTLESMAXWA";
+								errList.add(errCode);
+								errFields.add(childNodeName.toLowerCase());
+							}
+						}
+						//Changed by sumit on 21/01/13 adding validation to prevent not less than min case end
 					}
 					//Changed by sumit on 02/01/13 adding validation for max case and min case start.
 					else if(childNodeName.equalsIgnoreCase("min_case")) 
@@ -490,13 +502,27 @@ public class DistributionRoute extends ValidatorEJB implements DistributionRoute
 					else if(childNodeName.equalsIgnoreCase("max_case")) 
 					{
 						maxCase = checkNull(genericUtility.getColumnValue("max_case", dom));
+						minCase = checkNull(genericUtility.getColumnValue("min_case", dom));
+						System.out.println(" maxCase ["+maxCase+"] minCase ["+minCase+"]");
 						if(maxCase == null || maxCase.trim().length() == 0)
 						{
 							errCode = "VTMAXCASE";
 							errList.add(errCode);
 							errFields.add(childNodeName.toLowerCase());
 						}
+						//Changed by sumit on 21/01/13 adding validation to prevent not less than min case start
+						else
+						{
+							if( minCase != null && minCase.trim().length() > 0 && Double.parseDouble(maxCase) < Double.parseDouble(minCase))
+							{
+								errCode = "VTLESMAXCA";
+								errList.add(errCode);
+								errFields.add(childNodeName.toLowerCase());
+							}
 						}
+						//Changed by sumit on 21/01/13 adding validation to prevent not less than min case end
+					}
+					
 					//Changed by sumit on 02/01/13 adding validation for max case and min case end.
 					/*else if(childNodeName.equalsIgnoreCase("state_code__fr"))
 					 {
@@ -1084,8 +1110,8 @@ public class DistributionRoute extends ValidatorEJB implements DistributionRoute
 					rs = null;
 					pstmt.close();
 					pstmt = null;           
-					valueXmlString.append("<tran_name>").append(descr).append("</tran_name>");
-					//valueXmlString.append("<tran_name>").append("<![CDATA[" + descr +"]]>").append("</tran_name>");
+					//valueXmlString.append("<tran_name>").append(descr).append("</tran_name>");
+					valueXmlString.append("<transporter_tran_name>").append("<![CDATA[" + descr +"]]>").append("</transporter_tran_name>\r\n");
 				}
 				else if(currentColumn.trim().equalsIgnoreCase("curr_code"))
 				{