source merge by sumit sarkar

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

webitm-dis/ibase/webitm/ejb/dis/.directory

+[Dolphin]
+SortOrder=1
+Sorting=2
+Timestamp=2012,11,28,16,10,37
+ViewMode=1

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

@@ -10,7 +10,7 @@ import java.util.*;
 import java.util.Date;
 import java.sql.*;
 import java.io.*;
-import webitm4.*;
+//import webitm4.*;
 //import SessionManager.*;
 import org.omg.CORBA.ORB;
 import org.w3c.dom.*;
@@ -137,7 +137,11 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 		java.sql.Timestamp dueDate =  null;
 		java.sql.Timestamp dateFr =  null;
 		//added by Kunal on 22/10/12 end
-
+		
+		//Changed by sumit on 27/11/12 start
+		String waveFlagRet = "";
+		String wavesql = "";
+		//Changed by sumit on 27/11/12 end
 		
 		Connection conn = null;
 		ResultSet rs=null,rsDealloc= null,rs1=null;
@@ -277,6 +281,20 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 				return errString;
 			}
+			//Changed by sumit on 27/11/12 getting value of wave_flag start
+			waveFlagRet = genericUtility.getColumnValue("wave_flag",headerDom);
+			System.out.println(" sumit - waveFlagRet ["+waveFlagRet+"]");
+			if( !"B".equalsIgnoreCase(waveFlagRet) || "Y".equalsIgnoreCase(waveFlagRet) || "N".equalsIgnoreCase(waveFlagRet) )
+			{
+				System.out.println(" in side 'B' ");
+				wavesql = " AND CASE WHEN SORDALLOC.WAVE_FLAG IS NULL THEN 'N' ELSE SORDALLOC.WAVE_FLAG END = ? ";
+			}
+		   else
+		   {
+			   wavesql = " ";
+		   }
+			System.out.println(" wavesql ["+wavesql+"]");
+			//Changed by sumit on 27/11/12 getting value of wave_flag end			
 			
 			//added by Kunal on 22/10/12 
 			
@@ -287,6 +305,8 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 					       +" SORDALLOC.QTY_ALLOC   PENDING_QUANTITY," //SORDITEM.QTY_ALLOC - SORDITEM.QTY_DESP  PENDING_QUANTITY,"
 					       +" SORDALLOC.LOT_NO,SORDALLOC.LOT_SL,SORDALLOC.LOC_CODE, "
 					       +" ITEM.GTIN_CASE,SORDITEM.ITEM_CODE,SORDER.SITE_CODE__SHIP ,ITEM.GTIN_UNIT "   //added by Kunal on 22/10/12
+					       //Changed by sumit on 26/11/12 retrieve wave flag
+					       +", CASE WHEN SORDALLOC.WAVE_FLAG IS NULL THEN 'N' ELSE SORDALLOC.WAVE_FLAG END AS WAVE_FLAG "
 					       +" FROM SORDDET,SORDALLOC,SORDITEM,CUSTOMER,ITEM, SORDER  "
 						   +" WHERE SORDER.SALE_ORDER = SORDDET.SALE_ORDER AND "
 						   +"(SORDALLOC.SALE_ORDER = SORDDET.SALE_ORDER ) AND "
@@ -311,8 +331,11 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 						   +"AND CASE WHEN SORDDET.STATUS IS NULL THEN 'P' ELSE SORDDET.STATUS end <> 'C' "
 						   +"AND CASE WHEN SORDALLOC.STATUS IS NULL THEN 'P' ELSE SORDALLOC.STATUS end = 'P' "
 						   +"AND SORDITEM.QTY_ALLOC - SORDITEM.QTY_DESP > 0 "
