process complete time display batch id

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

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

@@ -1350,7 +1350,6 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 					rs=null;
 					pstmt.close();
 					pstmt =null;
-
 					siteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
 					String xmlValues = "";
 					String tranDateStr = getCurrdateAppFormat();
@@ -1569,6 +1568,14 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 				}
 				//added by kunal on 27/dec/13 end
 				
+				//Start Added by chandrashekar on 12-Feb-2015
+				System.out.println("errString>>>>["+errString+"]");
+				System.out.println("batchId>>>>"+batchId);
+				if(errString.indexOf("VTPROC") > -1)
+				{
+					mainStr = begPart + "Following Batch id generated :" +batchId;
+				}
+				//End Added by chandrashekar on 12-Feb-2015
 				
 				System.out.println(" @@@@@@@mainStr "+mainStr);
 				mainStr = mainStr +  endPart;		System.out.println(" @@@@@@@mainStr+endPart "+mainStr);
@@ -1580,6 +1587,35 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 				return errString;
 
 			}
+			else
+			{ 
+				if (errString == null || errString.trim().length() == 0)
+				{
+					conn.commit();	
+					errString="VTCOMPL";
+					errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
+					String begPart = errString.substring( 0, errString.indexOf("<trace>") + 7 );
+					String endPart = errString.substring( errString.indexOf("</trace>"));
+					String mainStr = "";
+					mainStr = begPart + "Following Batch id generated : " +batchId;
+					mainStr = mainStr +  endPart;	
+					errString = mainStr;
+					begPart =null;
+					endPart =null;
+					mainStr =null;	
+					System.out.println("after errString=="+errString);
+					return errString;
+				}
+				else
+				{
+					conn.rollback();
+					errString="VTPRCERR";
+					errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
+					return errString;
+				}
+				
+			}//else block added by chandrashekar on 13-02-15
+			
 			//added by ritesh on 07/10/13 for request DI3ESUN009 end
 
 			/*Commented By Manoj Sharma dtd 29/032012 Not required as discussed with Manohar Sir
@@ -1594,6 +1630,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 				}
 			}*/	
 			//added by kunal on 27/12/12 
+			/*System.out.println("errString@@@@@@["+errString+"]");
 			if (errString == null || errString.trim().length() == 0)
 			{
 				conn.commit();	
@@ -1602,12 +1639,12 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 				return errString;
 			}
 			else
-			{
+			{	conn.rollback();
 				errString="VTPRCERR";	
 				errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
 				return errString;
 
-			}
+			}*/
 			//added by kunal on 27/12/12
 
 		}//try end