Changed by Rohan on 22-03-13 changes in wave Cancellation impact of Pick deallocation

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

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

@@ -296,7 +296,9 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 					{
 						
 						//for stock to dock
-						replDet ="SELECT ITEM_CODE,LINE_NO,LOC_CODE,LOT_NO,LOT_SL,QUANTITY,"
+						//Changed by Rohan on 18-03-13 for for select Quantity as Quantity - Dealloc_qty
+						//replDet ="SELECT ITEM_CODE,LINE_NO,LOC_CODE,LOT_NO,LOT_SL,QUANTITY,"
+						replDet ="SELECT ITEM_CODE,LINE_NO,LOC_CODE,LOT_NO,LOT_SL,(QUANTITY - CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END) AS QUANTITY,"
 								+" EXP_LEV,SALE_ORDER,LINE_NO__SORD,LOC_CODE__TO,REPL_ORDER,LINE_NO " 
 								+" FROM REPL_ORD_DET WHERE REPL_ORDER = ?";
 						pstmtSql = conn.prepareStatement(replDet);
@@ -304,9 +306,13 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 					else
 					{	
 						//for active,master,case picking
-						pickDet ="SELECT ITEM_CODE,LINE_NO,LOC_CODE,LOT_NO,LOT_SL,QUANTITY," +
+						//Changed by Rohan on 18-03-13 for for select Quantity as Quantity - Dealloc_qty
+						//pickDet ="SELECT ITEM_CODE,LINE_NO,LOC_CODE,LOT_NO,LOT_SL,QUANTITY," +
+						pickDet ="SELECT ITEM_CODE,LINE_NO,LOC_CODE,LOT_NO,LOT_SL,(QUANTITY - CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END) AS QUANTITY," +
 							 "EXP_LEV,SALE_ORDER,LINE_NO__SORD,REPL_ORDER,LINE_NO__REPL,PICK_ORDER,LINE_NO FROM PICK_ORD_DET WHERE PICK_ORDER = ? ";
 						pstmtSql = conn.prepareStatement(pickDet);
+						
+						
 					}
 					//replHashMap.clear();
 					
@@ -329,7 +335,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 						expLev = checkNull( rsPick.getString("EXP_LEV") );
 						saleOrder = checkNull( rsPick.getString("SALE_ORDER") );
 						lineNoSord = checkNull( rsPick.getString("LINE_NO__SORD") );
-						
+						System.out.println("quantity to Deallocate::::"+quantity);
 						//Changed by Rohan on 22-01-13 to cancle independent Repanishment.start
 						/*
 						if(!refSer.trim().equalsIgnoreCase("S-DOC") && !refSer.equalsIgnoreCase("RP-PND") && !refSer.equalsIgnoreCase("RP-PSO"))
@@ -339,7 +345,10 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 						}	
 						//Changed by Rohan on 22-01-13 to cancle independent Repanishment.end
 						 */
-								
+						//Changed by Rohan on 21-03-13 for not call wave Cancellation
+						System.out.println("Quantity"+quantity+"refSer"+refSer);
+						if(quantity > 0 || !(refSer.trim().equalsIgnoreCase("S-DOC") || refSer.equalsIgnoreCase("RP-PND") || refSer.equalsIgnoreCase("RP-PSO")))
+						{
 							if(!refSer.trim().equalsIgnoreCase("S-DOC") && !refSer.equalsIgnoreCase("RP-PND") && !refSer.equalsIgnoreCase("RP-PSO"))
 							{	
 								replOrder = checkNull( rsPick.getString("REPL_ORDER") );
@@ -790,6 +799,30 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 								
 						  }//qty allocate > 0
 						}
+						else
+						{
+							sqlUpdate = "UPDATE WAVE_TASK SET CANCEL ='Y' WHERE WAVE_ID = ?" ;						
+							pstmtUpd = conn.prepareStatement(sqlUpdate);
+							pstmtUpd.setString(1, waveID);
+							updCnt = pstmtUpd.executeUpdate();
+							
+							if( updCnt > 0 )
+							{					
+								retString = itmDBAccess.getErrorString("","WAVEREV","");
+							}
+							else
+							{
+								retString = itmDBAccess.getErrorString("","NTWAVEREV","");
+							}
+							
+							if(pstmtUpd != null)
+							{
+								pstmtUpd.close();
+								pstmtUpd = null;
+							}
+						}
+							
+					 }
 				 }
 			 }//while close
 		
@@ -823,10 +856,16 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 						pstmtReplDet = null;
 					}
 					
+					System.out.println("status"+status+"retString"+retString);
 					if("Y".equalsIgnoreCase(status))
 					{
 						retString = itmDBAccess.getErrorString("","WAVENTREV","");
 					}
+					if("".equalsIgnoreCase(retString) && retString.trim().length() == 0)
+					{
+						System.out.println("Enter Here in Wave CAncelllation c");
+						retString = itmDBAccess.getErrorString("","WAVEREV","");
+					}
 					
 				}
 				else if (isError && connStatus)
@@ -866,6 +905,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 			}
 		}
 		System.out.println("Returning Result ::"+retString);
+		
 		return retString;
 	}
 	private String checkNull( String input )
@@ -1425,14 +1465,26 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 										
 										if(invS.trim().equalsIgnoreCase(psoLoc.trim()))
 										{
+											//Changed by Rohan on 22-03-13 for adding one shipper into actual qty
+											/*
 											updateSql= " UPDATE REPL_ORD_DET SET ACTUAL_QTY = ACTUAL_QTY - ?"
 													   +" WHERE REPL_ORDER = ? AND LINE_NO = ? ";
+											*/
+											updateSql= " UPDATE REPL_ORD_DET SET ACTUAL_QTY = ACTUAL_QTY + ?"
+													   +" WHERE REPL_ORDER = ? AND LINE_NO = ? ";
 										}
 										else
 										{
+											//Changed by Rohan on 22-03-13 for adding one shipper into actual qty
+											/*
 											updateSql= " UPDATE REPL_ORD_DET SET ACTUAL_QTY = ACTUAL_QTY - ?"
 													  +" WHERE (REPL_ORDER,LINE_NO) IN(SELECT PICK_ORDER,LINE_NO__PICK FROM REPL_ORD_DET"
 													   +" WHERE REPL_ORDER = ? AND LINE_NO = ?)";
+											*/
+											updateSql= " UPDATE REPL_ORD_DET SET ACTUAL_QTY = ACTUAL_QTY + ?"
+													  +" WHERE (REPL_ORDER,LINE_NO) IN(SELECT PICK_ORDER,LINE_NO__PICK FROM REPL_ORD_DET"
+													   +" WHERE REPL_ORDER = ? AND LINE_NO = ?)";
+											
 										}
 										pstmt1 =  conn.prepareStatement(updateSql);
 										//Changed by Rohan on 11-02-13 for reduce one case from actual qty