Bug fixing multiple wizard

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

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

@@ -144,6 +144,8 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 						+ " FROM MULTI_PICK_ISS_DET R,  PICK_ORD_DET O ,PICK_ORD_HDR H,WAVE_TASK_DET W  WHERE R.TRAN_ID = ? "
 						//Changed by samadhan on 15/05/2015 D14ISUN007 for Multi pick. End
 						+ " AND R.PICK_ORDER = O.PICK_ORDER AND H.PICK_ORDER = O.PICK_ORDER "
+						//Changed By Pragyan on 01/07/2015 
+						+ " AND O.LINE_NO = R.PICK_ORD__LINE_NO  " 
 						//+ " AND O.LINE_NO = R.LINE_NO__SORD "
 						+ " AND R.ITEM_CODE = O.ITEM_CODE  " 
 						//Changed By Samadhan on 15/05/2015 D14ISUN007 for Multi pick

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

@@ -13194,6 +13194,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 														pstmtRplDet.setInt(2,refCtr);
 														pstmtRplDet.setString(12,"");
 														//replCnt++;
+														//Changed By Pragyan 01/07/15
+														pstmtRplDet.setString(7,locCode);
 														pstmtRplDet.setInt(13,0);
 														
 														/*if(locInvStat.equalsIgnoreCase(partialResrvLoc))
@@ -21548,7 +21550,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 	        				//Change by Rohan on 19-02-13 to not select cancle repanishment & add stock > 0
 	        				//+" AND H.REPL_ORDER = D.REPL_ORDER AND H.ORDER_TYPE NOT IN('Q','T','P','E','I') AND D.ACTUAL_QTY > 0 ";
 	        				+" AND CASE WHEN CANCEL_MODE IS NULL THEN 'N' ELSE CANCEL_MODE END <> 'Y'  "
-	        				+" AND H.REPL_ORDER = D.REPL_ORDER AND H.ORDER_TYPE NOT IN('Q','T','P','E','I') AND D.ACTUAL_QTY > 0 AND S.QUANTITY > 0 ";
+	        				//Changed By Pragyan 01/07/15
+	        				//+" AND H.REPL_ORDER = D.REPL_ORDER AND H.ORDER_TYPE NOT IN('Q','T','P','E','I') AND D.ACTUAL_QTY > 0 AND S.QUANTITY > 0 ";
+	        				+" AND H.REPL_ORDER = D.REPL_ORDER AND H.ORDER_TYPE NOT IN('Q','T','P','E','I','U','V') AND D.ACTUAL_QTY > 0 AND S.QUANTITY > 0 ";
 	        				
 				//Changed by Rohan on 06-02-13 to retrive only case Repalnishment.end
 	        			
@@ -23195,7 +23199,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			sql = "SELECT SUM(D.QUANTITY) AS QUANTITY FROM REPL_ORD_DET D, REPL_ORD_HDR H WHERE D.ITEM_CODE = ? " 
 					+" AND D.SITE_CODE = ? AND D.LOC_CODE = ? AND D.LOT_NO = ? AND D.LOT_SL = ? "
     				+" AND CASE WHEN CANCEL_MODE IS NULL THEN 'N' ELSE CANCEL_MODE END <> 'Y'  "
-    				+" AND H.REPL_ORDER = D.REPL_ORDER AND H.ORDER_TYPE IN('Q','T','P','E','I') ";
+    				//Changed By Pragyan 01/07/15
+    				//+" AND H.REPL_ORDER = D.REPL_ORDER AND H.ORDER_TYPE IN('Q','T','P','E','I') ";
+    				+" AND H.REPL_ORDER = D.REPL_ORDER AND H.ORDER_TYPE IN('Q','T','P','E','I','U','V') ";
 			pstmt =  conn.prepareStatement(sql);
 			pstmt.setString(1, itemCode);
 			pstmt.setString(2, siteCode);
@@ -23740,7 +23746,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 
 				if(replType == "")
 				{
-					sql= "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R WHERE R.ITEM_CODE = ? AND R.SITE_CODE = ? "
+					//Changed by Pragyan 01/07/15 to join header for order type
+					//sql= "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R WHERE R.ITEM_CODE = ? AND R.SITE_CODE = ? "
+					sql= "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY "
+						+ " FROM REPL_ORD_DET R,REPL_ORD_HDR H WHERE H.REPL_ORDER = R.REPL_ORDER AND H.ORDER_TYPE NOT IN ('U','V') "
+						+ " AND R.ITEM_CODE = ? AND R.SITE_CODE = ? "
 						//Change by Rohan on 20-02-13 not select uncacle repanishment.	
 						//+" AND R.LOC_CODE = ? AND R.LOT_NO = ? AND R.LOT_SL = ? AND R.REPL_TYPE IS NULL AND R.ACTUAL_QTY > 0";
 					     +" AND R.LOC_CODE = ? AND R.LOT_NO = ? AND R.LOT_SL = ? AND CASE WHEN R.CANCEL_MODE IS NULL THEN 'N' ELSE R.CANCEL_MODE END <> 'Y' AND R.REPL_TYPE IS NULL AND R.ACTUAL_QTY > 0 ";
@@ -23753,12 +23763,20 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					
 					if(locInvstat.equalsIgnoreCase(deepStoreInvstat) || locInvstat.equalsIgnoreCase(reserveInvstat))
 					{
-						sql= "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R WHERE R.ITEM_CODE = ? AND R.SITE_CODE = ? "
+
+						//Changed by Pragyan 01/07/15 to join header for order type
+						//sql= "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R WHERE R.ITEM_CODE = ? AND R.SITE_CODE = ? "
+						sql= "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R"
+								+ ",REPL_ORD_HDR H WHERE H.REPL_ORDER = R.REPL_ORDER AND H.ORDER_TYPE NOT IN ('U','V') AND R.ITEM_CODE = ? AND R.SITE_CODE = ? "
 									+" AND R.LOC_CODE = ? AND R.LOT_NO = ? AND R.LOT_SL = ? AND CASE WHEN R.CANCEL_MODE IS NULL THEN 'N' ELSE R.CANCEL_MODE END <> 'Y'";
 					}
 					else
 					{
-						sql= "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R WHERE R.ITEM_CODE = ? AND R.SITE_CODE = ? "
+
+						//Changed by Pragyan 01/07/15 to join header for order type
+						//sql= "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R WHERE R.ITEM_CODE = ? AND R.SITE_CODE = ? "
+						sql= "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R "
+								+ " ,REPL_ORD_HDR H WHERE H.REPL_ORDER = R.REPL_ORDER AND H.ORDER_TYPE NOT IN ('U','V') AND R.ITEM_CODE = ? AND R.SITE_CODE = ? "
 							 //+" AND R.LOC_CODE = ? AND R.LOT_NO = ? AND R.LOT_SL = ? AND CASE WHEN R.CANCEL_MODE IS NULL THEN 'N' ELSE R.CANCEL_MODE END <> 'Y' AND R.REPL_TYPE IS NULL AND R.ACTUAL_QTY > 0";
 								+" AND R.LOC_CODE = ? AND R.LOT_NO = ? AND R.LOT_SL = ? AND CASE WHEN R.CANCEL_MODE IS NULL THEN 'N' ELSE R.CANCEL_MODE END <> 'Y' AND R.REPL_TYPE IS NULL AND R.ACTUAL_QTY > 0";
 					}
@@ -23766,7 +23784,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				}
 				else
 				{
-					sql= "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R WHERE R.ITEM_CODE = ? AND R.SITE_CODE = ? "
+
+					//Changed by Pragyan 01/07/15 to join header for order type
+					//sql= "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R WHERE R.ITEM_CODE = ? AND R.SITE_CODE = ? "
+					sql= "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R "
+							+ ",REPL_ORD_HDR H WHERE H.REPL_ORDER = R.REPL_ORDER AND H.ORDER_TYPE NOT IN ('U','V') AND R.ITEM_CODE = ? AND R.SITE_CODE = ? "
 							//Chnage by Rohan on 20-02-13 not select uncacel repanishment	
 						//+" AND R.LOC_CODE = ? AND R.LOT_NO = ? AND R.LOT_SL = ? AND R.REPL_TYPE = ? AND R.ACTUAL_QTY > 0";
 						+" AND R.LOC_CODE = ? AND R.LOT_NO = ? AND R.LOT_SL = ? AND CASE WHEN R.CANCEL_MODE IS NULL THEN 'N' ELSE R.CANCEL_MODE END <> 'Y' AND R.REPL_TYPE = ? AND R.ACTUAL_QTY > 0";
@@ -23825,7 +23847,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				
 				if(replType == "I")
 				{
-					sqlPnd = "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R,lOCATION L WHERE R.PICK_ORDER = ? AND L.LOC_CODE = R.LOC_CODE AND R.LINE_NO__PICK = ?";
+					//Changed by Pragyan 01/07/15 to join header for order type
+					//sqlPnd = "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R,lOCATION L WHERE R.PICK_ORDER = ? AND L.LOC_CODE = R.LOC_CODE AND R.LINE_NO__PICK = ?";
+					sqlPnd = "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R,lOCATION L,REPL_ORD_HDR H WHERE R.REPL_ORDER = H.REPL_ORDER "
+							+ " AND H.ORDER_TYPE NOT IN('U','V') AND  R.PICK_ORDER = ? AND L.LOC_CODE = R.LOC_CODE AND R.LINE_NO__PICK = ?";
+					
 					System.out.println("case2");
 					pstmt =  conn.prepareStatement(sqlPnd);
 					pstmt.setString(1, replOrder);
@@ -23842,8 +23868,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				}
 				else
 				{
-					sqlPnd = "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R,lOCATION L " +
-							" WHERE R.PICK_ORDER = ? AND R.LINE_NO__PICK = ? AND L.LOC_CODE = R.LOC_CODE AND L.INV_STAT = ?";
+					//sqlPnd = "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R,lOCATION L " +
+					sqlPnd = "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R,lOCATION L ,REPL_ORD_HDR H WHERE R.REPL_ORDER = H.REPL_ORDER " 
+							+"  AND H.ORDER_TYPE NOT IN('U','V') AND R.PICK_ORDER = ? AND R.LINE_NO__PICK = ? AND L.LOC_CODE = R.LOC_CODE AND L.INV_STAT = ?";
 					System.out.println("case2");
 					pstmt =  conn.prepareStatement(sqlPnd);
 					pstmt.setString(1, replOrder);
@@ -23885,6 +23912,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				tempList.add(pickOrder);
 				tempList.add(lineNoPick);
 			}
+			
+			System.out.println("FINAL REPLENISHMENT FOUND FOR REPL["+LocCodeTo+"]Repl Order["+replOrder+"]Repl Line no["+replLineNo+"]actuaQty["+actuaQty+"]");
 					
         }
 		catch(Exception e)