changes doen for wave status

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

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

@@ -23326,12 +23326,20 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						pstmt2 = null;
 					}									
 				}
+				
+				
+				//Changed By Dadaso 07/07/15 [Start]
+				
 				//Changed by sumit on 06/11/12 adding ref_ser R-CPA
 				//else if ( "R-DSA".equalsIgnoreCase(refSer) )
-				else if ( "R-DSA".equalsIgnoreCase(refSer) || "R-CPA".equalsIgnoreCase(refSer))
+				//else if ( "R-DSA".equalsIgnoreCase(refSer) || "R-CPA".equalsIgnoreCase(refSer))
+				else if ( "R-DSA".equalsIgnoreCase(refSer) || "R-CPA".equalsIgnoreCase(refSer) || "C-STG".equalsIgnoreCase(refSer) || "A-STG".equalsIgnoreCase(refSer))
 				{
+					//Changed By Dadaso 07/07/15 [End]
 					tempOrder = "";
-					sql1 = "SELECT PICK_ORDER FROM REPL_ORD_DET WHERE REPL_ORDER = ? ";
+					//Changed By Dadaso
+					//sql1 = "SELECT PICK_ORDER FROM REPL_ORD_DET WHERE REPL_ORDER = ? ";
+					sql1 = "SELECT PICK_ORDER FROM REPL_ORD_DET WHERE REPL_ORDER = ?  AND PICK_ORDER IS NOT NULL";
 					pstmt2 = conn.prepareStatement(sql1);
 					pstmt2.setString(1, refId);
 					rs2 = pstmt2.executeQuery();
@@ -23391,9 +23399,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						}
 						
 					}
+					//Changed by Dadaso pawar on 07/07/15 [Start]
 					//Changed by sumit on 17/11/12 updating ref_id in case of null pick_order in repl_ord_det ( not dependent) start.
-					else if( tempOrder.trim().length() == 0 && "R-CPA".equalsIgnoreCase(refSer))
+					//else if( tempOrder.trim().length() == 0 && ("R-CPA".equalsIgnoreCase(refSer))
+					else if( tempOrder.trim().length() == 0 && ("R-CPA".equalsIgnoreCase(refSer) || "C-STG".equalsIgnoreCase(refSer) || "A-STG".equalsIgnoreCase(refSer)))
 					{
+						//Changed by Dadaso pawar on 07/07/15 [End]
 						update = pstmt1.executeUpdate();
 					 	if( pstmt1 != null )
 					 	{
@@ -23607,7 +23618,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					}
 				}
 				//Changed by Dadaso pawar on 23/06/15 [Start] 
-				else if ( "C-STG".equalsIgnoreCase(refSer) || "A-STG".equalsIgnoreCase(refSer))
+				/*else if ( "C-STG".equalsIgnoreCase(refSer) || "A-STG".equalsIgnoreCase(refSer))
 				{
 					sql1 = "UPDATE WAVE_TASK_DET SET WAVE_STATUS = 'C' WHERE REF_ID = ? AND WAVE_ID = ? AND SALE_ORDER = ? AND STATUS = 'N'";
 					pstmt1 = conn.prepareStatement(sql1);
@@ -23619,7 +23630,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						System.out.println(refId +" is updated successfully ");
 					}
 					pstmt1.close(); pstmt1 = null;
-				}
+				}*/
 				//Changed by Dadaso pawar on 23/06/15 [End]
 				
 				if(pstmt1 != null)