Changed by Manish on 02/03/16 in case of DDUK.

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

webitm-wms/ibase/webitm/ejb/wms/DeallocArtIC.java

@@ -21,6 +21,7 @@ import ibase.ejb.*;
 import ibase.system.config.*;
 //import ibase.utility.BaseLogger;
 import ibase.webitm.ejb.*;
+import ibase.webitm.ejb.dis.DistCommon;
 import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
 
@@ -30,6 +31,10 @@ public class DeallocArtIC extends ValidatorEJB implements DeallocArtICRemote, De
 	/**
 	 * The method is defined without any parameter and returns blank string
 	 */
+	//Added By Manish on 02/03/16 for DDUK
+	DistCommon distCommon = new DistCommon();
+	String projectName = "";
+
 	public String wfValData() throws RemoteException,ITMException
 	{
 		return "";
@@ -704,7 +709,7 @@ public class DeallocArtIC extends ValidatorEJB implements DeallocArtICRemote, De
 		StringBuffer valueXmlString = new StringBuffer();		
 
 		GenericUtility genericUtility = GenericUtility.getInstance();
-
+		
 		try
 		{
 			String userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
@@ -718,7 +723,8 @@ public class DeallocArtIC extends ValidatorEJB implements DeallocArtICRemote, De
 			connDriver = new ConnDriver();
 			conn = connDriver.getConnectDB("DriverITM");
 			connDriver = null;
-
+			projectName = distCommon.getDisparams("999999","PROJECT",conn);  //Added By Manish on 02/03/16 for DDUK
+			
 			if( objContext != null && objContext.trim().length() > 0 )
 			{
 				currentFormNo = Integer.parseInt( objContext );
@@ -743,8 +749,22 @@ public class DeallocArtIC extends ValidatorEJB implements DeallocArtICRemote, De
 					valueXmlString.append( "<item_ser__to><![CDATA[" ).append( "ZZ" ).append( "]]></item_ser__to>\r\n" );
 					valueXmlString.append( "<item_code__fr><![CDATA[" ).append( "00" ).append( "]]></item_code__fr>\r\n" );
 					valueXmlString.append( "<item_code__to><![CDATA[" ).append( "ZZ" ).append( "]]></item_code__to>\r\n" );
-					valueXmlString.append( "<lot_no__fr><![CDATA[" ).append( "00" ).append( "]]></lot_no__fr>\r\n" );
+					
+					//Changed By Manish on 02/03/16 for DDUK [start]
+					/*valueXmlString.append( "<lot_no__fr><![CDATA[" ).append( "00" ).append( "]]></lot_no__fr>\r\n" );
 					valueXmlString.append( "<lot_no__to><![CDATA[" ).append( "ZZ" ).append( "]]></lot_no__to>\r\n" );
+					 */
+					if("DDUK".equals(projectName.trim()))
+					{
+						valueXmlString.append( "<lot_no__fr><![CDATA[" ).append( " " ).append( "]]></lot_no__fr>\r\n" );
+						valueXmlString.append( "<lot_no__to><![CDATA[" ).append( " " ).append( "]]></lot_no__to>\r\n" );
+					}
+					//Changed By Manish on 02/03/16 for DDUK [end]
+					else
+					{
+						valueXmlString.append( "<lot_no__fr><![CDATA[" ).append( "00" ).append( "]]></lot_no__fr>\r\n" );
+						valueXmlString.append( "<lot_no__to><![CDATA[" ).append( "ZZ" ).append( "]]></lot_no__to>\r\n" );
+					}
 					valueXmlString.append( "<sale_order__fr><![CDATA[" ).append( "00" ).append( "]]></sale_order__fr>\r\n" );
 					valueXmlString.append( "<sale_order__to><![CDATA[" ).append( "ZZ" ).append( "]]></sale_order__to>\r\n" );
 					valueXmlString.append( "<carton_no__fr><![CDATA[" ).append( "00" ).append( "]]></carton_no__fr>\r\n" );

webitm-wms/ibase/webitm/ejb/wms/DeallocArtPrc.java

 /*
     Window Name : w_wavegen
-*/
+ */
 
 package ibase.webitm.ejb.wms;
 
@@ -59,19 +59,20 @@ import org.w3c.dom.NodeList;
 @javax.ejb.Stateless
 public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,WaveGenerationPrcRemote //SessionBean
 {
-	
-	
+
+
 	InvAllocTraceBean invAllocTrace = new InvAllocTraceBean();
 	GenericUtility genericUtility = GenericUtility.getInstance();
 	ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();	
 	CommonConstants commonConstants = new CommonConstants();
 	DistCommon discommon = new DistCommon();
-	
+	String projectName = ""; //Added By Manish on 02/03/16 for DDUK
+
 	public String process() throws RemoteException,ITMException
 	{
 		return "";
 	}
-	
+
 	public String getData(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException,ITMException
 	{
 		String rtrStr = "";
@@ -102,7 +103,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 
 	public String getData(Document headerDom, Document detailDom, String windowName, String xtraParams) throws RemoteException,ITMException
 	{
-  
+
 		String errCode = "";
 		String errString = "";
 		String getDataSql= "" ;
@@ -132,7 +133,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 		String itemCode = "", tempItemCode = "";
 		int lineNoPick = 0;
 		double quantity = 0.0;
-		
+
 		Connection conn = null;
 		ResultSet rs = null;
 		ResultSet rs1 = null;
@@ -140,13 +141,14 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 		Statement st = null;
 		HashMap stockDetail = new HashMap();
 		StringBuffer retTabSepStrBuff = new StringBuffer();			
-		
+
 		try
 		{
 			ConnDriver connDriver = new ConnDriver();
 			SimpleDateFormat simpleDateFormat = new SimpleDateFormat(genericUtility.getDBDateFormat());
 			conn = connDriver.getConnectDB("DriverITM");
-			connDriver = null;			
+			connDriver = null;	
+			projectName = discommon.getDisparams("999999","PROJECT",conn);  //Added By Manish on 02/03/16 for DDUK
 			//siteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "site_code");
 			/*ptcn = genericUtility.getColumnValue("ptcn",headerDom);
 			if ( ptcn == null || ptcn.trim().length() == 0 )
@@ -170,7 +172,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 				return errString;
 			}
 			System.out.println(" saleOrderFr ["+saleOrderFr+"]");
-			
+
 			saleOrderTo = genericUtility.getColumnValue("sale_order__to",headerDom);         
 			if ( saleOrderTo == null || saleOrderTo.trim().length() == 0 )
 			{
@@ -178,7 +180,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 				return errString;
 			}
 			System.out.println(" saleOrderTo ["+saleOrderTo+"]");
-			
+
 			custCodeFr = genericUtility.getColumnValue("cust_code__fr",headerDom);
 			if ( custCodeFr == null || custCodeFr.trim().length() == 0 )
 			{
@@ -186,75 +188,121 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 				return errString;
 			}
 			System.out.println(" custCodeFr ["+custCodeFr+"]");
-			
+
 			custCodeTo = genericUtility.getColumnValue("cust_code__to",headerDom); 
 			if ( custCodeTo == null || custCodeTo.trim().length() == 0 )
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 				return errString;
 			}  
+			System.out.println(" custCodeTo ["+custCodeTo+"]");
 			custCodeDlvFr = genericUtility.getColumnValue("cust_code__dlv_fr",headerDom);
 			if ( custCodeDlvFr == null || custCodeDlvFr.trim().length() == 0 )
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 				return errString;
 			}
+			System.out.println(" custCodeDlvFr ["+custCodeDlvFr+"]");
 			custCodeDlvTo = genericUtility.getColumnValue("cust_code__dlv_to",headerDom); 
 			if ( custCodeDlvTo == null || custCodeDlvTo.trim().length() == 0 )
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 				return errString;
 			}  
+			System.out.println(" custCodeDlvTo ["+custCodeDlvTo+"]");
 			itemSerFr = genericUtility.getColumnValue("item_ser__fr",headerDom);
 			if ( itemSerFr == null || itemSerFr.trim().length() == 0 )
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 				return errString;
 			}
+			System.out.println(" itemSerFr ["+itemSerFr+"]");
 			itemSerTo = genericUtility.getColumnValue("item_ser__to",headerDom);
 			if ( itemSerTo == null || itemSerTo.trim().length() == 0 )
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 				return errString;
 			}
+			System.out.println(" itemSerTo ["+itemSerTo+"]");
 			itemCodeFr = genericUtility.getColumnValue("item_code__fr",headerDom);
 			if ( itemCodeFr == null || itemCodeFr.trim().length() == 0 )
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 				return errString;
 			}
+			System.out.println(" itemCodeFr ["+itemCodeFr+"]");
 			itemCodeTo = genericUtility.getColumnValue("item_code__to",headerDom);
 			if ( itemCodeTo == null || itemCodeTo.trim().length() == 0 )
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 				return errString;
 			}
-			lotNoFr = genericUtility.getColumnValue("lot_no__fr",headerDom);
+			System.out.println(" itemCodeTo ["+itemCodeTo+"]");
+
+			/*lotNoFr = genericUtility.getColumnValue("lot_no__fr",headerDom);
 			if ( lotNoFr == null || lotNoFr.trim().length() == 0 )
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 				return errString;
 			}
+			System.out.println(" lotNoFr ["+lotNoFr+"]");
 			lotNoTo = genericUtility.getColumnValue("lot_no__to",headerDom);
 			if ( lotNoTo == null || lotNoTo.trim().length() == 0 )
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 				return errString;
+			}*/
+			//Changed By Manish on 02/03/16 for DDUK [start]
+			if("DDUK".equals(projectName.trim()))
+			{
+				lotNoFr = genericUtility.getColumnValue("lot_no__fr",headerDom);
+				if ( lotNoFr == null || lotNoFr.length() == 0 )
+				{
+					errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+					return errString;
+				}
+				System.out.println(" lotNoFr ["+lotNoFr+"]");
+				lotNoTo = genericUtility.getColumnValue("lot_no__to",headerDom);
+				if ( lotNoTo == null || lotNoTo.length() == 0 )
+				{
+					errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+					return errString;
+				}
+				System.out.println(" lotNoTo ["+lotNoTo+"]");
+			}
+			else
+			{
+				lotNoFr = genericUtility.getColumnValue("lot_no__fr",headerDom);
+				if ( lotNoFr == null || lotNoFr.trim().length() == 0 )
+				{
+					errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+					return errString;
+				}
+				System.out.println(" lotNoFr ["+lotNoFr+"]");
+				lotNoTo = genericUtility.getColumnValue("lot_no__to",headerDom);
+				if ( lotNoTo == null || lotNoTo.trim().length() == 0 )
+				{
+					errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+					return errString;
+				}
+				System.out.println(" lotNoTo ["+lotNoTo+"]");
 			}
+			//Changed By Manish on 02/03/16 for DDUK [start]
 			cartonNoFr = genericUtility.getColumnValue("carton_no__fr",headerDom);
 			if ( cartonNoFr == null || cartonNoFr.trim().length() == 0 )
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 				return errString;
 			}
+			System.out.println(" cartonNoFr ["+cartonNoFr+"]");
 			cartonNoTo = genericUtility.getColumnValue("carton_no__to",headerDom);
 			if ( cartonNoTo == null || cartonNoTo.trim().length() == 0 )
 			{
 				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
 				return errString;
 			}
-			
-			
+			System.out.println(" cartonNoTo ["+cartonNoTo+"]");
+
 			/*getDataSql = " SELECT CM.CARTON_NO, POD.SALE_ORDER, POD.LINE_NO__SORD, CM.PICK_ORDER, CM.LINE_NO__PICK, " +
 					" POD.ITEM_CODE,  POD.LOC_CODE, POD.LOT_NO, POD.LOT_SL, WTD.WAVE_ID, POH.PICK_TYPE , POD.QUANTITY " +
 					" FROM CARTON_MASTER CM, PICK_ORD_DET POD , PICK_ORD_HDR POH, WAVE_TASK_DET WTD WHERE CM.PTCN = ? " +
@@ -264,88 +312,89 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 					" AND POH.PICK_TYPE IN (?,?) " +
 					//" AND ( FN_CHECK_DEALLOC_ARTDET(CM.PTCN, CM.CARTON_NO ) = 0 ) "+					
 					" AND CM.STATUS <> ? ORDER BY CM.CARTON_NO ";*/	
-			
+
 			getDataSql = " SELECT CM.CARTON_NO, POD.SALE_ORDER, POD.LINE_NO__SORD, CM.PICK_ORDER, CM.LINE_NO__PICK," +
-					" POD.ITEM_CODE,  POD.LOC_CODE, POD.LOT_NO, POD.LOT_SL, WTD.WAVE_ID, POD.QUANTITY , CUSTOMER.CUST_CODE, " +
-					" SORDER.ITEM_SER, WTD.PTCN, POH.PICK_TYPE FROM CARTON_MASTER CM, PICK_ORD_DET POD , PICK_ORD_HDR POH, WAVE_TASK_DET WTD , " +
-					" WAVE_TASK WAVE_TASK, SORDER SORDER, CUSTOMER CUSTOMER , DESPATCH DESPATCH " +
-					" WHERE CM.PICK_ORDER = POD.PICK_ORDER " +
-					" AND POH.PICK_ORDER = POD.PICK_ORDER " +
-					" AND CM.LINE_NO__PICK = POD.LINE_NO AND WTD.PTCN = CM.PTCN " +
-					" AND WTD.REF_ID = CM.PICK_ORDER " +
-					
-					" AND POH.PICK_TYPE IN ('C','M') " +
-					" AND SORDER.SITE_CODE__SHIP = ? "+
-					" AND SORDER.SALE_ORDER >= ? AND SORDER.SALE_ORDER <= ? " +
-					" AND CUSTOMER.CUST_CODE >= ? AND CUSTOMER.CUST_CODE <= ? " +	
-					" AND  SORDER.CUST_CODE__DLV >= ? AND  SORDER.CUST_CODE__DLV <= ? " +
-					" AND  SORDER.ITEM_SER >= ?  AND SORDER.ITEM_SER <= ? "+									
-					" AND POD.ITEM_CODE >= ? AND POD.ITEM_CODE <= ? " +
-					" AND POD.LOT_NO >= ? AND POD.LOT_NO <= ? " +
-					" AND CM.CARTON_NO >= ? AND CM.CARTON_NO <= ? " +
-					" AND SORDER.SALE_ORDER = POH.SALE_ORDER " +
-					" AND SORDER.CUST_CODE = CUSTOMER.CUST_CODE " +
-					" AND WAVE_TASK.WAVE_ID = WTD.WAVE_ID " +
-					" AND DESPATCH.WAVE_ID = WAVE_TASK.WAVE_ID " +
-					" AND DESPATCH.SORD_NO = WTD.SALE_ORDER " +
-					" AND DESPATCH.CONFIRMED <> 'Y' AND WAVE_TASK.CANCEL <> 'Y' " +
-					//Changed By Rohan on 21-06-13 [] for Adding Parcel carton type C
-					//" AND CM.STATUS <> 'R' AND CM.CARTON_TYPE = 'C' "+
-					" AND CM.STATUS <> 'R' AND CM.CARTON_TYPE IN('C','P') "+
-					/////////////////////////////////////
-					" UNION ALL "+
-					" SELECT DISTINCT CM.CARTON_NO, POD.SALE_ORDER, POD.LINE_NO__SORD, POD.PICK_ORDER, POD.LINE_NO, " +
-					" POD.ITEM_CODE,  POD.LOC_CODE, POD.LOT_NO, POD.LOT_SL, WTD.WAVE_ID, (POD.QUANTITY - CASE WHEN POD.DEALLOC_QTY IS NULL THEN 0 ELSE POD.DEALLOC_QTY END) AS QUANTITY , CUSTOMER.CUST_CODE, " +
-					" SORDER.ITEM_SER, WTD.PTCN, POH.PICK_TYPE FROM CARTON_MASTER CM, PICK_ORD_DET POD , PICK_ORD_HDR POH, WAVE_TASK_DET WTD, " +
-					" WAVE_TASK WAVE_TASK, SORDER SORDER, CUSTOMER CUSTOMER , DESPATCH DESPATCH " +
-					" WHERE CM.PICK_ORDER = POD.PICK_ORDER  AND POH.PICK_ORDER = POD.PICK_ORDER " +					
-					" AND WTD.PTCN = CM.PTCN AND WTD.REF_ID = CM.PICK_ORDER  " +
-					" AND POH.PICK_TYPE = 'A' " +
-					" AND SORDER.SITE_CODE__SHIP = ? " +
-					" AND SORDER.SALE_ORDER >= ? AND SORDER.SALE_ORDER <= ? " +
-					" AND CUSTOMER.CUST_CODE >= ? AND CUSTOMER.CUST_CODE <= ? " +
-					" AND  SORDER.CUST_CODE__DLV >= ? AND  SORDER.CUST_CODE__DLV <= ? " +
-					" AND  SORDER.ITEM_SER >= ? AND SORDER.ITEM_SER <= ? " +
-					" AND POD.ITEM_CODE >= ? AND POD.ITEM_CODE <= ? " +
-					" AND POD.LOT_NO >= ? AND POD.LOT_NO <= ? " +
-					" AND CM.CARTON_NO >= ? AND CM.CARTON_NO <= ? " +
-					" AND SORDER.SALE_ORDER = POH.SALE_ORDER " +
-					" AND SORDER.CUST_CODE = CUSTOMER.CUST_CODE " +
-					" AND WAVE_TASK.WAVE_ID = WTD.WAVE_ID " +
-					" AND DESPATCH.WAVE_ID = WAVE_TASK.WAVE_ID " +
-					" AND DESPATCH.SORD_NO = WTD.SALE_ORDER " +
-					" AND DESPATCH.CONFIRMED <> 'Y' AND WAVE_TASK.CANCEL <> 'Y' " +
-					" AND CM.STATUS <> 'R' AND CM.CARTON_TYPE = 'A' " +
-					//Changed By Pragyan 21-MAY-14 tO join carton master with pick_ord_det
-					" AND CM.CARTON_NO = POD.CARTON_NO "+
-					" AND (POD.QUANTITY - CASE WHEN POD.DEALLOC_QTY IS NULL THEN 0 ELSE POD.DEALLOC_QTY END) > 0 "+
-					/////////////////////////////////////
-					" UNION ALL "+
-					" SELECT CM.CARTON_NO, ROD.SALE_ORDER, ROD.LINE_NO__SORD, CM.PICK_ORDER, CM.LINE_NO__PICK, ROD.ITEM_CODE,  ROD.LOC_CODE, ROD.LOT_NO, ROD.LOT_SL," +
-					" WTD.WAVE_ID, ROD.QUANTITY, CUSTOMER.CUST_CODE,  SORDER.ITEM_SER, WTD.PTCN, ' ' AS PICK_TYPE " +
-					" FROM CARTON_MASTER CM, REPL_ORD_DET ROD , REPL_ORD_HDR ROH, WAVE_TASK_DET WTD ," +
-					" WAVE_TASK WAVE_TASK, SORDER SORDER, CUSTOMER CUSTOMER , DESPATCH DESPATCH " +
-					" WHERE CM.PICK_ORDER = ROD.REPL_ORDER  AND ROH.REPL_ORDER = ROD.REPL_ORDER " +
-					" AND CM.LINE_NO__PICK = ROD.LINE_NO AND WTD.PTCN = CM.PTCN " +
-					" AND WTD.REF_ID = CM.PICK_ORDER " +
-					" AND SORDER.SITE_CODE__SHIP = ? " +
-					" AND SORDER.SALE_ORDER >= ? AND SORDER.SALE_ORDER <= ?" +
-					" AND CUSTOMER.CUST_CODE >= ? AND CUSTOMER.CUST_CODE <= ? " +
-					" AND  SORDER.CUST_CODE__DLV >= ? AND  SORDER.CUST_CODE__DLV <= ? " +
-					" AND  SORDER.ITEM_SER >= ? AND SORDER.ITEM_SER <= ? " +
-					" AND ROD.ITEM_CODE >= ? AND ROD.ITEM_CODE <= ? " +
-					" AND ROD.LOT_NO >= ? AND ROD.LOT_NO <= ? " +
-					" AND CM.CARTON_NO >= ? AND CM.CARTON_NO <= ? " +
-					" AND SORDER.SALE_ORDER = ROH.SALE_ORDER " +
-					" AND SORDER.CUST_CODE = CUSTOMER.CUST_CODE " +
-					" AND WAVE_TASK.WAVE_ID = WTD.WAVE_ID " +
-					" AND DESPATCH.WAVE_ID = WAVE_TASK.WAVE_ID " +
-					" AND DESPATCH.SORD_NO = WTD.SALE_ORDER " +
-					" AND DESPATCH.CONFIRMED <> 'Y' AND WAVE_TASK.CANCEL <> 'Y' " +
-					" AND CM.STATUS <> 'R' AND CM.CARTON_TYPE = 'S' " ;
-				//	" ORDER BY WAVE_ID, PTCN, SALE_ORDER,LINE_NO__SORD, ITEM_CODE, CARTON_NO "; 
-					
+			" POD.ITEM_CODE,  POD.LOC_CODE, POD.LOT_NO, POD.LOT_SL, WTD.WAVE_ID, POD.QUANTITY , CUSTOMER.CUST_CODE, " +
+			" SORDER.ITEM_SER, WTD.PTCN, POH.PICK_TYPE FROM CARTON_MASTER CM, PICK_ORD_DET POD , PICK_ORD_HDR POH, WAVE_TASK_DET WTD , " +
+			" WAVE_TASK WAVE_TASK, SORDER SORDER, CUSTOMER CUSTOMER , DESPATCH DESPATCH " +
+			" WHERE CM.PICK_ORDER = POD.PICK_ORDER " +
+			" AND POH.PICK_ORDER = POD.PICK_ORDER " +
+			" AND CM.LINE_NO__PICK = POD.LINE_NO AND WTD.PTCN = CM.PTCN " +
+			" AND WTD.REF_ID = CM.PICK_ORDER " +
+			
+			" AND POH.PICK_TYPE IN ('C','M') " +
+			" AND SORDER.SITE_CODE__SHIP = ? "+
+			" AND SORDER.SALE_ORDER >= ? AND SORDER.SALE_ORDER <= ? " +
+			" AND CUSTOMER.CUST_CODE >= ? AND CUSTOMER.CUST_CODE <= ? " +	
+			" AND  SORDER.CUST_CODE__DLV >= ? AND  SORDER.CUST_CODE__DLV <= ? " +
+			" AND  SORDER.ITEM_SER >= ?  AND SORDER.ITEM_SER <= ? "+									
+			" AND POD.ITEM_CODE >= ? AND POD.ITEM_CODE <= ? " +
+			" AND POD.LOT_NO >= ? AND POD.LOT_NO <= ? " +
+			" AND CM.CARTON_NO >= ? AND CM.CARTON_NO <= ? " +
+			" AND SORDER.SALE_ORDER = POH.SALE_ORDER " +
+			" AND SORDER.CUST_CODE = CUSTOMER.CUST_CODE " +
+			" AND WAVE_TASK.WAVE_ID = WTD.WAVE_ID " +
+			" AND DESPATCH.WAVE_ID = WAVE_TASK.WAVE_ID " +
+			" AND DESPATCH.SORD_NO = WTD.SALE_ORDER " +
+			" AND DESPATCH.CONFIRMED <> 'Y' AND WAVE_TASK.CANCEL <> 'Y' " +
+			//Changed By Rohan on 21-06-13 [] for Adding Parcel carton type C
+			//" AND CM.STATUS <> 'R' AND CM.CARTON_TYPE = 'C' "+
+			" AND CM.STATUS <> 'R' AND CM.CARTON_TYPE IN('C','P') "+
+			/////////////////////////////////////
+			" UNION ALL "+
+			" SELECT DISTINCT CM.CARTON_NO, POD.SALE_ORDER, POD.LINE_NO__SORD, POD.PICK_ORDER, POD.LINE_NO, " +
+			" POD.ITEM_CODE,  POD.LOC_CODE, POD.LOT_NO, POD.LOT_SL, WTD.WAVE_ID, (POD.QUANTITY - CASE WHEN POD.DEALLOC_QTY IS NULL THEN 0 ELSE POD.DEALLOC_QTY END) AS QUANTITY , CUSTOMER.CUST_CODE, " +
+			" SORDER.ITEM_SER, WTD.PTCN, POH.PICK_TYPE FROM CARTON_MASTER CM, PICK_ORD_DET POD , PICK_ORD_HDR POH, WAVE_TASK_DET WTD, " +
+			" WAVE_TASK WAVE_TASK, SORDER SORDER, CUSTOMER CUSTOMER , DESPATCH DESPATCH " +
+			" WHERE CM.PICK_ORDER = POD.PICK_ORDER  AND POH.PICK_ORDER = POD.PICK_ORDER " +					
+			" AND WTD.PTCN = CM.PTCN AND WTD.REF_ID = CM.PICK_ORDER  " +
+			" AND POH.PICK_TYPE = 'A' " +
+			" AND SORDER.SITE_CODE__SHIP = ? " +
+			" AND SORDER.SALE_ORDER >= ? AND SORDER.SALE_ORDER <= ? " +
+			" AND CUSTOMER.CUST_CODE >= ? AND CUSTOMER.CUST_CODE <= ? " +
+			" AND  SORDER.CUST_CODE__DLV >= ? AND  SORDER.CUST_CODE__DLV <= ? " +
+			" AND  SORDER.ITEM_SER >= ? AND SORDER.ITEM_SER <= ? " +
+			" AND POD.ITEM_CODE >= ? AND POD.ITEM_CODE <= ? " +
+			" AND POD.LOT_NO >= ? AND POD.LOT_NO <= ? " +
+			" AND CM.CARTON_NO >= ? AND CM.CARTON_NO <= ? " +
+			" AND SORDER.SALE_ORDER = POH.SALE_ORDER " +
+			" AND SORDER.CUST_CODE = CUSTOMER.CUST_CODE " +
+			" AND WAVE_TASK.WAVE_ID = WTD.WAVE_ID " +
+			" AND DESPATCH.WAVE_ID = WAVE_TASK.WAVE_ID " +
+			" AND DESPATCH.SORD_NO = WTD.SALE_ORDER " +
+			" AND DESPATCH.CONFIRMED <> 'Y' AND WAVE_TASK.CANCEL <> 'Y' " +
+			" AND CM.STATUS <> 'R' AND CM.CARTON_TYPE = 'A' " +
+			//Changed By Pragyan 21-MAY-14 tO join carton master with pick_ord_det
+			" AND CM.CARTON_NO = POD.CARTON_NO "+
+			" AND (POD.QUANTITY - CASE WHEN POD.DEALLOC_QTY IS NULL THEN 0 ELSE POD.DEALLOC_QTY END) > 0 "+
+			/////////////////////////////////////
+			" UNION ALL "+
+			" SELECT CM.CARTON_NO, ROD.SALE_ORDER, ROD.LINE_NO__SORD, CM.PICK_ORDER, CM.LINE_NO__PICK, ROD.ITEM_CODE,  ROD.LOC_CODE, ROD.LOT_NO, ROD.LOT_SL," +
+			" WTD.WAVE_ID, ROD.QUANTITY, CUSTOMER.CUST_CODE,  SORDER.ITEM_SER, WTD.PTCN, ' ' AS PICK_TYPE " +
+			" FROM CARTON_MASTER CM, REPL_ORD_DET ROD , REPL_ORD_HDR ROH, WAVE_TASK_DET WTD ," +
+			" WAVE_TASK WAVE_TASK, SORDER SORDER, CUSTOMER CUSTOMER , DESPATCH DESPATCH " +
+			" WHERE CM.PICK_ORDER = ROD.REPL_ORDER  AND ROH.REPL_ORDER = ROD.REPL_ORDER " +
+			" AND CM.LINE_NO__PICK = ROD.LINE_NO AND WTD.PTCN = CM.PTCN " +
+			" AND WTD.REF_ID = CM.PICK_ORDER " +
+			" AND SORDER.SITE_CODE__SHIP = ? " +
+			" AND SORDER.SALE_ORDER >= ? AND SORDER.SALE_ORDER <= ?" +
+			" AND CUSTOMER.CUST_CODE >= ? AND CUSTOMER.CUST_CODE <= ? " +
+			" AND  SORDER.CUST_CODE__DLV >= ? AND  SORDER.CUST_CODE__DLV <= ? " +
+			" AND  SORDER.ITEM_SER >= ? AND SORDER.ITEM_SER <= ? " +
+			" AND ROD.ITEM_CODE >= ? AND ROD.ITEM_CODE <= ? " +
+			" AND ROD.LOT_NO >= ? AND ROD.LOT_NO <= ? " +
+			" AND CM.CARTON_NO >= ? AND CM.CARTON_NO <= ? " +
+			" AND SORDER.SALE_ORDER = ROH.SALE_ORDER " +
+			" AND SORDER.CUST_CODE = CUSTOMER.CUST_CODE " +
+			" AND WAVE_TASK.WAVE_ID = WTD.WAVE_ID " +
+			" AND DESPATCH.WAVE_ID = WAVE_TASK.WAVE_ID " +
+			" AND DESPATCH.SORD_NO = WTD.SALE_ORDER " +
+			" AND DESPATCH.CONFIRMED <> 'Y' AND WAVE_TASK.CANCEL <> 'Y' " +
+			" AND CM.STATUS <> 'R' AND CM.CARTON_TYPE = 'S' " ;
+		//	" ORDER BY WAVE_ID, PTCN, SALE_ORDER,LINE_NO__SORD, ITEM_CODE, CARTON_NO "; 
+
 			//changed by manish on 28/09/15 for Ms sql server databse 
+
 			String DB = commonConstants.DB_NAME;
 			if("!mssql".equalsIgnoreCase(DB))
 			{
@@ -369,7 +418,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 			pstmt.setString(13,lotNoTo);
 			pstmt.setString(14,cartonNoFr);
 			pstmt.setString(15,cartonNoTo);
-			
+
 			pstmt.setString(16, siteCode);		
 			pstmt.setString(17,saleOrderFr);
 			pstmt.setString(18,saleOrderTo);
@@ -385,7 +434,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 			pstmt.setString(28,lotNoTo);
 			pstmt.setString(29,cartonNoFr);
 			pstmt.setString(30,cartonNoTo);
-			
+
 			pstmt.setString(31, siteCode);		
 			pstmt.setString(32,saleOrderFr);
 			pstmt.setString(33,saleOrderTo);
@@ -401,7 +450,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 			pstmt.setString(43,lotNoTo);
 			pstmt.setString(44,cartonNoFr);
 			pstmt.setString(45,cartonNoTo);
-			
+
 			rs = pstmt.executeQuery();
 			if( rs.next() )
 			{
@@ -412,10 +461,10 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 					pickOrder = rs.getString("PICK_ORDER");
 					lineNoPick = rs.getInt("LINE_NO__PICK");
 					itemCode = rs.getString("ITEM_CODE");
-					
+
 					replOrPick = checkForReplOrPick(pickOrder, conn);
 					System.out.println(" replOrPick ["+replOrPick+"]");
-					
+
 					if( "PICK".equalsIgnoreCase(replOrPick))
 					{
 						stockDetail.clear();
@@ -428,42 +477,42 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 						pickType = "S";
 					}
 					System.out.println(" stockDetail  "+stockDetail);
-					
-					
+
+
 					//WAVE_ID
 					retTabSepStrBuff.append(rs.getString("WAVE_ID")).append("\t");	
-					
+
 					//PTCN 
 					retTabSepStrBuff.append(rs.getString("PTCN")).append("\t");					
-					
+
 					//SALE_ORDER
 					retTabSepStrBuff.append(rs.getString("SALE_ORDER")).append("\t");					
-					
+
 					//LINE_NO__SORD
 					lineNoSord = "   " + lineNoSord; 
 					lineNoSord = lineNoSord.substring(lineNoSord.length()-3);
 					System.out.println(" sord line no ["+lineNoSord+"]");
 					retTabSepStrBuff.append(lineNoSord).append("\t");				
-					
+
 					//CARTON_NO
 					retTabSepStrBuff.append(rs.getString("CARTON_NO")).append("\t");					
-					
+
 					//PICK_ORDER
 					retTabSepStrBuff.append(stockDetail.get("ref_id").toString()).append("\t");					
-					
+
 					//LINE_NO__PICK
 					retTabSepStrBuff.append(stockDetail.get("ref_line_no").toString()).append("\t");
-					
+
 					//ITEM_CODE
 					retTabSepStrBuff.append(itemCode).append("\t");
-					
+
 					//LOC_CODE					
 					locCode = stockDetail.get("loc_code").toString();
 					retTabSepStrBuff.append(locCode).append("\t");
-					
+
 					//LOT_NO
 					retTabSepStrBuff.append(rs.getString("LOT_NO")).append("\t");
-					
+
 					//QUANTITY
 					if("A".equalsIgnoreCase(pickType) || "S".equalsIgnoreCase(pickType))
 					{
@@ -480,23 +529,23 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 						}
 					}
 					retTabSepStrBuff.append(quantity).append("\t");	
-									
+
 					//LOT_SL
 					retTabSepStrBuff.append(rs.getString("LOT_SL")).append("\t");
-					
+
 					//PICK_TYPE
 					retTabSepStrBuff.append( pickType ).append("\t");
-					
+
 					//Pick_order
 					retTabSepStrBuff.append(rs.getString("PICK_ORDER")).append("\t");
-					
+
 					//Pick_line 
 					retTabSepStrBuff.append(rs.getString("LINE_NO__PICK")).append("\n");
-					
-					
-				 }while(rs.next());	
-				
-				
+
+
+				}while(rs.next());	
+
+
 			}			
 			else
 			{
@@ -511,7 +560,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 				resultString = itmDBAccessEJB.getErrorString("", errCode, "", "", conn);
 				System.out.println("resultString: "+resultString);
 			}		
-			
+
 		}
 		catch (SQLException e)
 		{
@@ -530,7 +579,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 			{				
 				if(conn != null)
 				{		
-					
+
 					if(rs != null)
 					{
 						rs.close();
@@ -541,13 +590,13 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 						rs1.close();
 						rs1 = null;
 					}
-					
+
 					if(pstmt != null)
 					{
 						pstmt.close();
 						pstmt=null;
 					}
-					
+
 					conn.close();
 					conn = null;
 				}
@@ -568,7 +617,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 		String retStr = "";
 		Document detailDom = null;
 		Document headerDom = null;
-		
+
 		GenericUtility genericUtility = GenericUtility.getInstance();
 		System.out.println("below genericUtility--------------->>>>>>>>>");
 		try
@@ -583,9 +632,9 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 				detailDom = genericUtility.parseString(xmlString2); 
 				System.out.println("detailDom" + detailDom);
 			}
-									
-		    retStr = process(headerDom, detailDom, windowName, xtraParams);
-		    
+
+			retStr = process(headerDom, detailDom, windowName, xtraParams);
+
 		}
 		catch (Exception e)
 		{
@@ -595,7 +644,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 			throw new ITMException(e);
 		}
 		return retStr;
-		
+
 	}
 	public String process(Document headerDom, Document detailDom, String windowName, String xtraParams) throws RemoteException,ITMException
 	{
@@ -628,11 +677,11 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 		String pndInvStat = "";
 		int tranLineNo = 0;
 		java.sql.Date currDate = new java.sql.Date( System.currentTimeMillis() );	
-		
+
 		Connection conn = null;
 		ResultSet rs = null, rs1 = null;
 		PreparedStatement pstmt = null, pstmt1 =null, pstmt2 = null;		
-		
+
 		int parentNodeListLength = 0;
 		int childNodeListLength = 0;		
 		NodeList parentNodeList = null;
@@ -648,14 +697,14 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 			chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId");
 			siteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "site_code");
 			//ptcn = genericUtility.getColumnValue("ptcn",headerDom);
-			
+
 			System.out.println(" chgUser ["+chgUser+"] chgTerm["+chgTerm+"] siteCode["+siteCode+"]");
-			
+
 			ConnDriver connDriver = new ConnDriver();
 			conn = connDriver.getConnectDB("DriverITM");
 			conn.setAutoCommit(false);
 			connDriver = null;
-			
+
 			/*sql = " SELECT DISTINCT WTD.WAVE_ID FROM CARTON_MASTER CM, PICK_ORD_DET POD , PICK_ORD_HDR POH, WAVE_TASK_DET WTD " +
 					" WHERE CM.PTCN = ? AND CM.PICK_ORDER = POD.PICK_ORDER AND POH.PICK_ORDER = POD.PICK_ORDER " +
 					" AND CM.LINE_NO__PICK = POD.LINE_NO AND WTD.PTCN = CM.PTCN AND WTD.REF_ID = CM.PICK_ORDER " ;
@@ -671,12 +720,12 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 			{
 				waveId = rs.getString("WAVE_ID");
 			}*/
-			
+
 			tranId = getTranId("w_dealloc_art", siteCode, conn);
 			sql = "";
 			sql = " INSERT INTO DEALLOC_ART (TRAN_ID, SITE_CODE, CONFIRMED, CHG_DATE, CHG_USER, CHG_TERM) " +
-					" VALUES (?,?,?,?,?,?)";  
-			
+			" VALUES (?,?,?,?,?,?)";  
+
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, tranId);
 			pstmt.setString(2, siteCode);
@@ -692,35 +741,35 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 				System.out.println(" insertion in DEALLOC_ART successfully ");
 			}			
 			pstmt.close();pstmt = null;
-			
+
 			sql = "";
 			sql = "INSERT INTO DEALLOC_ART_DET (TRAN_ID, LINE_NO, CARTON_NO, PICK_ORDER, LINE_NO__PICK, ITEM_CODE, QUANTITY, " +
-					" LOC_CODE, LOT_NO, WAVE_ID, PTCN, SALE_ORDER, LINE_NO__SORD, LOT_SL, PICK_TYPE) VALUES (?,?,?,?, ?,?,?,?,?,?,?,?,?,?,?)";  
+			" LOC_CODE, LOT_NO, WAVE_ID, PTCN, SALE_ORDER, LINE_NO__SORD, LOT_SL, PICK_TYPE) VALUES (?,?,?,?, ?,?,?,?,?,?,?,?,?,?,?)";  
 			pstmt = conn.prepareStatement(sql);
-			
+
 			sql = " SELECT (QUANTITY - CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY  END) AS QUANTITY " +
-					  " FROM PICK_ORD_DET WHERE PICK_ORDER = ? AND LINE_NO = ?";
+			" FROM PICK_ORD_DET WHERE PICK_ORDER = ? AND LINE_NO = ?";
 			pstmt2 = conn.prepareStatement(sql);
- 
-			
+
+
 			parentNodeList = detailDom.getElementsByTagName("Detail2");
 			parentNodeListLength = parentNodeList.getLength(); 
 			System.out.println("parentNodeListLength------------------->"+parentNodeListLength);		
-			
+
 			for (int selectedRow = 0; selectedRow < parentNodeListLength; selectedRow++)
 			{
-				
+
 				parentNode = parentNodeList.item(selectedRow);			
 				childNodeList = parentNode.getChildNodes();
 				childNodeListLength = childNodeList.getLength();
 				System.out.println("childNodeListLength---->>> "+ childNodeListLength);
-				
+
 				for (int childRow = 0; childRow < childNodeListLength; childRow++)
 				{
 					childNode = childNodeList.item(childRow);
 					childNodeName = childNode.getNodeName();
- 					System.out.println("childNodeName---->>> "+ childNodeName);
-					
+					System.out.println("childNodeName---->>> "+ childNodeName);
+
 					if (childNodeName.equals("carton_no"))
 					{
 						cartonNo = childNode.getFirstChild().getNodeValue();
@@ -757,7 +806,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 						{
 							quantity = 0.0;
 						}
-						
+
 						//quantity = Double.parseDouble(childNode.getFirstChild().getNodeValue());
 						System.out.println("quantity *======>"+quantity);
 					}
@@ -797,9 +846,9 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 					{
 						cartonPickLine = childNode.getFirstChild().getNodeValue();
 					}
-			
+
 				}
-				
+
 				System.out.println("cartonPickOrder ["+cartonPickOrder+"] cartonPickLine ["+cartonPickLine+"]");
 				if( quantity <= 0)
 				{
@@ -820,7 +869,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 					}
 					rs.close(); rs = null;
 					pstmt2.clearParameters();
-					
+
 					if( quantity > realQty )
 					{
 						errString="INVDEALLQ2";
@@ -854,14 +903,14 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 					}
 					rs.close(); rs = null;
 					pstmt1.close(); pstmt1 = null;
-					
+
 					if(packSizeActive !=  quantity)
 					{
 						errString="INVDEALLQ4";
 						errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);						
 						return errString;
 					}
-					
+
 				}
 				// CHECKING QUANTITY AGAINST 
 				if( !"S".equalsIgnoreCase(pickType))
