W15GSUN003 schedular inventory hold get quaery with location code for S-ORD and D-SO

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

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

@@ -847,7 +847,7 @@ public class ScheduleAWMSInOutTasks implements Schedule
 		userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
 		chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" );
 
-		String lockCodeName = "AWMS_LOCK",lockCode = "",lineNoInterface = "";
+		String lockCodeName = "AWMS_LOCK",lockCode = "",lineNoInterface = "",locCodeFrom = "";
 		boolean headerFlag = true;
 
 		try
@@ -899,15 +899,23 @@ public class ScheduleAWMSInOutTasks implements Schedule
 					/*sql = "SELECT ITEM_CODE,LINE_NO,QUANTITY,LOT_NO,LOT_SL,LOC_CODE,SITE_CODE__MFG AS SITE_CODE"
 							+ " FROM DISTORDER_ALLOC WHERE DIST_ORDER = ? AND LINE_NO = ?";*/
 					sql = "SELECT S.ITEM_CODE,S.QUANTITY,S.LOT_NO,S.LOT_SL,S.LOC_CODE,H.SITE_CODE"
-							+" FROM DISTORDER_ALLOC D,DISTORDER H,STOCK S WHERE D.DIST_ORDER = ? AND D.LINE_NO = ?"
+							//+" FROM DISTORDER_ALLOC D,DISTORDER H,STOCK S WHERE D.DIST_ORDER = ? AND D.LINE_NO = ?"
+							+" FROM DISTORDER_ALLOC D,DISTORDER H,STOCK S WHERE D.DIST_ORDER = ? AND D.LOC_CODE = ? AND D.LINE_NO = ?"
 							+" AND D.DIST_ORDER = H.DIST_ORDER AND S.SITE_CODE = H.SITE_CODE AND S.ITEM_CODE = D.ITEM_CODE"
 							+" AND S.LOC_CODE = D.LOC_CODE AND S.LOT_SL = D.LOT_SL AND S.LOT_NO = D.LOT_NO";
 				}
 			}
 			else if("S-ORD".equalsIgnoreCase(refSer))
 			{
-				sql = "SELECT ITEM_CODE,LINE_NO,QUANTITY,LOT_NO,LOT_SL,LOC_CODE,"
-						+ "SITE_CODE FROM SORDALLOC WHERE SALE_ORDER = ? AND LINE_NO = ?";
+				/*sql = "SELECT ITEM_CODE,LINE_NO,QUANTITY,LOT_NO,LOT_SL,LOC_CODE,"
+						+ "SITE_CODE FROM SORDALLOC WHERE SALE_ORDER = ? AND LINE_NO = ?";*/
+				sql = "SELECT S.ITEM_CODE,D.LINE_NO,S.QUANTITY,S.LOT_NO,S.LOT_SL,S.LOC_CODE,S.SITE_CODE"
+				      +" FROM SORDALLOC D,SORDER H,STOCK S" 
+				      //+" WHERE D.SALE_ORDER = '0000001440' AND D.LINE_NO = '  2' AND S.QUANTITY > 0"
+				      +" WHERE D.SALE_ORDER = ? AND D.LOC_CODE = ? AND D.LINE_NO = ? AND S.QUANTITY > 0"
+				      +" AND D.SALE_ORDER = H.SALE_ORDER"
+					  +" AND D.LOT_NO = S.LOT_NO AND D.LOT_SL = S.LOT_SL"
+					  +" AND D.ITEM_CODE = S.ITEM_CODE AND D.LOC_CODE = S.LOC_CODE AND D.SITE_CODE = S.SITE_CODE";
 			}
 			else if("PZ".equalsIgnoreCase(refSer))
 			{
@@ -941,6 +949,9 @@ public class ScheduleAWMSInOutTasks implements Schedule
 			rsInterface = pstmtInterface.executeQuery();
 			while(rsInterface.next())
 			{
+				
+				locCodeFrom = checkNullAndTrim(rsInterface.getString("PALLET_NO"));
+				
 				if("S-ORD".equalsIgnoreCase(refSer))//this is because sordalloc has char(3) in line_no
 				{
 					lineNoInterface = checkNullAndTrim(rsInterface.getString("LINE_NO"));
@@ -976,14 +987,28 @@ 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))
+				//pstmt.setString(2, lineNoInterface);
+				if("D-SO".equalsIgnoreCase(refSer) && countDso > 0)
+				{
+					pstmt.setString(2, locCodeFrom);
+					pstmt.setString(3, lineNoInterface);
+				}
+				else if("S-ORD".equalsIgnoreCase(refSer))
 				{
+					pstmt.setString(2, locCodeFrom);
+					pstmt.setString(3, lineNoInterface);
+				}
+				else if("PR".equalsIgnoreCase(refSer) || "PRS".equalsIgnoreCase(refSer))
+				{
+					pstmt.setString(2, lineNoInterface);
 					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]
+				else
+				{
+					pstmt.setString(2, lineNoInterface);
+				}
+				
 				rs = pstmt.executeQuery();
 				while(rs.next())
 				{
@@ -1029,10 +1054,12 @@ public class ScheduleAWMSInOutTasks implements Schedule
 				rs.close();rs = null;
 				pstmt.clearParameters();
 
-				sqlUpdate = "UPDATE SWMS_TO_AWMS SET SCHEDULE_STATUS = 'Y' WHERE REF_ID = ? AND LINE_NO = ?";
+				//sqlUpdate = "UPDATE SWMS_TO_AWMS SET SCHEDULE_STATUS = 'Y' WHERE REF_ID = ? AND LINE_NO = ?";
+				sqlUpdate = "UPDATE SWMS_TO_AWMS SET SCHEDULE_STATUS = 'Y' WHERE REF_ID = ? AND LINE_NO = ? AND PALLET_NO = ?";
 				pstmtUpdate = conn.prepareStatement(sqlUpdate);
 				pstmtUpdate.setString(1, refId);
 				pstmtUpdate.setString(2, lineNoInterface.trim());
+				pstmtUpdate.setString(3, locCodeFrom);
 				caseCount = pstmtUpdate.executeUpdate();
 				System.out.println("Updated ="+caseCount);
 				pstmtUpdate.close();pstmtUpdate = null;