If any pending / incomplete Wave found against sale order then it gives error

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

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

@@ -925,10 +925,13 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 
 		PreparedStatement pstmt = null;
 		Statement st = null; 
-		int elements = 0;
+		int elements = 0,elements1 = 0;
 		ArrayList list = new ArrayList();
+		ArrayList list1 = new ArrayList();
 		boolean flag  = false,isFlag = true,allocqtyflag = false;
 		ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
+		String sql = "",shipStatus="";
+		
 		try
 		{
 			chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
@@ -973,7 +976,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 						itemCode = childNode.getFirstChild().getNodeValue();
 					}
 
-					if (childNodeName.equals("qty_alloc"))
+					if (childNodeName.equals("qty_alloc"))  //qty_alloc
 					{
 						allocQty = Double.parseDouble(childNode.getFirstChild().getNodeValue());
 					}
@@ -1046,6 +1049,45 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 						elements ++;
 					}
 				}		//added by ritesh on 07/10/13 for request DI3ESUN009 END
+				
+				// added by cpatil on 27/11/13 as per manoj sir instruction start
+				
+				if(saleOrder != null && saleOrder.trim().length() > 0 )
+				{
+					sql = " select ship_status from sorder where sale_order = ?  ";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1,saleOrder);
+					rs = pstmt.executeQuery();
+					if(rs.next())
+					{
+						shipStatus = rs.getString("ship_status"); 
+					}
+					pstmt.close();pstmt = null;
+					rs.close();rs = null;
+					
+					if( "P".equalsIgnoreCase(shipStatus))
+					{
+						if( allocQty > 0 )
+						{
+							System.out.println("@@@@@@saleOrder["+saleOrder+"]::shipStatus["+shipStatus+"]::allocQty["+allocQty+"]");
+							flag = true;
+							errString = "PROCSUCC"; //  "VTALLQTYSO";
+							errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
+						}
+						if( errString != null && errString.trim().length() > 0 && flag == true )
+						{
+							if( !(list1.contains(saleOrder)))
+							{
+								isFlag = false;
+								list1.add(saleOrder);
+								elements1 ++;
+							}
+						}
+					}
+				}
+				// added by cpatil on 27/11/13 as per manoj sir instruction end
+				
+				
 				if(allocQty > 0 && flag == false)			
 				{
 					System.out.println("if calling........");	
@@ -1078,12 +1120,18 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 			{
 				if(allocqtyflag = true)
 				{
-					errString = "VTACTALW2"; 
+					System.out.println("@@@@@ inside if["+errString+"]");
+					// errString = "VTACTALW2"; 
+					errString = "PROCSUCC"; 
 					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" ;
+				if(elements > 0 )
+				{ 
+					mainStr	= mainStr + "Invalid quantity,Entered quantity is not in multiple of Case/shipper Quantity.\n";
+				}
 				for(int i = 0; i < elements * 4;i++)
 				{
 					if( i > 0)
@@ -1093,6 +1141,17 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
 					mainStr = mainStr + 
 							"sale order :"+list.get(i++)+ ",line no :"+ list.get(i++) + ",item code :"+list.get(i++)+",quantity :"+list.get(i++)+"\n" ;
 				}
+				if(elements1 > 0 )
+				{ 
+					mainStr = mainStr + "\n pending / incomplete Wave found against sale order.\n";
+					mainStr = mainStr + "\n Sale Order : ";
+				}
+								
+				for(int i = 0; i < elements1 ;i++)
+				{
+					mainStr = mainStr + "  "+list1.get(i)+ "," ;
+				}
+				
 				mainStr = mainStr +  endPart;	
 				errString = mainStr;
 				begPart =null;

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

@@ -769,11 +769,14 @@ public class StockDeallocationPrc  extends ProcessEJB  implements StockDeallocat
 		String siteCodeShip="";
 		String activeAllow = "";
 		ArrayList list = new ArrayList();
+		ArrayList list1 = new ArrayList();
 		boolean flag  = false,isFlag = true,allocqtyflag = false;
 		double qtyAvailAlloc = 0;
-		int elements = 0;
+		int elements = 0,elements1 = 0;
 	    ConnDriver connDriver = new ConnDriver();	//added by rajendra on 02/11/07
 		ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
+		String sql = "",shipStatus="";
+		
 		try
 		{
 			chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
@@ -931,6 +934,46 @@ public class StockDeallocationPrc  extends ProcessEJB  implements StockDeallocat
 				}		//added by ritesh on 10/10/13 for request DI3GSUN017 END
 				
 				
+// added by cpatil on 27/11/13 as per manoj sir instruction start
+				
+				if( saleOrder != null && saleOrder.trim().length() > 0 )
+				{
+					sql = " select ship_status from sorder where sale_order = ?  ";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1,saleOrder);
+					rs = pstmt.executeQuery();
+					if(rs.next())
+					{
+						shipStatus = rs.getString("ship_status"); 
+					}
+					pstmt.close();pstmt = null;
+					rs.close();rs = null;
+					
+					if( "P".equalsIgnoreCase(shipStatus))
+					{
+						if( DeallocQty > 0 )
+						{
+							System.out.println("@@@@@@saleOrder["+saleOrder+"]::shipStatus["+shipStatus+"]::DeallocQty["+DeallocQty+"]");
+							flag = true;
+							errString = "PROCSUCC";    //errString =    "VTDALQTYSO";
+							errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
+						}
+						if( errString != null && errString.trim().length() > 0 && flag == true )
+						{
+							if( !(list1.contains(saleOrder)))
+							{
+								isFlag = false;
+								list1.add(saleOrder);
+								elements1 ++;
+							}
+						}
+					}
+					
+				}
+				// added by cpatil on 27/11/13 as per manoj sir instruction end
+				
+				
+				
 				System.out.println(" sumit wave flag - >["+waveFlag+"]");
 				//Changed by sumit on 27/11/12 error msg if wave done condition start.
 				//if(DeallocQty > 0 )
@@ -979,12 +1022,18 @@ public class StockDeallocationPrc  extends ProcessEJB  implements StockDeallocat
 			{
 				if(allocqtyflag = true)
 				{
-					errString = "VTACTALW2"; 
+					System.out.println("@@@@@ inside if["+errString+"]");
+					// errString = "VTACTALW2"; 
+					errString = "PROCSUCC"; 
 					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" ;
+				if(elements > 0 )
+				{ 
+					mainStr	= mainStr + "Invalid quantity,Entered quantity is not in multiple of Case/shipper Quantity.\n";
+				}
 				for(int i = 0; i < elements * 4;i++)
 				{
 					if( i > 0)
@@ -992,14 +1041,26 @@ public class StockDeallocationPrc  extends ProcessEJB  implements StockDeallocat
 						i -= 1;
 					}
 					mainStr = mainStr + 
-					        "sale order :"+list.get(i++)+ ",line no :"+ list.get(i++) + ",item code :"+list.get(i++)+",quantity :"+list.get(i++)+"\n" ;
+							"sale order :"+list.get(i++)+ ",line no :"+ list.get(i++) + ",item code :"+list.get(i++)+",quantity :"+list.get(i++)+"\n" ;
+				}
+				if(elements1 > 0 )
+				{ 
+					mainStr = mainStr + "\n pending / incomplete Wave found against sale order.\n";
+					mainStr = mainStr + "\n Sale Order : ";
 				}
+								
+				for(int i = 0; i < elements1 ;i++)
+				{
+					mainStr = mainStr + "  "+list1.get(i)+ "," ;
+				}
+				
 				mainStr = mainStr +  endPart;	
 				errString = mainStr;
 				begPart =null;
 				endPart =null;
-				mainStr =null;
+				mainStr =null;	
 				return errString;
+
 			}
 
 		}//try end
@@ -1045,8 +1106,8 @@ public class StockDeallocationPrc  extends ProcessEJB  implements StockDeallocat
 			{				
 				return errString;
 			}
-			//Changed by sumit on 27/11/12 showing wave messages end.
-			else if(errString.indexOf("VTACTALW2") > -1 || errString.indexOf("VTACTALW3") > -1 || errString.indexOf("VTACTALW") > -1)
+			//Changed by sumit on 27/11/12 showing wave messages end.  // PROCSUCC
+			else if(errString.indexOf("VTACTALW2") > -1 || errString.indexOf("VTACTALW3") > -1 || errString.indexOf("VTACTALW") > -1 || errString.indexOf("PROCSUCC") > -1)
 			{
 				return errString;
 			}