Changed by Rohan on 08-03-13 for sorder site_code__ship insted of site_code

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

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

@@ -542,7 +542,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				   +"ITEM.DESCR,SORDITEM.QUANTITY,"
 				   +"(SORDITEM.QUANTITY - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC) PENDING_QUANTITY,"
 				   +"SORDITEM.QTY_ALLOC,SORDDET.PACK_INSTR,"
-				   +"SORDER.SITE_CODE,SORDITEM.EXP_LEV, "
+				   //Changed by Rohan on 07-03-13 to select site_code__ship instead of site_code
+				  // +"SORDER.SITE_CODE,SORDITEM.EXP_LEV, "
+				  +" SORDER.SITE_CODE__SHIP,SORDITEM.EXP_LEV, "
 				   +"SORDER.PART_QTY AS PART_QTY, CUSTOMER.SINGLE_LOT AS SINGLE_LOT, SORDITEM.MIN_SHELF_LIFE AS MIN_SHELF_LIFE "//Gulzar 5/13/2012
 				   //Chnged by Rohan 0n 22/06/12
 				   //Changed by sumit 20/08/12 getting column data start.
@@ -563,7 +565,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				   +"( SORDDET.SITE_CODE = SORDITEM.SITE_CODE ) AND  "
 				   //Changed by sumit on 20/08/12 join customer with wave_type
 				   +"( CUSTOMER.WAVE_TYPE = WAVE_TYPE.WAVE_TYPE(+)) AND "
-				   +" SORDER.SITE_CODE = ? AND "
+				    //Changed by Rohan on 07-03-13 to select site_code__ship instead of site_code
+				   //+" SORDER.SITE_CODE = ? AND "
+				   +" SORDER.SITE_CODE__SHIP = ? AND "
 				   +" ITEM.ITEM_SER >=? AND "
 				   +" ITEM.ITEM_SER <=? AND "  
 				   +" ITEM.ITEM_CODE >=? AND "
@@ -15748,7 +15752,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						"WHERE SORDER.SALE_ORDER = ? AND WAVE_TASK_DET.WAVE_ID = ?";
 				
 				*/
-				String sql = "SELECT SORDER.PORD_DATE, SORDER.SITE_CODE, SORDER.SALE_ORDER, " +
+				//Changed by Rohan on 07-03-13 to select site_code__ship instead of site_code
+				//String sql = "SELECT SORDER.PORD_DATE, SORDER.SITE_CODE, SORDER.SALE_ORDER, " +
+				String sql = "SELECT SORDER.PORD_DATE, SORDER.SITE_CODE__SHIP, SORDER.SALE_ORDER, " +
 							"SORDER.ORDER_DATE, SORDER.CUST_CODE,SORDER.CUST_CODE__DLV, " +
 							"SORDER.DLV_ADD1,SORDER.DLV_ADD2,SORDER.COUNT_CODE__DLV, " +
 							"SORDER.TRANS_MODE, SORDER.STAN_CODE, SORDER.CONFIRMED, " +