Null pointer exception in Lot SL Itemchange for if pricelist is null

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

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

@@ -7241,7 +7241,7 @@ PoReturnICRemote {
 						pstmt.setString(1, mPordNo);//
 						rs = pstmt.executeQuery();
 						if (rs.next()) {
-							ls_pricelist = rs.getString(1);
+							ls_pricelist = checkNull(rs.getString(1));
 
 						}
 						rs.close();
@@ -7249,7 +7249,7 @@ PoReturnICRemote {
 						pstmt.close();
 						pstmt = null;
 
-						if (ls_pricelist.trim().length() > 0) {
+						if (ls_pricelist!=null && ls_pricelist.trim().length() > 0) {
 							mrate = disscommon.pickRate(ls_pricelist,
 									ldt_trandtStr, mItem, mlotno, "B", conn);// pickRate(ls_pricelist,
 							// ldt_trandt,
@@ -7314,8 +7314,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' "