Changed by Rohan on 26-10-12 for stock to dock

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

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

@@ -459,6 +459,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 									}
 									//to update actual quantity in replanishment
 									//Test
+									
 									updateRecord = updateReplanishment(replOrder,replLineNo,pickOrder,pickLineNo,quantity,true,conn);//test1sucess
 									if(updateRecord > 0)
 									{
@@ -483,7 +484,14 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 									//update actual quantity in repl_order_det.start
 									if("".equalsIgnoreCase(replPickOrder))
 									{	//to update actual quantity in repanishment
-										updateRecord = updateReplanishment(replOrder,replLineNo,pickOrder,pickLineNo,quantity,false,conn);//test1sucess
+										if(refSer.trim().equalsIgnoreCase("S-DOC") || refSer.equalsIgnoreCase("RP-PND") || refSer.equalsIgnoreCase("RP-PSO"))
+										{
+											updateRecord = updateReplanishment(replOrder,replLineNo,pickOrder,pickLineNo,quantity,true,conn);//test1sucess
+										}
+										else
+										{	
+											updateRecord = updateReplanishment(replOrder,replLineNo,pickOrder,pickLineNo,quantity,false,conn);//test1sucess
+										}	
 										if(updateRecord > 0)
 										{
 											System.out.println("Replenishment updated with actual quantity "+quantity+" For replenishment oder :"+replOrder +" and line no :"+replLineNo);
@@ -522,7 +530,14 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 								 if(dsoInvstat.trim().equalsIgnoreCase(invState.trim()))
 								 {
 									//to update actual quantity in replanishment
-									 updateRecord = updateReplanishment(replPickOrder,replPickLineNo,pickOrder,pickLineNo,quantity,false,conn);
+									 if(refSer.trim().equalsIgnoreCase("S-DOC") || refSer.equalsIgnoreCase("RP-PND") || refSer.equalsIgnoreCase("RP-PSO"))
+									 {
+											updateRecord = updateReplanishment(replPickOrder,replPickLineNo,pickOrder,pickLineNo,quantity,true,conn);//test1sucess
+									 }
+									 else
+									 {	
+										 updateRecord = updateReplanishment(replPickOrder,replPickLineNo,pickOrder,pickLineNo,quantity,false,conn);
+									 }	 
 									 if(updateRecord > 0)
 									 {
 										System.out.println("Replenishment updated with actual quantity "+quantity+" For replenishment oder :"+replPickOrder +" and line no :"+replPickLineNo);
@@ -1257,10 +1272,13 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 					lineNo = replLineNoList;
 				}	
 			}
-			
+			//Changed by Rohan on 26-10-12
+			/*
 			sql= "UPDATE REPL_ORD_DET SET ACTUAL_QTY = ACTUAL_QTY + ?" +
 				 " WHERE REPL_ORDER = ? AND LINE_NO = ?" ;
-					
+			*/
+			sql= "UPDATE REPL_ORD_DET SET ACTUAL_QTY = CASE WHEN ACTUAL_QTY IS NULL THEN 0 ELSE ACTUAL_QTY END + ?" +
+					 " WHERE REPL_ORDER = ? AND LINE_NO = ?" ;
 			pstmt =  conn.prepareStatement(sql);
 			pstmt.setDouble(1, quantity);
 			pstmt.setString(2, replOrder);