uncomment consolidate_repl column from insertion of wave_task

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

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

@@ -6653,8 +6653,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 	    String remarks = "";
 		//chnaged by pragyan on 15/10/14 for cold chain	
 	    String locTypeParent = "";
-	  //Changes by Dadaso pawar on 17/03/15 [Start]
-	   //String consoliRepl = "";
+	 // Changes by Dadaso pawar on 17/03/15 [Start]
+	   String consoliRepl = "";
 	  //Changes by Dadaso pawar on 17/03/15 [End]
 	    
 		try
@@ -6688,10 +6688,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			//Changed By sankara 17/05/14 for added remarks in wave proccess screen
 			remarks = checkNull(genericUtility.getColumnValue("remarks",headerDom));
 			System.out.println("wavetaskinsert::::::::"+remarks);		
-			/*//Changes by Dadaso pawar on 17/03/15 [Start]
+			//Changes by Dadaso pawar on 17/03/15 [Start]
 			consoliRepl = checkNull(genericUtility.getColumnValue("consolidate_repl",headerDom));
 			consoliRepl = consoliRepl.trim();
-			System.out.println("consoliRepl::::::::["+consoliRepl+"]");	*/
+			System.out.println("consoliRepl::::::::["+consoliRepl+"]");	
 			//Changes by Dadaso pawar on 17/03/15 [End]
 			/*
 			if("Y".equalsIgnoreCase(frmDomMasterPackAllow))
@@ -6724,7 +6724,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						"CUST_CODE__TO,	DUE_DATE__FROM, DUE_DATE__TO, CHG_USER, CHG_TERM, CHG_DATE,HOLD_STATUS,CANCEL,SITE_CODE,REMARKS,TRAN_CODE,LOC_TYPE__PARENT,BATCH_ID " +
 						// Changed by Megha on 22/01/2015 :D14JSUN007  batch_id for back order processing.
 						//Changes by Dadaso pawar on 17/03/15 [Start]
-						//",CONSOLIDATE_REPL "+
+						",CONSOLIDATE_REPL "+
 						//Changes by Dadaso pawar on 17/03/15 [End]
 						//"VALUES (?,?,?,?,?,?,?,?,?,?,?)";
 						//"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)";
@@ -6733,7 +6733,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				         // "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 				         //changed by pragyan on 25/08/14 for tran_code and loc type argumnet.
 				         //"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
-				         ") VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+				         ") VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, ?)";
 				//Changed by Rohan on 1-12-11 on [WM1ESUN006] to add ptcn into wave_task.end
 				pstmt = conn.prepareStatement(insertSql);
 				pstmt.setString(1,waveId);		
@@ -6760,9 +6760,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				pstmt.setString(17,locTypeParentInput); 
 				// Changed by Megha on 22/01/2015 :D14JSUN007  batch_id for back order processing.
 				pstmt.setString(18,batchID);
-				//Changes by Dadaso pawar on 17/03/15 [Start]
-			//	pstmt.setString(19,consoliRepl);
-				//Changes by Dadaso pawar on 17/03/15 [End]
+				//Changed by Dadaso pawar on 17/03/15 [Start]
+				pstmt.setString(19,consoliRepl);
+				//Changed by Dadaso pawar on 17/03/15 [End]
 				pstmt.executeUpdate();
 			
 				System.out.println("Start Wave Genartion.......................");