Issue tracker No 389,404,396 point merge by Dhanraj(change by pragyan sir)

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

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

@@ -905,13 +905,16 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 				//changed by sankara on 05/06/14 validation for pick dealloc start.
 				if ( "C".equalsIgnoreCase(pickType) || "M".equalsIgnoreCase(pickType) || "A".equalsIgnoreCase(pickType) )
 				{
-					System.out.println("pickOrder:::::"+pickOrder);
-					System.out.println("lineNoPick:::::"+lineNoPick);
+					System.out.println("pickOrder::::: Changed By Pragyan["+pickOrder+"]");
+					System.out.println("lineNoPick:::::Changed By Pragyan["+lineNoPick+"]");
 					int pickCount = 0;
 					sql = " SELECT COUNT(*) AS COUNT FROM PICK_ORD_DET PO, PICK_ISS_HDR PH, PICK_ISS_DET PT WHERE PT.PICK_ORDER = PO.PICK_ORDER " +
 							" AND PT.LINE_NO__ORD = PO.LINE_NO AND PT.PICK_ORDER = PH.PICK_ORDER AND PH.CONFIRMED = 'N' AND ( PO.STATUS <>'C' OR PO.STATUS IS NULL ) " +
 							" AND (PO.QUANTITY - (CASE WHEN PO.DEALLOC_QTY IS NULL THEN 0 ELSE PO.DEALLOC_QTY END )) > 0 " +
-							" AND PT.PICK_ORDER = ? AND PT.LINE_NO = ? " ;					
+							//Changed By Pragyan 02-JUL-14 (Issue tracker No 404)To get proper count from pick order and pick line no.
+							//" AND PT.PICK_ORDER = ? AND PT.LINE_NO = ? " ;					
+							" AND PO.PICK_ORDER = ? AND PO.LINE_NO = ? " ;
+					
 					pstmt1 = conn.prepareStatement(sql);
 					pstmt1.setString(1, pickOrder);
 					pstmt1.setString(2, lineNoPick);

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

@@ -281,6 +281,8 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 					pickOrder = checkNullAndTrim(rs.getString( "PICK_ORDER" ));
 					lineNoPick = rs.getInt( "LINE_NO__PICK" );
 					orderType = checkNullAndTrim(rs.getString( "ORDER_TYPE" ));
+					//Changed By Pragyan 02-JUL-14 Stock To Dock not working for Repl 
+					replOrderLineNo  = rs.getInt("ORDER_lINE_NO");
 					// 09/02/13 manoharan actual quantity (balance quantity) is updated in multiples of number of cases so this has to be taken as the total pick quantity
 					//Changed by sumit sarkar on 25/07/12 getting actual value from repl_ord_det
 					//actualQty = rs.getInt( "ACTUAL_QTY" );
@@ -288,8 +290,10 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 					//Chnaged by Rohan on 15-02-13 for calculating actual qty from repanishment in case of stock to dock.start
 					if (!"D".equals(orderType) && !"H".equals(orderType) && !"L".equals(orderType))
 					{
+						
+						//Changed By Pragyan 02-JUL-14 Stock To Dock not working for Repl 
 						//Chnaged by Rohan on 15-02-13 for calculating actual qty from repanishment in case of stock to dock.end	
-						replOrderLineNo  = rs.getInt("ORDER_lINE_NO");
+						//replOrderLineNo  = rs.getInt("ORDER_lINE_NO");
 						
 						if(!"".equalsIgnoreCase(orderType) && ("Q".equals(orderType) || "T".equals(orderType)  || "P".equals(orderType) || "E".equals(orderType) || "I".equals(orderType) ))
 						{
@@ -596,7 +600,7 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 						/*sql = " SELECT * FROM PICK_ORD_DET P WHERE P.REPL_ORDER = ? AND P.LINE_NO__REPL = ?  " +
 								" AND FN_IS_VALID_PICK_ORDER(P.PICK_ORDER) = 'Y'";*/
 						
-						sql = "SELECT * FROM PICK_ORD_DET P WHERE P.REPL_ORDER = ? AND P.LINE_NO__REPL =? "
+						sql = 	" SELECT * FROM PICK_ORD_DET P WHERE P.REPL_ORDER = ? AND P.LINE_NO__REPL =? "
 								+ " AND FN_IS_VALID_PICK_ORDER(P.PICK_ORDER) = 'Y' AND (QUANTITY  -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0 "
 								+ " UNION ALL " 
 								+ " SELECT * FROM PICK_ORD_DET  WHERE (REPL_ORDER, LINE_NO__REPL) IN ( "