change for error msg

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

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

@@ -740,7 +740,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 		Statement st = null; 
 		int elements = 0;
 		ArrayList list = new ArrayList();
-		boolean flag  = false;
+		boolean flag  = false,isFlag = true,allocqtyflag = false;
 		ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
 		try
 		{
@@ -755,6 +755,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 			System.out.println("parentNodeListLength------------------->"+parentNodeListLength);
 			for (int selectedRow = 0; selectedRow < parentNodeListLength; selectedRow++)
 			{
+				flag  = false;
 				parentNode = parentNodeList.item(selectedRow);
 
 				childNodeList = parentNode.getChildNodes();
@@ -835,27 +836,28 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 							 if(allocQty % shipperSize != 0)
 							 {
 								System.out.println("==activeAllow validate 4 N ==");
-							errString = itmDBAccessEJB.getErrorString("","VTACTALW2","","",conn);
+								flag = true;
+								errString = "VTACTALW2"; 
+								errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
 							 }
 						 }
 						 catch(ArithmeticException ex)
 						 {
 							System.out.println("==ArithmeticException==");
-						errString = itmDBAccessEJB.getErrorString("","VTACTALW3","","",conn);
+							flag = true;
+							errString = "VTACTALW3";
+							errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
 						
 						 }
-						if( errString != null && errString.trim().length() > 0 )
+						if( errString != null && errString.trim().length() > 0 && flag == true)
 						{
-							flag = true;
-							
+							isFlag = false;
 							list.add(saleOrder);
 							list.add(lineNo);
 							list.add(itemCode);
 							list.add(allocQty);
 							elements ++;
-							
 						}
-						 
 				}		//added by ritesh on 07/10/13 for request DI3ESUN009 END
 				if(allocQty > 0 && flag == false)			
 				{
@@ -865,10 +867,12 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 					{
 						System.out.println("@@@errString :"+errString);
 						return errString;
+					}else
+					{
+						allocqtyflag = true;
 					}
 				}else if(allocQty == 0) //added by kunal on 27/12/12 as per manoj instruction 
 				{
-					
 					updateSql = "UPDATE SORDDET SET HOLD_FLAG ='"+holdFlag+"'"
 					+ " WHERE SALE_ORDER = '" + saleOrder + " ' "
 					+ " AND LINE_NO = '" + lineNo + "' ";
@@ -882,8 +886,14 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 				}
 			}// out for loop 
 			//added by ritesh on 07/10/13 for request DI3ESUN009 start
-			if (errString != null && errString.trim().length() > 0)
+			//if (errString != null && errString.trim().length() > 0)
+			if(isFlag == false)
 			{
+				if(allocqtyflag = true)
+				{
+					errString = "VTACTALW2"; 
+					errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
+				}
 				String begPart = errString.substring( 0, errString.indexOf("<trace>") + 7 );
 				String endPart = errString.substring( errString.indexOf("</trace>"));
 				String mainStr = begPart + "Following error has occured\n" ;