added checknull for proj_code

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

webitm-dis/src/ibase/webitm/ejb/dis/SaleContractRelease.java

@@ -654,54 +654,54 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 					//contractType = rs.getString("CONTRACT_TYPE");
 					contractType = checkNullandTrim(rs.getString("CONTRACT_TYPE"));//changed by jaffar S on 20-03-2019
 					System.out.println("CONTRACT_TYPE.............."+contractType);
-					itemSer = rs.getString("ITEM_SER");
-					transMode = rs.getString("TRANS_MODE");
-					currCode = rs.getString("CURR_CODE");
-					currCodeIns = rs.getString("CURR_CODE__INS");
-					orderDb = rs.getString("ORDER_DB");
-					stanCodeInit = rs.getString("STAN_CODE__INIT");
+					itemSer = checkNull(rs.getString("ITEM_SER"));
+					transMode = checkNull(rs.getString("TRANS_MODE"));
+					currCode = checkNull(rs.getString("CURR_CODE"));
+					currCodeIns = checkNull(rs.getString("CURR_CODE__INS"));
+					orderDb = checkNull(rs.getString("ORDER_DB"));
+					stanCodeInit = checkNull(rs.getString("STAN_CODE__INIT"));
 					exchRateCom = rs.getDouble("EXCH_RATE__COMM");
 					exchRateCom1 = rs.getDouble("EXCH_RATE__COMM_1");
 					exchRateCom2 = rs.getDouble("EXCH_RATE__COMM_2");
-					accCodeSal = rs.getString("ACCT_CODE__SAL");
-					cctrCodeSal = rs.getString("CCTR_CODE__SAL");
-					remark = rs.getString("REMARKS");
-					remark2 = rs.getString("REMARKS2");
-					remark3 = rs.getString("REMARKS3");
-					custPord = rs.getString("CUST_PORD");
-					quotNo = rs.getString("QUOT_NO");
-					taxOpt = rs.getString("TAX_OPT");
-					priceList = rs.getString("PRICE_LIST");
-					partyQty = rs.getString("PART_QTY");
+					accCodeSal = checkNull(rs.getString("ACCT_CODE__SAL"));
+					cctrCodeSal = checkNull(rs.getString("CCTR_CODE__SAL"));
+					remark = checkNull(rs.getString("REMARKS"));
+					remark2 = checkNull(rs.getString("REMARKS2"));
+					remark3 = checkNull(rs.getString("REMARKS3"));
+					custPord = checkNull(rs.getString("CUST_PORD"));
+					quotNo = checkNull(rs.getString("QUOT_NO"));
+					taxOpt = checkNull(rs.getString("TAX_OPT"));
+					priceList = checkNull(rs.getString("PRICE_LIST"));
+					partyQty = checkNull(rs.getString("PART_QTY"));
 					exchRate = rs.getDouble("EXCH_RATE");
-					tranCode = rs.getString("TRAN_CODE");
-					frtTerm = rs.getString("FRT_TERM");
+					tranCode = checkNull(rs.getString("TRAN_CODE"));
+					frtTerm = checkNull(rs.getString("FRT_TERM"));
 					frtAmt = rs.getDouble("FRT_AMT");
-					currCodeFrt = rs.getString("CURR_CODE__FRT");
-					salesPers = rs.getString("SALES_PERS");
+					currCodeFrt = checkNull(rs.getString("CURR_CODE__FRT"));
+					salesPers = checkNull(rs.getString("SALES_PERS"));
 					commPerc = rs.getDouble("COMM_PERC");
 					commPerc1 = rs.getDouble("COMM_PERC_1");
 					commPerc2 = rs.getDouble("COMM_PERC_2");
-					commPercOn = rs.getString("COMM_PERC__ON");
-					commPercOn2 = rs.getString("COMM_PERC_ON_2");
-					commPercOn2= commPercOn2 == null ? "" : commPercOn2;//added by nandkumar gadkari on 16/12/19
+					commPercOn = checkNull(rs.getString("COMM_PERC__ON"));
+					commPercOn2 = checkNull(rs.getString("COMM_PERC_ON_2"));
+					//commPercOn2= commPercOn2 == null ? "" : commPercOn2;//added by nandkumar gadkari on 16/12/19
 					advPerc = rs.getDouble("ADV_PERC");
-					distRoute = rs.getString("DIST_ROUTE");
-					consumeFc = rs.getString("CONSUME_FC");
-					projCode = rs.getString("PROJ_CODE");
+					distRoute = checkNull(rs.getString("DIST_ROUTE"));
+					consumeFc = checkNull(rs.getString("CONSUME_FC"));
+					projCode = checkNull(rs.getString("PROJ_CODE"));
 					udfNum1 = rs.getDouble("UDF__NUM1");
 					udfNum2 = rs.getDouble("UDF__NUM2");
-					udfStr1 = rs.getString("UDF__STR1");
-					udfStr3 = rs.getString("UDF__STR3");
+					udfStr1 = checkNull(rs.getString("UDF__STR1"));
+					udfStr3 = checkNull(rs.getString("UDF__STR3"));
 					udfDate = rs.getTimestamp("UDF__DATE1");
-					salesPers1 = rs.getString("SALES_PERS__1");
-					salesPers2 = rs.getString("SALES_PERS__2");
-					currCodeCom = rs.getString("CURR_CODE__COMM");
-					currCodeCom1 = rs.getString("CURR_CODE__COMM_1");
-					currCodeCom2 = rs.getString("CURR_CODE__COMM_2");
-					siteCode = rs.getString("SITE_CODE");
-					dlvTerm = rs.getString("DLV_TERM");
-					crTerm = rs.getString("CR_TERM");
+					salesPers1 = checkNull(rs.getString("SALES_PERS__1"));
+					salesPers2 = checkNull(rs.getString("SALES_PERS__2"));
+					currCodeCom = checkNull(rs.getString("CURR_CODE__COMM"));
+					currCodeCom1 = checkNull(rs.getString("CURR_CODE__COMM_1"));
+					currCodeCom2 = checkNull(rs.getString("CURR_CODE__COMM_2"));
+					siteCode = checkNull(rs.getString("SITE_CODE"));
+					dlvTerm = checkNull(rs.getString("DLV_TERM"));
+					crTerm = checkNull(rs.getString("CR_TERM"));
 					// 09-08-2006 manoharan
 					siteCodeShip = rs.getString("SITE_CODE__SHIP");
 					// end 09-08-2006 manoharan
@@ -1932,6 +1932,7 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 					conn.rollback();
 					System.out.println("Inside else");
 					retString = itmDBAccessEJB.getErrorString("","VTPROUNSU2","","",conn);    //added by manish mhatre on 11-nov-2019
+					System.out.println("retstring>>>>>>"+retString);
 					return retString;
 				}
 			}
@@ -2556,6 +2557,15 @@ private static void writeLog(File f,String ex,boolean flag)
 		}
 		return input.trim();
 	}
+	
+	private String checkNull(String input)
+	{
+		if (input == null || "null".equalsIgnoreCase(input) || "undefined".equalsIgnoreCase(input))
+		{
+			input= "";
+		}
+		return input.trim();
+	}
 
 /*	private void writeException(Exception e)
 	{