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

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

@@ -6802,7 +6802,10 @@ PoReturnICRemote {
 						pstmt.close();
 						pstmt = null;
 
-						if (ls_pricelist.trim().length() > 0) {
+						//Added By PriyankaC on 08JAN2019.
+						if (ls_pricelist != null && ls_pricelist.trim().length() > 0)
+						//if (ls_pricelist.trim().length() > 0)
+						{
 							mrate = disscommon.pickRate(ls_pricelist,
 									ldt_trandtStr, mItem, mlotno, "B", conn);// pickRate(ls_pricelist,
 							// ldt_trandt,
@@ -6845,12 +6848,16 @@ PoReturnICRemote {
 						}
 					}
 
-					ls_tran_type = checkNull(genericUtility.getColumnValue(
-							"tran_date", dom));
-					lc_rate__clgStr = checkNull(genericUtility.getColumnValue(
-							"rate__clg", dom));
-					lc_rate__clg = lc_rate__clgStr == null ? 0 : Double
-							.parseDouble(lc_rate__clgStr);
+					ls_tran_type = checkNull(genericUtility.getColumnValue("tran_date", dom));
+					
+					// Added By PriyankaC on 07JAN2018 [START]
+					/*lc_rate__clgStr = checkNull(genericUtility.getColumnValue("rate__clg", dom));
+					lc_rate__clg = lc_rate__clgStr == null ? 0 : Double.parseDouble(lc_rate__clgStr);*/
+					
+				    lc_rate__clgStr = checkDoubleNull(genericUtility.getColumnValue("rate__clg", dom));
+				    System.out.println("lc_rate__clgStr : " +lc_rate__clgStr);
+				    lc_rate__clg = Double.parseDouble(lc_rate__clgStr);
+				     // Added By PriyankaC on 07JAN2018 [END]
 
 					if (lc_rate__clg == 0) {
 						lc_rate__clg = 0;
@@ -6870,8 +6877,8 @@ PoReturnICRemote {
 						rs = null;
 						pstmt.close();
 						pstmt = null;
-						if ((ls_pricelist__clg.trim().length() == 0)
-								|| ls_pricelist__clg == null) {
+						if (( ls_pricelist__clg == null || ls_pricelist__clg.trim().length() == 0))
+						{
 							sql = "select udf_str2  " + " from gencodes "
 									+ " where upper(fld_name) = 'TRAN_TYPE' "
 									+ " and    upper(mod_name) = 'W_PORCP' "
@@ -7375,7 +7382,15 @@ PoReturnICRemote {
 		}
 		return input;
 	}
-
+//Added By PriyankaC  [Start]
+	private String checkDoubleNull(String input) {
+		if (input == null || input.trim().length() == 0 ) 
+		{
+		input = "0";
+		}
+		return input;
+		}
+// Added By PriyankaC [END]
 	private String gfgetmfgsite(String asitem, String assite, String asloc,
 			String aslotno, String aslotsl, String astype, Connection conn) throws ITMException {
 		String lsmfgsite = "", lserrcode = "";