changed by sankara on 17/09/14 updated source of wavegenerationprc and...

changed by sankara on 17/09/14 updated source of wavegenerationprc and deallocartconf st9ocktransfergrlic


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

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

@@ -642,11 +642,11 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 					{
 						//changed by sankara on 10/09/14 update despatch status
 						//updateWaveStatusDespatch(tempPTCN,conn);
-						updateWaveStatusDespatch(waveId,conn);
+						//updateWaveStatusDespatch(waveId,conn);
 						System.out.println("tempPTCN::::::::"+tempPTCN);
 						updateCartonMasterstatus(tempPTCN, conn);
 						//changed by sankara on 29/07/14 update despatch deallocate status in wave_task_det.
-						updateDespatchDeallocateStatus(tempPTCN, conn);
+						//updateDespatchDeallocateStatus(tempPTCN, conn);
 					}
 					//Changed By Pragyan 02-JUL-14 (Issue tracker No 396)To get proper count from pick order and pick line no.
 				}				
@@ -2340,7 +2340,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 					}
 					pstmt.close(); pstmt = null;
 					//changed by sankara on 29/07/14 for update deallocate status in wave_task_det
-					updateTaskDeallocateStatus(currentReplOrder,conn);
+					//updateTaskDeallocateStatus(currentReplOrder,conn);
 				}
 			}
 			// this below task is usefull for stock to dock case start
@@ -2431,7 +2431,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 							}
 							pstmt.close(); pstmt = null;
 							//changed by sankara on 29/07/14 update deallocate status in wave_task_det
-							updateTaskDeallocateStatus(parentReplOrder,conn);
+							//updateTaskDeallocateStatus(parentReplOrder,conn);
 						}
 						//changed by sankara on 20/06/14 update status in wave_task_det end.
 						//changed by sankara on 03/05/14 update cancel_mode for parent repl order only
@@ -2484,7 +2484,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 							}
 							pstmt.close(); pstmt = null;
 							//changed by sankara on 29/07/14 for update status in wave_task_det.
-							updateTaskDeallocateStatus(currentReplOrder, conn);
+							//updateTaskDeallocateStatus(currentReplOrder, conn);
 						}
 						//changed by sankara on 20/06/14 update status in wave_task_det end.
 					}
@@ -2510,7 +2510,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 						}
 						pstmt.close(); pstmt = null;
 						//changed by sankara on 29/07/14 for update status in wave_task_det.
-						updateTaskDeallocateStatus(parentReplOrder, conn);
+						//updateTaskDeallocateStatus(parentReplOrder, conn);
 					}						
 				}
 				////////////// FOR PSO TASK CANCELLING IF NO DEPENDANCY END
@@ -2564,7 +2564,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 					}
 					pstmt.close(); pstmt = null;
 					//changed by sankara on 29/07/14 for update status in wave_task_det.
-					updateTaskDeallocateStatus(parentReplOrder, conn);
+					//updateTaskDeallocateStatus(parentReplOrder, conn);
 					///////////////////////////////////////////////
 					System.out.println(" DSO repl deallocating ");
 					sql = "UPDATE REPL_ORD_DET SET CANCEL_MODE = 'Y',ACTUAL_QTY = 0 WHERE REPL_ORDER = ? AND LINE_NO = ? ";
@@ -2588,7 +2588,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 					}
 					pstmt.close(); pstmt = null;
 					//changed by sankara on 29/07/14 for update status in wave_task_det.
-					updateTaskDeallocateStatus(supRerplOrder, conn);
+					//updateTaskDeallocateStatus(supRerplOrder, conn);
 				}
 				////////////// FOR DSO TASK CANCELLING IF NO DEPENDANCY END				
 			}
@@ -2766,7 +2766,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 					}
 					pstmt.close(); pstmt = null;
 					//changed by sankara on 29/07/14 for update status in wave_task_det.