@@ -881,14 +930,14 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 					rs.close(); rs = null;
 					pstmt1.close(); pstmt1 = null;
 				}
-				
+
 				String refId = checkForReplOrPick(pickOrder, conn);
 				if("REPL".equalsIgnoreCase(refId))
 				{
 					sql = "SELECT (CASE WHEN RIH.CONFIRMED IS NULL THEN 'N' ELSE RIH.CONFIRMED END) AS CONFIRMED " +
-							" FROM REPL_ISS_DET RID, REPL_ISS_HDR RIH WHERE RID.REPL_ORDER = RIH.REPL_ORDER " +
-							" AND RID.REPL_ORDER = ? AND RID.LINE_NO__ORD = ? AND RID.SITE_CODE = ? AND RID.ITEM_CODE = ? " +
-							" AND RID.LOC_CODE = ? AND RID.LOT_NO = ? AND RID.LOT_SL = ? ";
+					" FROM REPL_ISS_DET RID, REPL_ISS_HDR RIH WHERE RID.REPL_ORDER = RIH.REPL_ORDER " +
+					" AND RID.REPL_ORDER = ? AND RID.LINE_NO__ORD = ? AND RID.SITE_CODE = ? AND RID.ITEM_CODE = ? " +
+					" AND RID.LOC_CODE = ? AND RID.LOT_NO = ? AND RID.LOT_SL = ? ";
 					pstmt1 = conn.prepareStatement(sql);
 					pstmt1.setString(1, pickOrder);
 					pstmt1.setString(2, lineNoPick);
@@ -918,12 +967,12 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 					System.out.println("lineNoPick:::::Changed By Pragyan["+lineNoPick+"]");
 					int pickCount = 0;
 					sql = " SELECT COUNT(*) AS COUNT FROM PICK_ORD_DET PO, PICK_ISS_HDR PH, PICK_ISS_DET PT WHERE PT.PICK_ORDER = PO.PICK_ORDER " +
-							" AND PT.LINE_NO__ORD = PO.LINE_NO AND PT.PICK_ORDER = PH.PICK_ORDER AND PH.CONFIRMED = 'N' AND ( PO.STATUS <>'C' OR PO.STATUS IS NULL ) " +
-							" AND (PO.QUANTITY - (CASE WHEN PO.DEALLOC_QTY IS NULL THEN 0 ELSE PO.DEALLOC_QTY END )) > 0 " +
-							//Changed By Pragyan 02-JUL-14 (Issue tracker No 404)To get proper count from pick order and pick line no.
-							//" AND PT.PICK_ORDER = ? AND PT.LINE_NO = ? " ;					
-							" AND PO.PICK_ORDER = ? AND PO.LINE_NO = ? " ;
-					
+					" AND PT.LINE_NO__ORD = PO.LINE_NO AND PT.PICK_ORDER = PH.PICK_ORDER AND PH.CONFIRMED = 'N' AND ( PO.STATUS <>'C' OR PO.STATUS IS NULL ) " +
+					" AND (PO.QUANTITY - (CASE WHEN PO.DEALLOC_QTY IS NULL THEN 0 ELSE PO.DEALLOC_QTY END )) > 0 " +
+					//Changed By Pragyan 02-JUL-14 (Issue tracker No 404)To get proper count from pick order and pick line no.
+					//" AND PT.PICK_ORDER = ? AND PT.LINE_NO = ? " ;					
+					" AND PO.PICK_ORDER = ? AND PO.LINE_NO = ? " ;
+
 					pstmt1 = conn.prepareStatement(sql);
 					pstmt1.setString(1, pickOrder);
 					pstmt1.setString(2, lineNoPick);
@@ -936,7 +985,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 					//place sankara code by dhanraj only changed place 22/07/2014.
 					rs.close(); rs = null;
 					pstmt1.close(); pstmt1 = null;
-					
+
 					if(pickCount > 0)
 					{
 						errString="VPPICKNOTA";
@@ -947,16 +996,16 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 							/*errString = getError(pickOrder,lineNoPick,errString,conn);
 						     return errString;*/
 							sql = "Select ST.QUANTITY,ST.HOLD_QTY,PD.SITE_CODE,PD.ITEM_CODE,PD.LOT_NO,PD.LOT_SL,PD.LOC_CODE " 
-									+"	from PICK_ORD_HDR PH,PICK_ORD_DET PD,STOCK ST "
-									+"	where PD.PICK_ORDER = PH.PICK_ORDER "
-									+"	AND PD.SITE_CODE=ST.SITE_CODE "
-									+"	AND PD.ITEM_CODE=ST.ITEM_CODE "
-									+"	AND PD.LOT_NO=ST.LOT_NO "
-									+"	AND PD.LOT_SL=ST.LOT_SL "
-									+"	AND PD.LOC_CODE=ST.LOC_CODE "
-									+"	AND ST.HOLD_QTY > 0 "
-									+"	AND PD.PICK_ORDER= ? "
-							        +"  AND PD.LINE_NO = ? " ;
+								+"	from PICK_ORD_HDR PH,PICK_ORD_DET PD,STOCK ST "
+								+"	where PD.PICK_ORDER = PH.PICK_ORDER "
+								+"	AND PD.SITE_CODE=ST.SITE_CODE "
+								+"	AND PD.ITEM_CODE=ST.ITEM_CODE "
+								+"	AND PD.LOT_NO=ST.LOT_NO "
+								+"	AND PD.LOT_SL=ST.LOT_SL "
+								+"	AND PD.LOC_CODE=ST.LOC_CODE "
+								+"	AND ST.HOLD_QTY > 0 "
+								+"	AND PD.PICK_ORDER= ? "
+								+"  AND PD.LINE_NO = ? " ;
 							pstmt1 = conn.prepareStatement(sql);
 							pstmt1.setString(1, pickOrder);
 							pstmt1.setString(2, lineNoPick);
@@ -1000,7 +1049,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 				pstmt.setString(15, pickType);
 				if( pstmt.executeUpdate() > 0 )
 				{
-					conn.commit();          //Added by manish on 29/09/15
+					conn.commit();          
 					System.out.println(" insert in DEALLOC_ART_DET succesfully done ");
 				}
 				else
@@ -1018,7 +1067,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 			{
 				pstmt2.close(); pstmt2 = null;
 			}
-			
+
 			AppConnectParm appConnect = new AppConnectParm();
 			Properties p = appConnect.getProperty();
 			InitialContext ctx = new InitialContext(p);
@@ -1029,7 +1078,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 			{
 				errString = "";
 			}*/
-			
+
 		}//try end	
 		catch(Exception e)
 		{
@@ -1067,26 +1116,26 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 					System.out.println("errString.indexOf(<Errors>)---------------"+errString.indexOf("<Errors>"));
 					/*if(errString.indexOf("<Errors>") == -1 )
 					{*/
-						if( errString.trim().length() > 0)
-						{
-							conn.rollback();
-							System.out.println("Inside Block for ErrOr Not Found---------------");
-							//changed by sankara on 21/06/14 display proper error details
-							String errorString = errString;
-							System.out.println("errorStringsankara:::::::::"+errorString);
-							errString="VTPRCERR";
-							errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
-							//changed by sankara on 21/06/14 display proper error details start.
-							if( errString.trim().length() > 0 )
-							{	
-								System.out.println("calling our own ex method......");
-								errString = printExceptionMessage( errString, conn, errorString);
-								return errString;
-							}
-							//changed by sankara on 21/06/14 display proper error details end.
+					if( errString.trim().length() > 0)
+					{
+						conn.rollback();
+						System.out.println("Inside Block for ErrOr Not Found---------------");
+						//changed by sankara on 21/06/14 display proper error details
+						String errorString = errString;
+						System.out.println("errorStringsankara:::::::::"+errorString);
+						errString="VTPRCERR";
+						errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
+						//changed by sankara on 21/06/14 display proper error details start.
+						if( errString.trim().length() > 0 )
+						{	
+							System.out.println("calling our own ex method......");
+							errString = printExceptionMessage( errString, conn, errorString);
+							return errString;
 						}
+						//changed by sankara on 21/06/14 display proper error details end.
+					}
 					//}			
-										
+
 				}
 				if( rs != null )
 				{
@@ -1119,7 +1168,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 				errString = e.getMessage();
 				e.printStackTrace();
 				return errString ;
-			
+
 			}
 			/*if (errString == null || errString.trim().length() == 0 || errString.contains("VTSUCC1"))
 			{				
@@ -1140,16 +1189,16 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 						errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
 					}
 				}
-				
+
 				return errString;
-				
+
 			}*/
-			
+
 		}
-		
+
 		return errString;	
 	}	