-						   +"AND SORDITEM.LINE_TYPE = 'I'"
-						   +"ORDER BY SORDER.SALE_ORDER,SORDITEM.EXP_LEV,SORDITEM.ITEM_CODE__ORD";
+						   +"AND SORDITEM.LINE_TYPE = 'I'"	   
+						   //Changed by sumit on 27/11/12 adding wave flag condition in case of both wave						   
+						   +wavesql+
+						   "ORDER BY SORDER.SALE_ORDER,SORDITEM.EXP_LEV,SORDITEM.ITEM_CODE__ORD";
+							
 				pstmt = conn.prepareStatement(getDataSql);
 				pstmt.setString(1,siteCode);
 				pstmt.setString(2,saleOrderFr);
@@ -325,7 +348,12 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 				pstmt.setTimestamp(9,dateTo);
 				pstmt.setString(10,itemCodeFr);
 				pstmt.setString(11,itemCodeTo);
-				
+				//Changed by sumit on 27/11/12 adding parameter start
+				if( !"B".equalsIgnoreCase(waveFlagRet) || "Y".equalsIgnoreCase(waveFlagRet) || "N".equalsIgnoreCase(waveFlagRet) )
+				{
+					pstmt.setString(12,waveFlagRet);
+				}
+				//Changed by sumit on 27/11/12 adding parameter end
 				st = conn.createStatement();
 				rs = pstmt.executeQuery();
 
@@ -359,6 +387,9 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 						retTabSepStrBuff.append(rs.getString(1)).append("\t");
 						//LINE_NO
 						retTabSepStrBuff.append(rs.getString(2)).append("\t");
+						//Changed by sumit on 27/11/12 adding wave_flag
+						//WAVE_FLAG
+						retTabSepStrBuff.append(rs.getString("WAVE_FLAG")).append("\t");
 						//EXP_LEV
 						retTabSepStrBuff.append(rs.getString(3)).append("\t");
 						//CUST_CODE
@@ -625,7 +656,8 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 		double DeallocQty = 0;
 		double quantity = 0;
 		String errString = " ";
-
+		//Changed by sumit on 27/11/12 
+		String waveFlag = "";
 		Connection conn = null;
 
 		int parentNodeListLength = 0;
@@ -727,18 +759,34 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 						allocLineno = childNode.getFirstChild().getNodeValue();
 						System.out.print("allocLineno::::"+ allocLineno );
 					}
+					if (childNodeName.equals("wave_flag"))
+					{
+						waveFlag = childNode.getFirstChild().getNodeValue();
+						System.out.print("waveFlag :*::"+ allocLineno );
+					}
 
 				}//inner for loop
-				if(DeallocQty > 0)
+				System.out.println(" sumit wave flag - >["+waveFlag+"]");
+				//Changed by sumit on 27/11/12 error msg if wave done condition start.
+				//if(DeallocQty > 0 )
+				if( "Y".equalsIgnoreCase(waveFlag))
+				{					
+					errString="VTWAPROALL";
+					errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
+					System.out.println(" error ["+errString+"]");
+					return errString;
+				}				
+				else if(DeallocQty > 0 && "N".equalsIgnoreCase(waveFlag))
 				{
-					System.out.println("if calling........");
+				//Changed by sumit on 27/11/12 error msg if wave done condition end.					
+					System.out.println("if calling...*....");
 					errString = sorderDeAllocate(saleOrder, lineNo, itemCode, DeallocQty, expLev,custCode,lotSl,lotNo,locCode,tranId,allocLineno);
 					if (errString != null && errString.trim().length() > 0)
 					{
 						System.out.println("errString :"+errString);
 						return errString;
 					}
-				}
+				}				
 
 			}// out for loop
 
@@ -781,6 +829,12 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 				errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
 				return errString;
 			}
+			//Changed by sumit on 27/11/12 showing wave messages start.
+			else if (errString.contains("VTWAPROALL"))
+			{				
+				return errString;
+			}
+			//Changed by sumit on 27/11/12 showing wave messages end.
 			else
 			{
 				errString="VTPRCERR";
@@ -788,7 +842,7 @@ public class StockDeallocationPrc extends ProcessEJB implements StockDeallocatio
 				return errString;
 
 			}
-		}
+		}	
 
 	}