adding trim for unit unitstd

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

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

@@ -1101,7 +1101,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 
 					if(   childNodeName.equalsIgnoreCase("conv__qty_stduom") )  
 					{
-
+						System.out.println("@@@@@ validation of conv__qty_stduom executed......");
 						convQtyStduomStr  = checkNull(genericUtility.getColumnValue("conv__qty_stduom", dom));
 						unit  = checkNull(genericUtility.getColumnValue("unit", dom));
 						unitStd  = checkNull(genericUtility.getColumnValue("unit__std", dom));
@@ -1114,7 +1114,10 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 							unit  =  setDescription("unit", "item", "item_code", itemCode, conn);
 						}
 
-						if(( unit.equalsIgnoreCase(unitStd)) && (!( convQtyStduom == 1 )))
+						unit = unit==null?"":unit.trim();
+						unitStd = unitStd==null?"":unitStd.trim();
+						System.out.println("@@@@@3 unit["+unit+"]::unitStd["+unitStd+"]::convQtyStduom["+convQtyStduom+"]");
+						if(( unit.equalsIgnoreCase(unitStd)) && ( convQtyStduom != 1 ))
 						{
 							errCode = "VTUCON1";
 							errList.add(errCode);
@@ -1136,7 +1139,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 
 					if(   childNodeName.equalsIgnoreCase("conv__rtuom_stduom") )  //
 					{
-
+						System.out.println("@@@@@ validation of conv__rtuom_stduom executed......");
 						convRtuomStduomStr  = checkNull(genericUtility.getColumnValue("conv__rtuom_stduom", dom));
 						unitRate  = checkNull(genericUtility.getColumnValue("unit__rate", dom));
 						unitStd  = checkNull(genericUtility.getColumnValue("unit__std", dom));
@@ -1149,7 +1152,10 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 							unit  =  setDescription("unit", "item", "item_code", itemCode, conn);
 						}
 
-						if(( unitRate.equalsIgnoreCase(unitStd)) && (!( convRtuomStduom == 1 )))
+						unitRate = unitRate==null?"":unitRate.trim();
+						unitStd = unitStd==null?"":unitStd.trim();
+						System.out.println("@@@@@1 unitRate["+unitRate+"]::unitStd["+unitStd+"]::convRtuomStduom["+convRtuomStduom+"]");
+						if(( unitRate.equalsIgnoreCase(unitStd)) && ( convRtuomStduom != 1 ))
 						{
 							errCode = "VTUCON1";
 							errList.add(errCode);
@@ -1810,6 +1816,8 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 		String errCode = "", variencetype="", order = "NOTFOUND",sql = "";
 		double varience=0,mastfact=0;
 	
+		
+		System.out.println("@@@@@2 unitfrom["+unitfrom+"]::unitto["+unitto+"]::convfact["+convfact+"]");
 		if (unitfrom.equalsIgnoreCase(unitto) && (!( convfact == 1)))
 		{
 			errCode = "VTUCON1";