-					updateTaskDeallocateStatus(currentReplOrder, conn);
+					//updateTaskDeallocateStatus(currentReplOrder, conn);
 				}
 			}
 			if( parentReplOrder.trim().length() > 0 )
@@ -2817,7 +2817,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 						}
 						pstmt.close(); pstmt = null;	
 						//changed by sankara on 29/07/14 for update status in wave_task_det.
-						updateTaskDeallocateStatus(parentReplOrder, conn);
+						//updateTaskDeallocateStatus(parentReplOrder, conn);
 						
 						sql = "UPDATE REPL_ORD_DET SET CANCEL_MODE = 'Y' WHERE REPL_ORDER = ? AND LINE_NO = ? ";
 						pstmt = conn.prepareStatement(sql);
@@ -2839,7 +2839,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 						}
 						pstmt.close(); pstmt = null;
 						//changed by sankara on 29/07/14 for update status in wave_task_det.
-						updateTaskDeallocateStatus(currentReplOrder, conn);
+						//updateTaskDeallocateStatus(currentReplOrder, conn);
 					}
 				}
 				
@@ -3149,7 +3149,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 						updateWaveStatusTasks(refId, "P", conn);
 					}
 					//changed by sankara on 29/07/14 for update status in wave_task_det.
-					updateTaskDeallocateStatus(refId, conn);
+					//updateTaskDeallocateStatus(refId, conn);
 					
 					if("M".equalsIgnoreCase(pickType))
 					{
@@ -3243,7 +3243,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 							System.out.println(refId+ " WAVE_TASK_DET is updated susessfully ");
 						}
 						//changed by sankara on 29/07/14 for update status in wave_task_det.
-						updateTaskDeallocateStatus(refId, conn);
+						//updateTaskDeallocateStatus(refId, conn);
 						//Changed by Dhanraj START 10-JUL-14 (Pragyan) FOR Task Status CREATED not HELD when order id confirmed(Y).
 						if("M".equalsIgnoreCase(pickType))
 						{							
@@ -3291,7 +3291,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 						updateWaveStatusTasks(refId, "R", conn);
 					}
 					//changed by sankara on 29/07/14 for update status in wave_task_det.
-					updateTaskDeallocateStatus(refId, conn);
+					//updateTaskDeallocateStatus(refId, conn);
 				}
 			}
 		}
@@ -3593,7 +3593,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 						pstmt.close(); pstmt = null;
 					} // 16/06/14 end.
 					 //changed by sankara on 29/07/14 for update deallocate status in wave_task_det
-					updateTaskDeallocateStatus(replOrder, conn);
+					//updateTaskDeallocateStatus(replOrder, conn);
 					
 					if(parentReplOrder.trim().length() > 0)
 					{
@@ -3905,7 +3905,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 				}
 				pstmt.close(); pstmt = null;
 				//changed by sankara on 29/07/14 for update status in wave_task_det.
-				updateTaskDeallocateStatus(refId, conn);
+				//updateTaskDeallocateStatus(refId, conn);
 				
 				/*sql = "UPDATE CARTON_MASTER SET STATUS = 'R' WHERE PICK_ORDER = ? AND LINE_NO__PICK = ? ";
 				pstmt = conn.prepareStatement(sql);

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

@@ -2010,7 +2010,7 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 				   + " GROUP BY LOC_CODE " 
 				   + " HAVING SUM (CASE WHEN QUANTITY IS NULL THEN 0 ELSE  QUANTITY END) > 0) " 
 				   + " ORDER BY  ABS(A.LOC_ZONE - ?),A.LOC_CODE ) WHERE ROWNUM < 5" ;*/
