Commit 395f38c1 authored by dpawar's avatar dpawar

comment column for consolidate_repl and comment source i.e previously commeted


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97723 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c748432e
...@@ -4660,7 +4660,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -4660,7 +4660,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
errString = generateReport(waveId, conn); errString = generateReport(waveId, conn);
long endTime7 = System.currentTimeMillis(); long endTime7 = System.currentTimeMillis();
System.out.println("DIFFERANCE IN TIME FOR GENERATE REPORT IN SECONDS:::["+(endTime7-startTime7)/1000+"]"); System.out.println("DIFFERANCE IN TIME FOR GENERATE REPORT IN SECONDS:::["+(endTime7-startTime7)/1000+"]");
//Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after .start /*//Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after .start
if("P".equalsIgnoreCase(waveMode)) if("P".equalsIgnoreCase(waveMode))
{ {
...@@ -4684,7 +4684,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -4684,7 +4684,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
} }
} }
//Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after .end //Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after .end
*/
} }
//Changed by sumit on 25/08/12 .end //Changed by sumit on 25/08/12 .end
...@@ -6630,7 +6630,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -6630,7 +6630,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//chnaged by pragyan on 15/10/14 for cold chain //chnaged by pragyan on 15/10/14 for cold chain
String locTypeParent = ""; String locTypeParent = "";
//Changes by Dadaso pawar on 17/03/15 [Start] //Changes by Dadaso pawar on 17/03/15 [Start]
String consoliRepl = ""; //String consoliRepl = "";
//Changes by Dadaso pawar on 17/03/15 [End] //Changes by Dadaso pawar on 17/03/15 [End]
try try
...@@ -6664,10 +6664,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -6664,10 +6664,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed By sankara 17/05/14 for added remarks in wave proccess screen //Changed By sankara 17/05/14 for added remarks in wave proccess screen
remarks = checkNull(genericUtility.getColumnValue("remarks",headerDom)); remarks = checkNull(genericUtility.getColumnValue("remarks",headerDom));
System.out.println("wavetaskinsert::::::::"+remarks); 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 = checkNull(genericUtility.getColumnValue("consolidate_repl",headerDom));
consoliRepl = consoliRepl.trim(); consoliRepl = consoliRepl.trim();
System.out.println("consoliRepl::::::::["+consoliRepl+"]"); System.out.println("consoliRepl::::::::["+consoliRepl+"]"); */
//Changes by Dadaso pawar on 17/03/15 [End] //Changes by Dadaso pawar on 17/03/15 [End]
/* /*
if("Y".equalsIgnoreCase(frmDomMasterPackAllow)) if("Y".equalsIgnoreCase(frmDomMasterPackAllow))
...@@ -6700,7 +6700,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -6700,7 +6700,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 " + "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. // Changed by Megha on 22/01/2015 :D14JSUN007 batch_id for back order processing.
//Changes by Dadaso pawar on 17/03/15 [Start] //Changes by Dadaso pawar on 17/03/15 [Start]
",CONSOLIDATE_REPL "+ //",CONSOLIDATE_REPL "+
//Changes by Dadaso pawar on 17/03/15 [End] //Changes by Dadaso pawar on 17/03/15 [End]
//"VALUES (?,?,?,?,?,?,?,?,?,?,?)"; //"VALUES (?,?,?,?,?,?,?,?,?,?,?)";
//"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)"; //"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)";
...@@ -6737,7 +6737,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -6737,7 +6737,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
// Changed by Megha on 22/01/2015 :D14JSUN007 batch_id for back order processing. // Changed by Megha on 22/01/2015 :D14JSUN007 batch_id for back order processing.
pstmt.setString(18,batchID); pstmt.setString(18,batchID);
//Changes by Dadaso pawar on 17/03/15 [Start] //Changes by Dadaso pawar on 17/03/15 [Start]
pstmt.setString(19,consoliRepl); // pstmt.setString(19,consoliRepl);
//Changes by Dadaso pawar on 17/03/15 [End] //Changes by Dadaso pawar on 17/03/15 [End]
pstmt.executeUpdate(); pstmt.executeUpdate();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment