W15GSUN003 updated for holding inventory for quarantine location

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

webitm-wms/ibase/webitm/utility/wms/ScheduleAWMSInOutTasks.java

@@ -136,24 +136,8 @@ public class ScheduleAWMSInOutTasks implements Schedule
 					interfaceHmap.put("IN_OUT", inOut);
 				
 						countError = 0;
-						//Changed by wasim on 21-12-2015 for ref ser PZ not to go on hold if in_out P [start]
-						/*sqlInf = "SELECT COUNT(*) AS COUNT FROM WMS_TO_HOST WHERE REF_ID = ? AND MSG_STAT = 'E' "
-								+ "AND LINE_NO IN (SELECT LINE_NO FROM SWMS_TO_AWMS WHERE REF_ID = ? AND SCHEDULE_STATUS = 'N')";//Changed by wasim on 26-11-15 to schedule_status is null to N*/
-						sqlInf = "SELECT COUNT(*) AS COUNT FROM WMS_TO_HOST WHERE REF_ID = ? AND IN_OUT = 'P' "
-								+ "AND LINE_NO IN (SELECT LINE_NO FROM SWMS_TO_AWMS WHERE REF_ID = ? AND SCHEDULE_STATUS = 'N')";
-						//Changed by wasim on 21-12-2015 for ref ser PZ not to go on hold if in_out P [end]
-						interfacePstmt = conn.prepareStatement(sqlInf);
-						interfacePstmt.setString(1, refId);
-						interfacePstmt.setString(2, refId);
-						rsInf = interfacePstmt.executeQuery();
-						if(rsInf.next())
-						{
-							countError = rsInf.getInt("COUNT");
-						}
-						rsInf.close();rsInf = null;
-						interfacePstmt.close();interfacePstmt = null;
 						
-						if(countError > 0)
+						if("P".equalsIgnoreCase(inOut))
 						{	
 							if(!"PZ".equalsIgnoreCase(refSer))
 							{
@@ -181,10 +165,12 @@ public class ScheduleAWMSInOutTasks implements Schedule
 								conn.commit();
 							}
 						}
-					
+						if("I".equalsIgnoreCase(inOut))
+						{	
 							System.out.println("Going for stock transfer refId["+refId+"]refSer["+refSer+"]inOut["+inOut+"]");
 							errString = stockTransfer(interfaceHmap,xtraParams,conn);
 						}	