-	
+
 	private String checkNull( String input )
 	{
 		if( input == null )
@@ -1166,17 +1215,17 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 		ResultSet rs = null;
 		double itmLen = 0,itmWidth = 0,itmHeight = 0,itemWeight = 0,lotLen = 0 ,lotHeight = 0,lotWidth = 0,lotWeight = 0;
 		HashMap dataVolumeMap = new HashMap();
-		
+
 		try {
-			
+
 			sql = "SELECT I.LENGTH ITEM_LEN,I.WIDTH ITEM_WID,I.HEIGHT ITEM_HEIGHT,I.GROSS_WEIGHT ITEM_WEIGHT,"
-				  +" L.LENGTH LITEM_LEN,L.WIDTH LITEM_WID,L.HEIGHT LITEM_HEIGHT,L.SHIPPER_SIZE SHIPSIZE,L.GROSS_WEIGHT LOT_WEIGHT FROM"
-				  +" ITEM I,ITEM_LOT_PACKSIZE L"
-				  +" WHERE I.ITEM_CODE = L.ITEM_CODE"
-				  +" AND L.LOT_NO__FROM <= ? AND L.LOT_NO__TO >= ?"
-				  +" AND  I.ITEM_CODE = ?";
-				  
-			
+				+" L.LENGTH LITEM_LEN,L.WIDTH LITEM_WID,L.HEIGHT LITEM_HEIGHT,L.SHIPPER_SIZE SHIPSIZE,L.GROSS_WEIGHT LOT_WEIGHT FROM"
+				+" ITEM I,ITEM_LOT_PACKSIZE L"
+				+" WHERE I.ITEM_CODE = L.ITEM_CODE"
+				+" AND L.LOT_NO__FROM <= ? AND L.LOT_NO__TO >= ?"
+				+" AND  I.ITEM_CODE = ?";
+
+
 			pstmt = con.prepareStatement(sql);
 			if(lotNo != null && lotNo.length() > 0)
 			{
@@ -1190,7 +1239,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 			}
 			pstmt.setString(3, itemCode);
 			rs = pstmt.executeQuery();
-			
+
 			if(rs.next())
 			{
 				itmLen = rs.getDouble("ITEM_LEN");
@@ -1203,34 +1252,34 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 				packSize = rs.getDouble("SHIPSIZE");				
 				lotWeight = rs.getDouble("LOT_WEIGHT");				
 			}
-			
+
 			//packSize = (lotHeight * lotWidth * lotLen)/(itmLen * itmWidth * itmHeight);
 			/*itemSize = Math.floor(itmLen * itmWidth * itmHeight);
 			lotSize = Math.floor((lotHeight * lotWidth * lotLen));*/
 			itemSize = itmLen * itmWidth * itmHeight;
 			lotSize = lotHeight * lotWidth * lotLen;
-			
+
 			dataVolumeMap.put("PACK_SIZE", packSize);
 			dataVolumeMap.put("ITEM_SIZE", itemSize);
 			dataVolumeMap.put("LOT_SIZE", lotSize);
 			dataVolumeMap.put("ITEM_WEIGHT", itemWeight);
 			dataVolumeMap.put("PACK_WEIGHT", lotWeight);
-			
+
 			if(pstmt != null)
 			{
 				pstmt.close();
 				pstmt = null;
-		
+
 			}
 			if(rs != null)
 			{
 				rs.close();
 				rs = null;
-		
+
 			}
-			
-			
-			
+
+
+
 		} catch (Exception e) {			
 
 			throw e;
@@ -1241,16 +1290,16 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 			{
 				pstmt.close();
 				pstmt = null;
-		
+
 			}
 			if(rs != null)
 			{
 				rs.close();
 				rs = null;
-		
+
 			}
 		}
-		
+
 		return dataVolumeMap;
 	}
 	private String getTranId(String windowName, String siteCode, Connection conn) throws ITMException
