Request ID:W15HSUN003,palletrequest with stocks details

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

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

@@ -89,7 +89,17 @@ public class PalletReqExpiryAct extends ActionHandlerEJB implements PalletReqExp
 			String siteCode = checkNullAndTrim(genericUtility.getColumnValue("site_code",dom1));
 			//Changed for pallet request with stock detail [Start]Request Id:W15HSUN003
 			//sql = " SELECT D.LOC_CODE AS PALLET_NO ,D.ITEM_CODE,D.SITE_CODE,D.LOT_NO,D.LOT_SL" + " FROM  INV_HOLD_DET D,INV_HOLD I ,LOCATION L WHERE D.LOC_CODE=L.LOC_CODE AND I.TRAN_ID = D.TRAN_ID AND D.HOLD_STATUS != ?" + " AND I.LOCK_CODE = ?" + "AND L.INV_STAT=? AND D.SITE_CODE= ?";//EXP_LOCK
-			sql="SELECT DISTINCT (S.LOC_CODE) AS PALLET_NO ,S.ITEM_CODE, S.LOT_NO,S.LOT_SL,S.QUANTITY,S.NO_ART   FROM  INV_HOLD_DET D,INV_HOLD I , LOCATION L ,STOCK S WHERE D.LOC_CODE=L.LOC_CODE AND I.TRAN_ID = D.TRAN_ID AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ?  AND I.LOCK_CODE = ?  AND L.INV_STAT=? AND S.SITE_CODE= ? AND S.QUANTITY>0";//EXP_LOCK
+			//sql="SELECT DISTINCT (S.LOC_CODE) AS PALLET_NO ,S.ITEM_CODE, S.LOT_NO,S.LOT_SL,S.QUANTITY," +
+			//		"S.NO_ART   FROM  INV_HOLD_DET D,INV_HOLD I , LOCATION L ,STOCK S " +
+			//		"WHERE D.LOC_CODE=L.LOC_CODE AND I.TRAN_ID = D.TRAN_ID AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ?  AND I.LOCK_CODE = ?  AND L.INV_STAT=? AND S.SITE_CODE= ? AND S.QUANTITY>0";//EXP_LOCK
+
+
+			sql="SELECT S.LOC_CODE AS PALLET_NO ,S.ITEM_CODE, S.LOT_NO,S.LOT_SL,S.QUANTITY," +
+			"S.NO_ART FROM  INV_HOLD_DET D,INV_HOLD I , LOCATION L ,STOCK S WHERE  S.ITEM_CODE = D.ITEM_CODE" +
+			" AND S.LOC_CODE = D.LOC_CODE AND S.LOT_NO = D.LOT_NO AND S.LOT_SL = D.LOT_SL " +
+			"AND S.SITE_CODE = D.SITE_CODE AND D.LOC_CODE=L.LOC_CODE  AND I.TRAN_ID = D.TRAN_ID " +
+			"AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ?  AND I.LOCK_CODE = ?  " +
+			"AND L.INV_STAT=? AND S.SITE_CODE= ? AND S.QUANTITY > 0";
 			//Changed for pallet request with stock detail [End] Request Id:W15HSUN003
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, "R");
@@ -146,7 +156,7 @@ public class PalletReqExpiryAct extends ActionHandlerEJB implements PalletReqExp
 
 	public String stockNearExpiry( Document dom,Document dom1, String forcedFlag , Connection conn, boolean conStat ) throws Exception
 	{
-		String locCode="", status="",palletNo = "",itemCode="",lotNo="",lotSl="",quantity="",noArt="";;
+		String locCode="", status="",palletNo = "",itemCode="",lotNo="",lotSl="",quantity="",noArt="",sql="";
 		GenericUtility genericUtility = GenericUtility.getInstance();
 		StringBuffer xmlString = new StringBuffer("<Root>");
 		ConnDriver connDriver = new ConnDriver();
@@ -157,7 +167,13 @@ public class PalletReqExpiryAct extends ActionHandlerEJB implements PalletReqExp
 
 			//Changed for pallet request with stock detail [Start]Request Id:W15HSUN003
 			//String sql = " SELECT D.LOC_CODE AS PALLET_NO ,D.ITEM_CODE,D.SITE_CODE,D.LOT_NO,D.LOT_SL" + " FROM  INV_HOLD_DET D,INV_HOLD I ,LOCATION L WHERE D.LOC_CODE=L.LOC_CODE AND I.TRAN_ID = D.TRAN_ID AND D.HOLD_STATUS != ?" + " AND I.LOCK_CODE = ?" + "AND L.INV_STAT=? AND D.SITE_CODE= ?";//NEXP_LOCK
-			String sql="SELECT DISTINCT (S.LOC_CODE) AS PALLET_NO ,S.ITEM_CODE, S.LOT_NO,S.LOT_SL,S.QUANTITY,S.NO_ART   FROM  INV_HOLD_DET D,INV_HOLD I , LOCATION L ,STOCK S WHERE D.LOC_CODE=L.LOC_CODE AND I.TRAN_ID = D.TRAN_ID AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ?  AND I.LOCK_CODE = ?  AND L.INV_STAT=? AND S.SITE_CODE= ? AND S.QUANTITY>0";//NEXP_LOCK
+			//String sql="SELECT DISTINCT (S.LOC_CODE) AS PALLET_NO ,S.ITEM_CODE, S.LOT_NO,S.LOT_SL,S.QUANTITY,S.NO_ART   FROM  INV_HOLD_DET D,INV_HOLD I , LOCATION L ,STOCK S WHERE D.LOC_CODE=L.LOC_CODE AND I.TRAN_ID = D.TRAN_ID AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ?  AND I.LOCK_CODE = ?  AND L.INV_STAT=? AND S.SITE_CODE= ? AND S.QUANTITY>0";//NEXP_LOCK
+			sql="SELECT S.LOC_CODE AS PALLET_NO ,S.ITEM_CODE, S.LOT_NO,S.LOT_SL,S.QUANTITY," +
+			"S.NO_ART FROM  INV_HOLD_DET D,INV_HOLD I , LOCATION L ,STOCK S WHERE  S.ITEM_CODE = D.ITEM_CODE" +
+			" AND S.LOC_CODE = D.LOC_CODE AND S.LOT_NO = D.LOT_NO AND S.LOT_SL = D.LOT_SL " +
+			"AND S.SITE_CODE = D.SITE_CODE AND D.LOC_CODE=L.LOC_CODE  AND I.TRAN_ID = D.TRAN_ID " +
+			"AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ?  AND I.LOCK_CODE = ?  " +
+			"AND L.INV_STAT=? AND S.SITE_CODE= ? AND S.QUANTITY > 0";
 			//Changed for pallet request with stock detail [End]Request Id:W15HSUN003
 			PreparedStatement pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, "R");