Added CheckNull in Termcode

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

webitm-dis/src/ibase/webitm/ejb/dis/adv/PorderConf.java

@@ -1261,31 +1261,28 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
 			
 			ArrayList<String> termCodeList = new ArrayList();
 			
-			sql1=" SELECT PORD_TERM.PURC_ORDER,PORD_TERM.LINE_NO, PORD_TERM.TERM_CODE,PORD_TERM.DESCR,PORD_TERM.PRINT_OPT " +
-				 " FROM PORD_TERM WHERE PORD_TERM.PURC_ORDER = ? " +
-		    	 " ORDER BY PORD_TERM.LINE_NO ASC";
+			sql1="SELECT PURC_ORDER,LINE_NO,TERM_CODE,DESCR,PRINT_OPT FROM PORD_TERM WHERE PURC_ORDER = ? ORDER BY LINE_NO ASC";//Change By Mukesh Chauhan on 09/01/20
 		    pstmt1 = conn.prepareStatement(sql1);
 		    pstmt1.setString(1, pOrder);
 		    rs1 = pstmt1.executeQuery();
 		    while(rs1.next())
 		    {
 		    	termCode1 = checkNull(rs1.getString(3));
+		    	termCodeList.add(termCode1);//Change By Mukesh Chauhan on 09/01/2020
+		    	
 		    }
-		    termCodeList.add(termCode1);
-		    
 		    System.out.println("termCodeList>>"+termCodeList);
 		    rs1.close();rs1 = null;
 			pstmt1.close();pstmt1 = null;
 				
 			
-			sql = " select pur_term_table.term_code from pur_term_table where ( pur_term_table.term_table = ? )" +
-				  " and ( pur_term_table.mandatory = 'Y' )";
+			sql = "select term_code from pur_term_table where term_table = ? and mandatory = 'Y'";//Change By Mukesh Chauhan on 09/01/2020
 			pstmt = conn.prepareStatement(sql);
 		    pstmt.setString(1, termTable);
 		    rs = pstmt.executeQuery();
 		    while(rs.next())
 		    {
-		    	termCode = rs.getString(1);
+		    	termCode = checkNull(rs.getString(1));//Change By Mukesh Chauhan on 09/01/2020
 		    	
 		    	System.out.println("termCode1["+termCode1+"]termCode["+termCode+ "]");
 		    	if(termCodeList.contains(termCode))