@@ -1266,13 +1315,13 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 
 		try
 		{
-			
+
 			keyStringQuery = "SELECT KEY_STRING, TRAN_ID_COL, REF_SER FROM TRANSETUP WHERE TRAN_WINDOW = ?";
-	    	System.out.println("keyStringQuery--------->>"+keyStringQuery);
-	    	
-	    	pstmt = conn.prepareStatement(keyStringQuery);
-	    	pstmt.setString(1,windowName);
-	    	rSet = pstmt.executeQuery();	    	
+			System.out.println("keyStringQuery--------->>"+keyStringQuery);
+
+			pstmt = conn.prepareStatement(keyStringQuery);
+			pstmt.setString(1,windowName);
+			rSet = pstmt.executeQuery();	    	
 			String tranSer1 = "";
 			String keyString = "";
 			String keyCol = "";
@@ -1282,14 +1331,14 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 				keyCol = rSet.getString("TRAN_ID_COL");
 				tranSer1 = rSet.getString("REF_SER");
 			}
-			
+
 
 			SimpleDateFormat sdfAppl = new SimpleDateFormat(genericUtility.getApplDateFormat());
 
 			currDate = new java.sql.Timestamp(System.currentTimeMillis());
 			String currDateStr = sdfAppl.format(currDate);
 			//End Changes by Gulzar on 5/12/2012
