Changes done on line no 12218 and 2808

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

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

@@ -2805,7 +2805,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 							errFields.add(childNodeName.toLowerCase());
 							System.out.println("The unit code you have entered is not existing in the unit master.");
 						} 
-						else if (unit.trim().length() == unitStd.trim().length())
+						else if (unit.equalsIgnoreCase(unitStd))//changes by mayur on 26/10/17
 						{
 							convQtyStduom = checkIntNull(genericUtility.getColumnValue("conv__qty_stduom", dom));
 							System.out.println("MANISH convQtyStduom-------->>[" + convQtyStduom + "]");
@@ -12213,7 +12213,14 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 			} 
 			else
 			{
-				lcRateStduom = distCommon.convQtyFactor(mVal1, mVal, mItem, ldRate, conn);
+				//lcRateStduom = distCommon.convQtyFactor(mVal1, mVal, mItem, ldRate, conn);
+				//changes by mayur on 26/10/17 ---start
+				ArrayList ratestduomArr = null;				
+				ratestduomArr = distCommon.getConvQuantityFact(mVal1, mVal, mItem, ldRate,lcConvRtuomStduom,conn); 
+						
+				lcConvRtuomStduom = Double.parseDouble(ratestduomArr.get(0).toString());
+				valueXmlString.append("<conv__rtuom_stduom>").append("<![CDATA[" + lcConvRtuomStduom + "]]>").append("</conv__rtuom_stduom>");
+				 //changes by mayur on 26/10/17 ---end
 			}
 			if (mNum3 == 0)
 			{