fixed dateformat bug while calling getDailyExchRateSellBuy()

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

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

@@ -11663,16 +11663,17 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 				lsCurrCodeComm1 = "", lsCurrCodeComm2 = "", lsCurrCodeIns = "";
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
-
+		String orderDate = "";
 		try {
 			double mNum = 0.00;
 			lsCurrCodeIns = checkNull(genericUtility.getColumnValue("curr_code__ins", dom));
 			lsSiteCode = checkNull(genericUtility.getColumnValue("site_code", dom));
-
-			Timestamp orderDate = Timestamp
+			//to handle parsing exceptio in getDailyExchRateSellBuy
+			/*Timestamp orderDate = Timestamp
 					.valueOf(genericUtility.getValidDateString(genericUtility.getColumnValue("order_date", dom1),
-							genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
-			mNum = finCommon.getDailyExchRateSellBuy(lsCurrCodeIns, "", lsSiteCode, orderDate.toString(), "S", conn);
+							genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");*/
+			orderDate = checkNull(genericUtility.getColumnValue("order_date", dom1));
+			mNum = finCommon.getDailyExchRateSellBuy(lsCurrCodeIns, "", lsSiteCode, orderDate, "S", conn);
 
 			valueXmlString.append("<exch_rate__ins>").append("<![CDATA[" + mNum + "]]>").append("</exch_rate__ins>");
 			exchangeRateProtect(lsCurrCodeIns, lsSiteCode, "exch_rate__ins", conn);
@@ -11694,21 +11695,22 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 				lsCurrCodeComm1 = "", lsCurrCodeComm2 = "";
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
-
+		String orderDate="";
 		try {
 			double mNum = 0.00;
 			lsCurrCodeComm2 = checkNull(genericUtility.getColumnValue("curr_code__comm2", dom));
 
 			lsSiteCode = checkNull(genericUtility.getColumnValue("site_code", dom));
 			lsCurrCode = checkNull(genericUtility.getColumnValue("curr_code", dom));
-
-			Timestamp orderDate = Timestamp
+			//to handle parsing exceptio in getDailyExchRateSellBuy
+			/*Timestamp orderDate = Timestamp
 					.valueOf(genericUtility.getValidDateString(genericUtility.getColumnValue("order_date", dom1),
-							genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
+							genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");*/			
 			if (lsCurrCodeComm2.equalsIgnoreCase(lsCurrCode)) {
 				mNum = Double.valueOf(genericUtility.getColumnValue("exch_rate", dom));
 			} else {
-				mNum = finCommon.getDailyExchRateSellBuy(lsCurrCodeComm2, "", lsSiteCode, orderDate.toString(), "S",
+				orderDate = checkNull(genericUtility.getColumnValue("order_date", dom1)); 
+				mNum = finCommon.getDailyExchRateSellBuy(lsCurrCodeComm2, "", lsSiteCode, orderDate, "S",
 						conn);
 			}
 
@@ -11736,20 +11738,21 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 				lsCurrCodeComm1 = "";
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
-
+		String orderDate = "";
 		try {
 			double mNum = 0.00;
 			lsCurrCodeComm1 = checkNull(genericUtility.getColumnValue("curr_code__comm1", dom));
 
 			lsSiteCode = checkNull(genericUtility.getColumnValue("site_code", dom));
 			lsCurrCode = checkNull(genericUtility.getColumnValue("curr_code", dom));
-
-			Timestamp orderDate = Timestamp
+			//to handle parsing exceptio in getDailyExchRateSellBuy
+			/*Timestamp orderDate = Timestamp
 					.valueOf(genericUtility.getValidDateString(genericUtility.getColumnValue("order_date", dom1),
-							genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
+							genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");*/
 			if (lsCurrCodeComm1.equalsIgnoreCase(lsCurrCode)) {
 				mNum = Double.valueOf(genericUtility.getColumnValue("exch_rate", dom));
 			} else {
+				orderDate = checkNull(genericUtility.getColumnValue("order_date", dom1));
 				mNum = finCommon.getDailyExchRateSellBuy(lsCurrCodeComm1, "", lsSiteCode, orderDate.toString(), "S",
 						conn);
 			}