-			
+
 			System.out.println("keyString :"+keyString);
 			System.out.println("keyCol :"+keyCol);
 			System.out.println("tranSer1 :"+tranSer1);
@@ -1305,7 +1354,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 			TransIDGenerator tg = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME);
 			// Creating wave_id 
 			tranId = tg.generateTranSeqID(tranSer1, keyCol, keyString, conn);
-			
+
 			if(rSet != null)
 			{
 				rSet.close();
@@ -1351,7 +1400,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 		String sql = "";
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
-		
+
 		try
 		{
 			sql = " SELECT PICK_ORDER FROM PICK_ORD_HDR WHERE PICK_ORDER = ? ";
@@ -1391,7 +1440,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 			{
 				pstmt.close(); pstmt = null;
 			}
-			
+
 		}
 		catch(Exception e)
 		{
@@ -1441,9 +1490,9 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 		try
 		{
 			sql = " SELECT PIH.PICK_ORDER, PIH.PICK_TYPE, PIH.CONFIRMED, PID.LOC_CODE__TO  FROM PICK_ISS_HDR PIH, PICK_ISS_DET PID WHERE PIH.PICK_ORDER = ? " +
-			     //changed by sankara on 12/06/14 added tran_id join
-				//" AND PIH.PICK_ORDER = PID.PICK_ORDER";
-				  " AND PIH.PICK_ORDER = PID.PICK_ORDER AND PIH.TRAN_ID = PID.TRAN_ID ";
+			//changed by sankara on 12/06/14 added tran_id join
+			//" AND PIH.PICK_ORDER = PID.PICK_ORDER";
+			" AND PIH.PICK_ORDER = PID.PICK_ORDER AND PIH.TRAN_ID = PID.TRAN_ID ";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, pickOrder);
 			rs = pstmt.executeQuery();
@@ -1468,7 +1517,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 			{					
 				pstmt.close(); pstmt = null;	
 			}		
-			
+
 			if( !isIssueDone )
 			{
 				replIss = new HashMap();
@@ -1493,7 +1542,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 						stockDetail.put("loc_code", locCode);
 						stockDetail.put("ref_id", pickOrder);
 						stockDetail.put("ref_line_no", pickLineNo);
-						
+
 					}
 					else if ("N".equalsIgnoreCase(confirmed) && "NO".equalsIgnoreCase(replParent.get("paren_exist").toString()))        //parentExist.put("paren_exist", "NO");
 					{
@@ -1501,7 +1550,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 						lotNo = replParent.get("lot_no").toString();
 						lotSl = replParent.get("lot_sl").toString();
 						//System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]");
-						
+
 						//updateReplOrder(replOrder, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn);	
 						//updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn);
 						stockDetail.put("loc_code", locCode);
@@ -1511,17 +1560,17 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 					else if ( "N".equalsIgnoreCase(confirmed) && "YES".equalsIgnoreCase(replParent.get("paren_exist").toString()))
 					{
 						System.out.println(" repl order going to search it's ["+replOrder+"] parent ");
-						
+
 						currentReplOrder = replOrder;
 						currentLine = replOrderLine;
 						replOrder = "";
 						replOrder = replParent.get("pick_order").toString();
 						replOrderLine = Integer.parseInt(replParent.get("line_no__pick").toString());
 						System.out.println(" new repl order going to serch it's parent ["+replOrder+"]");
-						
+
 						replParent.clear();
 						replParent = isParentExistAndConfirmed(replOrder,replOrderLine, conn);
-						
+
 						confirmed = "";
 						confirmed = replParent.get("confirmed").toString();
 						System.out.println(" *-* confirmed ["+confirmed+"]");
@@ -1531,7 +1580,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 							lotNo = replParent.get("lot_no").toString();
 							lotSl = replParent.get("lot_sl").toString();
 							//System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]");
-							
+
 							//updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn);	
 							stockDetail.put("loc_code", locCode);
 							stockDetail.put("ref_id", currentReplOrder);
@@ -1543,7 +1592,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 							lotNo = replParent.get("lot_no").toString();
 							lotSl = replParent.get("lot_sl").toString();
 							//System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]");
-							
+
 							//updateReplOrder(replOrder, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn);
 							//updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn);
 							stockDetail.put("loc_code", locCode);
@@ -1556,21 +1605,21 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 							replOrder = replParent.get("pick_order").toString();
 							replOrderLine = Integer.parseInt(replParent.get("line_no__pick").toString());
 							System.out.println(" DSO repl order going to serch it's parent ["+replOrder+"]");
-							
+
 							replParent.clear();
 							replParent = isParentExistAndConfirmed(replOrder,replOrderLine, conn);
-							
+
 							confirmed = "";
 							confirmed = replParent.get("confirmed").toString();
 							System.out.println(" *-* confirmed ["+confirmed+"]");
-							
+
 							if("Y".equalsIgnoreCase(confirmed))
 							{
 								locCode = replParent.get("loc_code__to").toString();
 								lotNo = replParent.get("lot_no").toString();
 								lotSl = replParent.get("lot_sl").toString();
 								//System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]");
-								
+
 								//updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn);	
 								stockDetail.put("loc_code", locCode);
 								stockDetail.put("ref_id", currentReplOrder);
@@ -1582,17 +1631,17 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 								lotNo = replParent.get("lot_no").toString();
 								lotSl = replParent.get("lot_sl").toString();
 								//System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]");
-								
+
 								//updateReplOrder(replOrder, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn);
 								//updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn);
 								stockDetail.put("loc_code", locCode);
 								stockDetail.put("ref_id", replOrder);
 								stockDetail.put("ref_line_no", replOrderLine);
 							}
-							
-							
+
+
 							//System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]");
-							
+
 							//updateReplOrder(replOrder, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn);
 							//updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn);
 							/*stockDetail.put("loc_code", locCode);
@@ -1618,10 +1667,10 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 						stockDetail.put("ref_id", "");
 						stockDetail.put("ref_line_no", "");
 					}
-					
+
 					rs.close(); rs = null;
 					pstmt.close(); pstmt = null;
-					
+
 					stockDetail.put("loc_code", locCode);
 					stockDetail.put("ref_id", pickOrder);
 					stockDetail.put("ref_line_no", pickLineNo);
@@ -1637,7 +1686,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 						" WHERE POD.PICK_ORDER = ? AND POD.LINE_NO = ? " +
 						" AND POD.PICK_ORDER = PID.PICK_ORDER AND POD.LINE_NO = PID.LINE_NO__ORD " +
 						" AND PID.PICK_ORDER = PIH.PICK_ORDER ";
-					
+
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1,pickOrder);
 				pstmt.setInt(2,pickLineNo);
@@ -1660,14 +1709,14 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 				if( isAllTaskConfirmed )
 				{
 					sql = " SELECT DT.DESP_ID, DT.LINE_NO, DT.LOC_CODE FROM DESPATCH D, DESPATCHDET DT , PICK_ORD_DET POD , WAVE_TASK_DET WTD " +
-							" WHERE POD.PICK_ORDER = ? AND POD.LINE_NO = ? AND POD.PICK_ORDER = WTD.REF_ID " +
-							" AND POD.SALE_ORDER = WTD.SALE_ORDER " +
-						// Changed by Sankara on 04-07-13 added new join for getting correct location[Start..]	
-							" AND DT.SORD_NO = WTD.SALE_ORDER " +
-						// Changed by Sankara on 04-07-13 added new join for getting correct location[End..]	
-							" AND WTD.WAVE_ID = D.WAVE_ID " +
-							" AND D.DESP_ID = DT.DESP_ID ";
-					
+					" WHERE POD.PICK_ORDER = ? AND POD.LINE_NO = ? AND POD.PICK_ORDER = WTD.REF_ID " +
+					" AND POD.SALE_ORDER = WTD.SALE_ORDER " +
+					// Changed by Sankara on 04-07-13 added new join for getting correct location[Start..]	
+					" AND DT.SORD_NO = WTD.SALE_ORDER " +
+					// Changed by Sankara on 04-07-13 added new join for getting correct location[End..]	
+					" AND WTD.WAVE_ID = D.WAVE_ID " +
+					" AND D.DESP_ID = DT.DESP_ID ";
+
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1,pickOrder);
 					pstmt.setInt(2, pickLineNo);
@@ -1698,7 +1747,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 					}
 					rs.close(); rs = null;
 					pstmt.close(); pstmt = null;
-					
+
 					if( !isIssAvail )
 					{
 						sql = "SELECT LOC_CODE FROM PICK_ORD_DET WHERE PICK_ORDER = ? AND LINE_NO = ?";
@@ -1712,7 +1761,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 						}
 						rs.close(); rs = null;
 						pstmt.close(); pstmt = null;
-						
+
 						stockDetail.put("loc_code", locCode);
 						stockDetail.put("ref_id", pickOrder);
 						stockDetail.put("ref_line_no", pickLineNo);
@@ -1768,7 +1817,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 		try
 		{
 			sql = " SELECT RIH.CONFIRMED, RID.LOC_CODE__TO  FROM REPL_ISS_HDR RIH, REPL_ISS_DET RID WHERE RIH.REPL_ORDER = ? " +
-					" AND RIH.REPL_ORDER = RID.REPL_ORDER ";
+			" AND RIH.REPL_ORDER = RID.REPL_ORDER ";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, refId);
 			rs = pstmt.executeQuery();
@@ -1786,10 +1835,10 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 			}
 			rs.close(); rs = null;
 			pstmt.close(); pstmt = null;		
-			
+
 			if( !isIssueDone )
 			{
-				
+
 				sql = "SELECT PICK_ORDER, LINE_NO__PICK FROM REPL_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO = ?";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, refId);
@@ -1803,10 +1852,10 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 				rs.close(); rs = null;
 				pstmt.close(); pstmt = null;
 				System.out.println(" parent repl_order ["+replPickOrder+"] replPickLine ["+replPickLine+"]");
-				
+
 				if( replPickOrder.trim().length() > 0)
 				{
-				
+
 					HashMap replParent = new HashMap();
 					replParent = isParentExistAndConfirmed(replPickOrder,replPickLine, conn);	
 					replOrder = replParent.get("pick_order").toString();
@@ -1819,7 +1868,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 						lotNo = replParent.get("lot_no").toString();
 						lotSl = replParent.get("lot_sl").toString();
 						//System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]");	
-						
+
 						stockDetail.put("loc_code", locCode);
 						stockDetail.put("ref_id", refId);
 						stockDetail.put("ref_line_no", pickLineNo);
@@ -1830,7 +1879,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 						lotNo = replParent.get("lot_no").toString();
 						lotSl = replParent.get("lot_sl").toString();
 						System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]");
-						
+
 						//updateReplOrder(replOrder, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn);	
 						//updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn);
 						stockDetail.put("loc_code", locCode);
@@ -1844,10 +1893,10 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 						replOrder = replParent.get("pick_order").toString();
 						replOrderLine = Integer.parseInt(replParent.get("line_no__pick").toString());
 						System.out.println(" new repl order going to serch it's parent ["+replOrder+"] replOrderLine ["+replOrderLine+"]");
-						
+
 						replParent.clear();
 						replParent = isParentExistAndConfirmed(replOrder,replOrderLine, conn);
-						
+
 						confirmed = "";
 						confirmed = replParent.get("confirmed").toString();
 						System.out.println(" *-* confirmed ["+confirmed+"]");
@@ -1857,7 +1906,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 							lotNo = replParent.get("lot_no").toString();
 							lotSl = replParent.get("lot_sl").toString();
 							System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]");
-							
+
 							//updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn);
 							stockDetail.put("loc_code", locCode);
 							stockDetail.put("ref_id", replOrder);
@@ -1869,7 +1918,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 							lotNo = replParent.get("lot_no").toString();
 							lotSl = replParent.get("lot_sl").toString();
 							System.out.println(" locCode ["+locCode+"] lotNo ["+lotNo+"] lotSl ["+lotSl+"]");
-							
+
 							//updateReplOrder(replOrder, siteCode, itemCode, locCodeTo, lotNo, lotSl, DeallocQty, conn);
 							//updatePickOrder(pickOrder, pickLineNo, DeallocQty, conn);
 							stockDetail.put("loc_code", locCode);
@@ -1895,7 +1944,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 					stockDetail.put("ref_id", refId);
 					stockDetail.put("ref_line_no", pickLineNo);
 				}
-					
+
 			}	
 			else
 			{
@@ -1905,9 +1954,9 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 				if( isAllTaskConfirmed )
 				{
 					sql = " SELECT DT.DESP_ID, DT.LINE_NO, DT.LOC_CODE FROM DESPATCH D, DESPATCHDET DT , REPL_ORD_DET ROD , WAVE_TASK_DET WTD " +
-							" WHERE ROD.REPL_ORDER = ? AND ROD.LINE_NO = ? AND ROD.REPL_ORDER = WTD.REF_ID " +
-							" AND ROD.SALE_ORDER = WTD.SALE_ORDER AND WTD.WAVE_ID = D.WAVE_ID  AND D.DESP_ID = DT.DESP_ID ";
-					
+					" WHERE ROD.REPL_ORDER = ? AND ROD.LINE_NO = ? AND ROD.REPL_ORDER = WTD.REF_ID " +
+					" AND ROD.SALE_ORDER = WTD.SALE_ORDER AND WTD.WAVE_ID = D.WAVE_ID  AND D.DESP_ID = DT.DESP_ID ";
+
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1,refId);
 					pstmt.setInt(2, pickLineNo);
@@ -1938,7 +1987,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 					}
 					rs.close(); rs = null;
 					pstmt.close(); pstmt = null;
-					
+
 					if( !isIssAvail )
 					{
 						sql = "SELECT LOC_CODE FROM REPL_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO = ?";
@@ -1952,13 +2001,13 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 						}
 						rs.close(); rs = null;
 						pstmt.close(); pstmt = null;
-						
+
 						stockDetail.put("loc_code", locCode);
 						stockDetail.put("ref_id", refId);
 						stockDetail.put("ref_line_no", pickLineNo);
 					}
 				}
-				
+
 			}
 			System.out.println(" stockDetail ["+stockDetail+"]");
 		}
@@ -2030,7 +2079,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 		}		
 		return replOrder;
 	}
-	
+
 	private HashMap isParentExistAndConfirmed(String replOrder,int replOrderLine, Connection conn) throws ITMException
 	{
 		String sql = "";
@@ -2052,7 +2101,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 				pickOrder = checkNull(rs.getString("PICK_ORDER"));
 				lineNoPick = rs.getInt("LINE_NO__PICK");
 			}
-			
+
 			if( pickOrder.trim().length() > 0)
 			{				
 				parentExist.put("paren_exist", "YES");
@@ -2067,80 +2116,80 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 			}
 			rs.close();rs = null;
 			pstmt.close(); pstmt = null;
-				
+
 			/*if( pickOrder.trim().length() > 0 )
 			{*/				
-				/*parentExist.put("paren_exist", "YES");
+			/*parentExist.put("paren_exist", "YES");
 				parentExist.put("pick_order", pickOrder);*/
-				
-				sql = "";
-				sql = " SELECT RID.REPL_ORDER, RIH.CONFIRMED, RID.ITEM_CODE, RID.LOT_NO, RID.LOT_SL, RID.LOC_CODE__TO, RID.LOC_CODE " +
-						" FROM REPL_ISS_DET RID, REPL_ISS_HDR RIH WHERE RIH.REPL_ORDER = ? " +
-						" AND RIH.TRAN_ID = RID.TRAN_ID AND RID.REPL_ORDER = ? AND RID.LINE_NO__ORD = ? ";
-				pstmt1 = conn.prepareStatement(sql);
-				pstmt1.setString(1, replOrder);
-				pstmt1.setString(2, replOrder);
-				pstmt1.setInt(3, replOrderLine);
-				rs1 = pstmt1.executeQuery();
-				if( rs1.next() )
+
+			sql = "";
+			sql = " SELECT RID.REPL_ORDER, RIH.CONFIRMED, RID.ITEM_CODE, RID.LOT_NO, RID.LOT_SL, RID.LOC_CODE__TO, RID.LOC_CODE " +
+			" FROM REPL_ISS_DET RID, REPL_ISS_HDR RIH WHERE RIH.REPL_ORDER = ? " +
+			" AND RIH.TRAN_ID = RID.TRAN_ID AND RID.REPL_ORDER = ? AND RID.LINE_NO__ORD = ? ";
+			pstmt1 = conn.prepareStatement(sql);
+			pstmt1.setString(1, replOrder);
+			pstmt1.setString(2, replOrder);
+			pstmt1.setInt(3, replOrderLine);
+			rs1 = pstmt1.executeQuery();
+			if( rs1.next() )
+			{
+				confirmed = checkNull(rs1.getString("CONFIRMED"));
+				System.out.println( replOrder+" is confirmed ["+confirmed+"]");
+				if("Y".equalsIgnoreCase(confirmed))
 				{
-					confirmed = checkNull(rs1.getString("CONFIRMED"));
-					System.out.println( replOrder+" is confirmed ["+confirmed+"]");
-					if("Y".equalsIgnoreCase(confirmed))
-					{
-						parentExist.put("confirmed", confirmed);
-						parentExist.put("item_code", rs1.getString("ITEM_CODE"));
-						parentExist.put("lot_no", rs1.getString("LOT_NO"));
-						parentExist.put("lot_sl", rs1.getString("LOT_SL"));
-						parentExist.put("loc_code__to", rs1.getString("LOC_CODE__TO"));
-						
-					}
-					else
-					{
-						parentExist.put("confirmed", "N");
-						parentExist.put("item_code", rs1.getString("ITEM_CODE"));
-						parentExist.put("lot_no", rs1.getString("LOT_NO"));
-						parentExist.put("lot_sl", rs1.getString("LOT_SL"));
-						parentExist.put("loc_code__to", rs1.getString("LOC_CODE"));
-					}
+					parentExist.put("confirmed", confirmed);
+					parentExist.put("item_code", rs1.getString("ITEM_CODE"));
+					parentExist.put("lot_no", rs1.getString("LOT_NO"));
+					parentExist.put("lot_sl", rs1.getString("LOT_SL"));
+					parentExist.put("loc_code__to", rs1.getString("LOC_CODE__TO"));
+
 				}
 				else
 				{
-					//Getting record from repl_order 
-					sql = "";
-					sql = " SELECT ITEM_CODE, LOC_CODE, LOT_NO, LOT_SL FROM REPL_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO = ?";
-					pstmt2 = conn.prepareStatement(sql);
-					pstmt2.setString(1, replOrder);
-					pstmt2.setInt(2, replOrderLine);
-					rs2 = pstmt2.executeQuery();
-					if( rs2.next() )
-					{
-						parentExist.put("item_code", rs2.getString("ITEM_CODE"));
-						parentExist.put("lot_no", rs2.getString("LOT_NO"));
-						parentExist.put("lot_sl", rs2.getString("LOT_SL"));
-						parentExist.put("loc_code__to", rs2.getString("LOC_CODE"));
-					}
-					else
-					{
-						parentExist.put("item_code", "");
-						parentExist.put("lot_no", "");
-						parentExist.put("lot_sl", "");
-						parentExist.put("loc_code__to", "");
-					}
 					parentExist.put("confirmed", "N");
-					rs2.close();rs2 = null;
-					pstmt2.close();pstmt2 = null;					
-					
+					parentExist.put("item_code", rs1.getString("ITEM_CODE"));
+					parentExist.put("lot_no", rs1.getString("LOT_NO"));
+					parentExist.put("lot_sl", rs1.getString("LOT_SL"));
+					parentExist.put("loc_code__to", rs1.getString("LOC_CODE"));
 				}
-				rs1.close();rs1 = null;
-				pstmt1.close(); pstmt1 = null;
-				
+			}
+			else
+			{
+				//Getting record from repl_order 
+				sql = "";
+				sql = " SELECT ITEM_CODE, LOC_CODE, LOT_NO, LOT_SL FROM REPL_ORD_DET WHERE REPL_ORDER = ? AND LINE_NO = ?";
+				pstmt2 = conn.prepareStatement(sql);
+				pstmt2.setString(1, replOrder);
+				pstmt2.setInt(2, replOrderLine);
+				rs2 = pstmt2.executeQuery();
+				if( rs2.next() )
+				{
+					parentExist.put("item_code", rs2.getString("ITEM_CODE"));
+					parentExist.put("lot_no", rs2.getString("LOT_NO"));
+					parentExist.put("lot_sl", rs2.getString("LOT_SL"));
+					parentExist.put("loc_code__to", rs2.getString("LOC_CODE"));
+				}
+				else
+				{
+					parentExist.put("item_code", "");
+					parentExist.put("lot_no", "");
+					parentExist.put("lot_sl", "");
+					parentExist.put("loc_code__to", "");
+				}
+				parentExist.put("confirmed", "N");
+				rs2.close();rs2 = null;
+				pstmt2.close();pstmt2 = null;					
+
+			}
+			rs1.close();rs1 = null;
+			pstmt1.close(); pstmt1 = null;
+
 			//}
 			/*else
 			{*/
-				
+
 			//}
-							
+
 			System.out.println(" parentExist --> "+parentExist);
 		}
 		catch(Exception e)
@@ -2183,10 +2232,10 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 				throw new ITMException(ex);				
 			}
 		}
-		
+
 		return parentExist;
 	}
