updated

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

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

@@ -224,23 +224,58 @@ public class RpermitGenPrc extends ProcessEJB implements RpermitGenPrcLocal,Rper
 				comp2= pattern2.reverse().toString();
 				numStr1 = getter1.reverse().toString();
 				numStr2 = getter2.reverse().toString();
+				String incNumFr = "",incNumTo = ""; // ADDED ON 22/07/14 START
+				boolean countnum = true;
 				System.out.println("numStr1:"+numStr1+"numStr2:"+numStr2);
-				if(numStr1.trim().length() > 0 && numStr2.trim().length() > 0 )
+				for(int i = 0; i <=numStr2.length()-1;i++)
 				{
-				numFr = Integer.parseInt(numStr1);
-				numTo = Integer.parseInt(numStr2);
+					try{
+					if(Character.toString(numStr1.charAt(i)).equals(Character.toString(numStr2.charAt(i))) && countnum)
+					{
+						comp1 =  comp1+numStr1.charAt(i);
+						comp2 =  comp2+numStr2.charAt(i);
+					}else
+					{
+//						if(countnum)
+//						{
+//							comp1 =  comp1.substring(0,comp1.length()-1);
+//							comp2 =  comp2.substring(0,comp2.length()-1);
+//						}
+						countnum = false;
+						incNumFr = incNumFr + numStr1.charAt(i);
+						incNumTo = incNumTo + numStr2.charAt(i);
+					}
+					}
+					catch(StringIndexOutOfBoundsException ex)
+					{
+						incNumTo = incNumTo + numStr2.charAt(i);
+//						continue;
+					}
+				}
+//				if(numStr1.trim().length() > 0 && numStr2.trim().length() > 0 )
+//				{  
+////					numFr = Integer.parseInt(numStr1); 
+////					numTo = Integer.parseInt(numStr2);
+//				}
+				System.out.println("comp1:"+comp1+"comp2:"+comp2);
+				System.out.println("incNumFr:"+incNumFr+"incNumTo:"+incNumTo);
+				if(!comp1.equals(comp2))
+				{
+					errString = itmDBAccessEJB.getErrorString("","VPPATERN1    ","","",conn);
+					return errString;
 				}
+				if(incNumFr.trim().length() > 0 && incNumTo.trim().length() > 0 )
+				{  
+					numFr = Integer.parseInt(incNumFr); 
+					numTo = Integer.parseInt(incNumTo);
+				}													// ADDED ON 22/07/14 START
 				else
 				{
 					errString = itmDBAccessEJB.getErrorString("","VPINVRANG2    ","","",conn);
 					return errString;	
 				}
 				//if(!comp1.equals(comp2) || countCharTo!= countCharFr)
-				if(!comp1.equals(comp2))
-				{
-					errString = itmDBAccessEJB.getErrorString("","VPPATERN1    ","","",conn);
-					return errString;
-				}
+				
 				if(numFr > numTo)
 				{
 					errString = itmDBAccessEJB.getErrorString("","VPINVRANG   ","","",conn);
@@ -250,8 +285,10 @@ public class RpermitGenPrc extends ProcessEJB implements RpermitGenPrcLocal,Rper
 				{
 					hmap.put("pattern1", comp1);
 					hmap.put("pattern2", comp2);
-					hmap.put("getter1", numStr1);
-					hmap.put("getter2", numStr2);
+//					hmap.put("getter1", numStr1);
+//					hmap.put("getter2", numStr2);
+					hmap.put("getter1", incNumFr);
+					hmap.put("getter2", incNumTo);
 				}
 			}
 			if(errString == null || errString.trim().length() == 0)
@@ -336,6 +373,7 @@ public class RpermitGenPrc extends ProcessEJB implements RpermitGenPrcLocal,Rper
 		int rpermitNoTo = 0,rpermitNoFr = 1;
 		int inRows=0,range= 0,num = 0,cnt=0;
 		String zeros="",numStr="",finEntity="",remarks="";
+		
 		String stateCodeTo = "",rpermitFr="",rpermitTo="",pattern1="";
 		try   
 		{
@@ -392,7 +430,7 @@ public class RpermitGenPrc extends ProcessEJB implements RpermitGenPrcLocal,Rper
 						" STATUS,CHG_DATE,CHG_USER,CHG_TERM,REMARKS,FIN_ENTITY,STATE_CODE__TO,tran_mode)  values ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?) ";
 			
 			    pstmt = conn.prepareStatement(sql);
-			    pstmt.setString(1, pattern1+rpermitFr);
+			    pstmt.setString(1, (pattern1+rpermitFr).trim());
 			    pstmt.setString(2, "");
 			    pstmt.setString(3, "");
 			    pstmt.setString(4, "");