-			sql =  " SELECT LOC_CODE,LOC_ZONE,LOC_TYPE FROM (SELECT A.LOC_CODE, A.LOC_ZONE, A.LOC_TYPE,FN_CHECK_VALID_LOC(?,A.LOC_CODE) AS LOC_CHECK_COUNT " 
+			/*sql =  " SELECT LOC_CODE,LOC_ZONE,LOC_TYPE FROM (SELECT A.LOC_CODE, A.LOC_ZONE, A.LOC_TYPE,FN_CHECK_VALID_LOC(?,A.LOC_CODE) AS LOC_CHECK_COUNT " 
 						+" FROM LOCATION A ,INVSTAT B "
 						+ " WHERE A.INV_STAT =B.INV_STAT AND B.AVAILABLE = 'Y' AND A.LOC_TYPE = ? " 
 						+ " AND A.INV_STAT IN ("+invStstPars+") " 
@@ -2019,17 +2019,22 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 						+ " SITE_CODE= ? AND INV_STAT IN ("+invStstPars+") " 
 						+ " GROUP BY LOC_CODE " 
 						+ " HAVING SUM (CASE WHEN QUANTITY IS NULL THEN 0 ELSE  QUANTITY END) > 0) " 
-						+ " ORDER BY  ABS(A.LOC_ZONE - ?),A.LOC_CODE ) WHERE  LOC_CHECK_COUNT > 0  AND ROWNUM < 5" ;
-				  
+						+ " ORDER BY  ABS(A.LOC_ZONE - ?),A.LOC_CODE ) WHERE  LOC_CHECK_COUNT > 0  AND ROWNUM < 5" ;*/
+			
+			sql =  " SELECT A.LOC_CODE, A.LOC_ZONE, A.LOC_TYPE FROM LOCATION A ,INVSTAT B ,SITE S WHERE A.INV_STAT = B.INV_STAT AND B.AVAILABLE = 'Y' " +
+				   " AND A.LOC_TYPE = ? AND S.SITE_CODE = ? AND (S.FACILITY_CODE = A.FACILITY_CODE or nvl(s.facility_code ,'N') = 'N') " +
+				   " AND A.INV_STAT IN ("+invStstPars+") AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' " +
+				   " and nvl((SELECT sum(quantity) FROM STOCK WHERE  SITE_CODE = ? AND INV_STAT IN ("+invStstPars+") and stock.loc_code = a.loc_code),0) = 0 " +
+				   " ORDER BY ABS(A.LOC_ZONE - ? ),A.LOC_CODE ";
+			  
 			// Changed by sankara on 27/08/13 for optimized the sql end.	
 
 			pstmt =  conn.prepareStatement(sql);
 			
 			//Changed By Pragyan 11-AUG-14 To check and Facility Master implementation 
-			//pstmt.setString(1, locType);
-			pstmt.setString(1, siteCode);
-			pstmt.setString(2, locType);
-			
+			pstmt.setString(1, locType);
+			pstmt.setString(2, siteCode);
+			//pstmt.setString(2, locType);
 			
 			for(cntList=0 ; cntList<invStatList.size(); cntList++)
 			{

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

@@ -7659,6 +7659,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		String pPickAllow = "";
 		//Changed By Pragyan 25/02/13 To change the Logic according to ship type.start
 		String dbShipType = "";
+		//hanged by sankara on 17/09/14 for direct pick loc insert emp code
+		String loginEmpCode = "";
 		/*String masterPackOverride = "N";
 		String parcelPickOverride = "N";*/
 		//Changed By Pragyan 25/02/13 To change the Logic according to ship type.end
@@ -7709,6 +7711,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		try
 		{
 			
+			loginEmpCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode");
 			chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
 			chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId");
 		
@@ -10732,7 +10735,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 										pstmtIssHdr.setString(5,"Y");
 										//pstmtIssHdr.setString(5,"N");
 										pstmtIssHdr.setDate(6,orderDate);
-										pstmtIssHdr.setString(7,chgUser);
+										//changed by sankara on 17/09/14 for direct pick loc insert emp code
+										//pstmtIssHdr.setString(7,chgUser);
+										pstmtIssHdr.setString(7,loginEmpCode);
 										pstmtIssHdr.setString(8,chgUser);
 										pstmtIssHdr.setDate(9,orderDate);
 										pstmtIssHdr.setString(10,chgTerm);