+				}
 				catch(Exception ex)
 				{
 					System.out.println("Exception caught for refId["+refId+"] so rollbacking and going for next ref id");
@@ -751,7 +737,7 @@ public class ScheduleAWMSInOutTasks implements Schedule
         String sql = "",loginSiteCode = "",userId = "",sqlInterface = "",sqlDso = "";
         int updCnt = 0,lineNo = 0,caseCount = 0,countDso = 0;
         
-        String holdInsertSql = "",holddetInsertSql = "",invtranId = "",invLockDetsql = "",errString = "",sqlUpdate = "";
+        String holdInsertSql = "",holddetInsertSql = "",invtranId = "",invLockDetsql = "",errString = "",sqlUpdate = "",locCodeQuarnt = "";
         
         String refSer = "",refId = "",itemCode = "",locCode = "",lotNo = "",lotSl = "";
         
@@ -828,20 +814,20 @@ public class ScheduleAWMSInOutTasks implements Schedule
         	{
 				//sql = "SELECT S.ITEM_CODE,S.LOT_NO,S.LOT_SL,S.LOC_CODE,"+
 				sql = "SELECT S.ITEM_CODE,S.LOT_NO,S.LOT_SL,S.LOC_CODE,P.PALLET_NO,"+ //Changed by wasim on 08-12-2015 to TAKE loc code for PR/PRS as it will be pallet no 
-        				" S.SITE_CODE FROM STOCK S,PALLET_REQ_DET P WHERE S.LOC_CODE = P.PALLET_NO AND S.INV_STAT = 'AWMS'" +
-        				" AND P.TRAN_ID = ? AND P.LINE_NO = ? AND S.QUANTITY > 0";
+        				" S.SITE_CODE FROM STOCK S,PALLET_REQ_DET P WHERE " +
+        				" P.TRAN_ID = ? AND P.LINE_NO = ? AND S.QUANTITY > 0 AND (S.LOC_CODE = P.PALLET_NO OR S.LOC_CODE = ?)";
         	}
 			else if("PRS".equalsIgnoreCase(refSer))
         	{
-				sql = "SELECT P.ITEM_CODE,P.QUANTITY,P.LOT_NO,P.LOT_SL,P.LOC_CODE,H.SITE_CODE,P.PALLET_NO"
+				sql = "SELECT P.ITEM_CODE,P.QUANTITY,P.LOT_NO,P.LOT_SL,S.LOC_CODE,H.SITE_CODE,P.PALLET_NO"
 						+" FROM PALLET_REQ_DET P,STOCK S,PALLET_REQ_HDR H WHERE P.TRAN_ID = ? AND P.LINE_NO = ?" 
-						+" AND P.TRAN_ID = H.TRAN_ID AND S.INV_STAT = 'AWMS'"
-						+" AND P.ITEM_CODE = S.ITEM_CODE AND H.SITE_CODE = S.SITE_CODE AND P.PALLET_NO = S.LOC_CODE AND P.LOT_NO = S.LOT_NO" 
+						+" AND P.TRAN_ID = H.TRAN_ID "
+						+" AND P.ITEM_CODE = S.ITEM_CODE AND H.SITE_CODE = S.SITE_CODE AND ( P.PALLET_NO = S.LOC_CODE OR S.LOC_CODE = ?) AND P.LOT_NO = S.LOT_NO" 
 						+" AND P.LOT_SL = S.LOT_SL AND S.QUANTITY > 0";
         	}
 			pstmt = conn.prepareStatement(sql);
 			
-        	sqlInterface = "SELECT LINE_NO FROM WMS_TO_HOST WHERE REF_ID = ? AND IN_OUT = 'P'" //Changed by wasim on 21-12-15 to change msg_stat to in_out = p 
+        	sqlInterface = "SELECT DISTINCT (LINE_NO),PALLET_NO FROM WMS_TO_HOST WHERE REF_ID = ? AND IN_OUT = 'P'" //Changed by wasim on 21-12-15 to change msg_stat to in_out = p 
         			+ " AND LINE_NO IN (SELECT LINE_NO FROM SWMS_TO_AWMS WHERE REF_ID = ? AND SCHEDULE_STATUS = 'N')";//Changed by wasim on 26-11-15 to schedule_status is null to N
         	pstmtInterface = conn.prepareStatement(sqlInterface);
         	pstmtInterface.setString(1, refId);
@@ -881,6 +867,13 @@ public class ScheduleAWMSInOutTasks implements Schedule
 			
 				pstmt.setString(1, refId);
 				pstmt.setString(2, lineNoInterface);
+				//Changed by wasim on 21-12-2015 to check Q loc code if not found data [start]
+				if("PR".equalsIgnoreCase(refSer) || "PRS".equalsIgnoreCase(refSer))
+				{
+					locCodeQuarnt = checkNullAndTrim(rsInterface.getString("PALLET_NO"));
+					pstmt.setString(3, locCodeQuarnt+"Q");
+				}
+				//Changed by wasim on 21-12-2015 to check Q loc code if not found data [end]
 				rs = pstmt.executeQuery();
 				while(rs.next())
 				{
@@ -895,7 +888,8 @@ public class ScheduleAWMSInOutTasks implements Schedule
 					//locCode  = checkNullAndTrim(rs.getString("LOC_CODE"));
 					if("PR".equalsIgnoreCase(refSer) || "PRS".equalsIgnoreCase(refSer))
 					{
-						locCode  = checkNullAndTrim(rs.getString("PALLET_NO"));
+						//locCode  = checkNullAndTrim(rs.getString("PALLET_NO"));//Changed by wasim on 22-12-2015 as pallet_no = stock loc_code
+						locCode  = checkNullAndTrim(rs.getString("LOC_CODE"));
 					}
 					else
 					{