On split the length as well as the prefix retained in all packing instructions

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

webitm-dis/ibase/webitm/ejb/dis/adv/InvPackAct.java

@@ -552,8 +552,9 @@ public class InvPackAct extends ActionHandlerEJB implements InvPackActLocal, Inv
 		GenericUtility genericUtility = GenericUtility.getInstance();
 		ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB();
 		PreparedStatement pstmt = null; // 12/03/12 manoharan
-		String locDescr = "";
+		String locDescr = "", prefix = "",lead = "";
 		double tareTmp = 0, grossTmp = 0, netTmp = 0; 
+		int strLength = 0, numLength = 0;
 		try
 		{
 			conn = connDriver.getConnectDB("DriverITM");
@@ -614,7 +615,13 @@ public class InvPackAct extends ActionHandlerEJB implements InvPackActLocal, Inv
 				{
 					retTokens = genericUtility.getTokenList(packInst, "-");
 					System.out.println("retTokens :"+retTokens.size());
-					str = retTokens.get(1).toString();
+					//str = retTokens.get(1).toString();
+					str = retTokens.get(0).toString();
+					strLength = retTokens.get(1).toString().length();
+					if (strLength == 0)
+					{
+						strLength = retTokens.get(0).toString().length();
+					}
 					for (int j = 0; j < str.length(); j++)
 					{
 						ch = str.charAt(j);
@@ -624,20 +631,39 @@ public class InvPackAct extends ActionHandlerEJB implements InvPackActLocal, Inv
 							value1 = value1 + ch;
 							System.out.println("Value1 :"+value1);
 						}
+						else
+						{
+							prefix = prefix + ch;
+						}
 					}//for end
 					retNumber = Long.parseLong(value1);
 					if (retNumber == 0)
 					{
 						retNumber = 1;
 					}
-					retTokens = genericUtility.getTokenList(str, String.valueOf(retNumber));
-					System.out.println("retTokens --:"+retTokens.size());
-					str = retTokens.get(1).toString();
-					System.out.println("str :"+str);
+					// 20/09/14 manoharan in case the entered range is like R1-R500 the str is failed as the 
+					// the number 1 is not there in the 
+					//retTokens = genericUtility.getTokenList(str, String.valueOf(retNumber));
+					//System.out.println("retTokens --:"+retTokens.size());
+					//str = retTokens.get(1).toString();
+					System.out.println("prefix ["+prefix + "]");
+					
+					// 
 				}//end if
 				else
 				{
-					retNumber = 1;
+					if (packInst.indexOf("-") > -1)
+					{
+						retTokens = genericUtility.getTokenList(packInst, "-");
+						retNumber = Long.parseLong(retTokens.get(0).toString());
+						strLength = retTokens.get(1).toString().length();
+					}
+					else
+					{
+						retNumber = Long.parseLong(packInst);
+						strLength = packInst.length();
+					}
+					
 				}
 				// 12/03/12 manoharan
 				sql =  "SELECT DESCR FROM LOCATION WHERE LOC_CODE = ?";
@@ -652,7 +678,15 @@ public class InvPackAct extends ActionHandlerEJB implements InvPackActLocal, Inv
 				rs.close();
 				pstmt = null;
 				rs = null;
-
+				if (strLength > 0 && prefix.length() > 0 )
+				{
+					numLength = strLength - prefix.length();
+				}
+				else 
+				{
+					numLength = strLength;
+				}
+				System.out.println("strLength ["+strLength + "] retNumber [" + retNumber + "] prefix [" + prefix + "] numLength [" + numLength + "]");
 				for (int i = 0; i < Integer.parseInt(noArt); i++)
 				{
 					// 01/07/13 manoharan lot_sl found with spaces
@@ -693,14 +727,21 @@ public class InvPackAct extends ActionHandlerEJB implements InvPackActLocal, Inv
 
 					valueXmlString.append("<location_descr isSrvCallOnChg='0'>").append("<![CDATA[").append(locDescr).append("]]>").append("</location_descr>\r\n");
 					// end 12/03/12 manoharan
-					if (!checkIsNumber(str))
-					{
-						packInst = str + String.valueOf(retNumber);
-					}
-					else
+					if (numLength > 0 && String.valueOf(retNumber).length() < numLength)
 					{
-						packInst = String.valueOf(retNumber);
+						lead = "000000000000000".substring( "000000000000000".length() - (numLength - (String.valueOf(retNumber).length()) ));
 					}
+					System.out.println("strLength ["+strLength + "] retNumber [" + retNumber + "] prefix [" + prefix + "] lead [" + lead + "] numLength [" + numLength + "]");
+					//if (!checkIsNumber(str))
+					//{
+					//	packInst = str + String.valueOf(retNumber);
+					//}
+					//else
+					//{
+					//	packInst = String.valueOf(retNumber);
+					//}
+					
+					packInst = prefix + lead + String.valueOf(retNumber);
 					valueXmlString.append("<pack_instr isSrvCallOnChg='0'>").append("<![CDATA[").append(packInst).append("]]>").append("</pack_instr>\r\n");
 					valueXmlString.append("</Detail>\r\n");
 					retNumber = retNumber + 1;