-	
+
 	private boolean isAllTaskConf(String refId, Connection conn) throws ITMException
 	{
 		String sql = "", sql1 = "";
@@ -2197,7 +2246,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 		int updateCount = 0;
 		int firstCount = 0, secCount = 0;
 		boolean isAllTaskCompleted = false;
-		
+
 		try
 		{
 			sql = "SELECT WAVE_ID, SALE_ORDER FROM WAVE_TASK_DET WHERE REF_ID = ? ";			
@@ -2208,41 +2257,41 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 			{
 				waveId = rs.getString("WAVE_ID");
 				saleOrder = rs.getString("SALE_ORDER");	
-				
+
 				sql1 = "SELECT COUNT(*) AS CONT FROM WAVE_TASK_DET WHERE WAVE_ID = ? AND SALE_ORDER = ? AND REF_SER <> 'S-DSP' ";
 				pstmt1 = conn.prepareStatement(sql1);
 				pstmt1.setString(1, waveId);
-			    pstmt1.setString(2, saleOrder);
-			    rs1 = pstmt1.executeQuery();
-			    if(rs1.next())
-			    {
-			    	firstCount = rs1.getInt("CONT");
-			    }
-			    rs1.close();rs1 = null;
-			    pstmt1.close();pstmt1 = null;
-				
-			    sql1 = "SELECT COUNT(*) AS CONT FROM WAVE_TASK_DET WHERE STATUS = 'Y' AND WAVE_ID = ? AND SALE_ORDER = ? AND REF_SER <> 'S-DSP' ";
+				pstmt1.setString(2, saleOrder);
+				rs1 = pstmt1.executeQuery();
+				if(rs1.next())
+				{
+					firstCount = rs1.getInt("CONT");
+				}
+				rs1.close();rs1 = null;
+				pstmt1.close();pstmt1 = null;
+
+				sql1 = "SELECT COUNT(*) AS CONT FROM WAVE_TASK_DET WHERE STATUS = 'Y' AND WAVE_ID = ? AND SALE_ORDER = ? AND REF_SER <> 'S-DSP' ";
 				pstmt1 = conn.prepareStatement(sql1);
 				pstmt1.setString(1, waveId);
-			    pstmt1.setString(2, saleOrder);
-			    rs1 = pstmt1.executeQuery();
-			    if(rs1.next())
-			    {
-			    	secCount = rs1.getInt("CONT");
-			    }
-			    rs1.close();rs1 = null;
-			    pstmt1.close();pstmt1 = null;
-				
-				
+				pstmt1.setString(2, saleOrder);
+				rs1 = pstmt1.executeQuery();
+				if(rs1.next())
+				{
+					secCount = rs1.getInt("CONT");
+				}
+				rs1.close();rs1 = null;
+				pstmt1.close();pstmt1 = null;
+
+
 			}
 			rs.close();rs = null;
 			pstmt.close();pstmt = null;
-			
+
 			if( secCount == firstCount)
 			{
 				isAllTaskCompleted = true;
 			}
-			
+
 		}
 		catch(Exception e)
 		{

webitm-wms/ibase/webitm/ejb/wms/UploadOrderEJB.java

@@ -64,7 +64,7 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 		String orderCheck = "N"; //Changed by wasim on 03-07-2015 
 		int taxAmt = 0, taxAmtMagento = 0; //Changed by wasim on 03-07-2015 
 		ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB(); //Changed by wasim on 03-07-2015 
-		int count = 0;
+		int count = 0,sCtr = 0;
 		Document dom = null;
 		double quantityS = 0,totAmt = 0,netTotAmt = 0,absDiffAmt = 0;
 		GenericUtility genericUtility = null;
@@ -79,6 +79,8 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 		String exchRate = "";
 		String finEntity = "";
 		String finCurrCode = "";
+		
+		
 		try
 		{
 
@@ -237,6 +239,30 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 				System.out.println("ErrSaleOrder------>>["+ErrSaleOrder+"]");
 				//headerValuesMap = getSorderHdrData(dom);
 				//System.out.println("After getSorderHdrData headerValuesMap------>>"+headerValuesMap); UNIT
+				
+				
+				//Changed By Manish 02/03/16 check sorder exist.start
+				sql = "SELECT COUNT(*) FROM sorder WHERE SALE_ORDER = ?";
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1, ErrSaleOrder);
+				rs = pstmt.executeQuery();
+				if(rs.next())
+				{
+					sCtr = rs.getInt(1);
+				}
+				rs.close();
+				rs = null;
+				pstmt.close();
+				pstmt = null;
+				
+				if(sCtr > 0)
+				{
+					retString = "Sales Order Number : ( "+ErrSaleOrder + ") Exist !!!";
+					return retString;
+				}
+				//Changed By Manish 02/03/16 check sorder exist.end
+				
+				
 				System.out.println("xmlString Before save data------>>["+xmlString+"]");
 				retString=saveData(this.siteCodeG, xmlString, conn);
 				System.out.println("Before retString------>>["+retString+"]");
@@ -710,7 +736,7 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 		PreparedStatement pstmt=null;
 		ResultSet rs = null;
 		int count = 0;
-		String sql="",loginCode = "",remoteHost = "",stateCodeDlv = "",stationCode = "";
+		String sql="",loginCode = "",remoteHost = "",stateCodeDlv = "",stationCode = "",cityDlv = "";
 		GenericUtility genericUtility = GenericUtility.getInstance();
 		loginCode=genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode");
 		Calendar currentDate = Calendar.getInstance();
@@ -797,7 +823,15 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 			System.out.println("ACCT_CODE__AR="+acctCodeAr);
 			System.out.println("CCTR_CODE__AR="+cctrCodeAr);
 			//Changed by wasim on to set data from finparm 12-08-2015 [END]
-
+			
+			//Changed by Manish on 02/03/16 to set dlv_city up to size [start]
+			cityDlv = checkNull(headerValesMap.get("dlv_city"));
+			if (cityDlv.length() > 20)
+			{
+				cityDlv = cityDlv.substring(0, 20);
+			}
+			//Changed by Manish on 02/03/16 to set dlv_city up to size [end]
+			                                                           
 			sql = "insert into customer ( cust_code,cust_type,cust_name,sh_name,group_code,addr1,addr2,addr3,city,state_code,"
 				+ "pin,count_code,stan_code, tele1,tele2,tele3,fax,cust_code__bil,credit_lmt,chq_name,"
 				+ "curr_code,acct_code__ar,cctr_code__ar,tax_chap,cr_term,tran_code,sales_pers,channel_partner,site_code,dis_link,"
@@ -822,7 +856,8 @@ public class UploadOrderEJB extends ActionHandlerEJB implements UploadOrderEJBLo
 			pstmt.setString(6, headerValesMap.get("dlv_add1"));//addr1
 			pstmt.setString(7, headerValesMap.get("dlv_add2"));//addr2
 			pstmt.setString(8, headerValesMap.get("dlv_add2"));//addr3
-			pstmt.setString(9, headerValesMap.get("dlv_city"));//city
+		//	pstmt.setString(9, headerValesMap.get("dlv_city"));//city
+			pstmt.setString(9, cityDlv);//city
 
 			pstmt.setString(10, stateCodeDlv);//state_code