Correct Join to show proper data.

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

webitm-dis/ibase/webitm/ejb/dis/ItemDetails.java

@@ -80,7 +80,7 @@ public class ItemDetails extends ValidatorEJB
 				pstmt.close();
 				pstmt = null;
 			}
-			//Changed By PriyankaC on 18March2018...[START]
+			//Changed By PriyankaC on 05April2018...[START]
 			/*sql = "SELECT I1.ITEM_PARNT, I1.DESCR AS PARENT_DESCR, I.UNIT, " +
 				 " (SELECT  SUM(S.QUANTITY)  FROM STOCK S WHERE S.ITEM_CODE = ? GROUP BY S.ITEM_CODE) AS QUANTITY, " +
 				 " (SELECT  SUM(S.ALLOC_QTY)  FROM STOCK S WHERE S.ITEM_CODE = ? GROUP BY S.ITEM_CODE) AS ALLOC_QTY, " +
@@ -90,7 +90,7 @@ public class ItemDetails extends ValidatorEJB
 				 " I1.HSN_NO AS HSN_NO"+
 				 " FROM ITEM I1, ITEM I WHERE I1.ITEM_PARNT = I.ITEM_CODE (+) AND I1.ITEM_CODE = ?  ";*/
 			
-			sql ="SELECT I.ITEM_CODE, I.DESCR AS PARENT_DESCR, I.UNIT,  "
+		/*	sql ="SELECT I.ITEM_CODE, I.DESCR AS PARENT_DESCR, I.UNIT,  "
  +" SUM(a.QUANTITY) AS QUANTITY,  "
  +" SUM(a.ALLOC_QTY)  AS ALLOC_QTY,  "
  +" SUM(a.HOLD_QTY) AS HOLD_QTY,  "
@@ -106,16 +106,33 @@ public class ItemDetails extends ValidatorEJB
  +" AND A.SITE_CODE  = ? "
  +" AND C.AVAILABLE  = 'Y' "
  +" AND C.STAT_TYPE  = 'M' "
- +" group by I.ITEM_CODE, I.DESCR , I.UNIT " ;
+ +" group by I.ITEM_CODE, I.DESCR , I.UNIT " ;*/
+			
+sql =" select m.ITEM_CODE, m.descr as PARENT_DESCR, m.unit, x.QUANTITY, x.ALLOC_QTY, x.HOLD_QTY, x.AVAIL_QTY from item m left outer join"
+					+ " (SELECT a.item_code,SUM(a.QUANTITY) AS QUANTITY, "
++"SUM(a.ALLOC_QTY) AS ALLOC_QTY, "
++"SUM(a.HOLD_QTY) AS HOLD_QTY, "
++"SUM(a.QUANTITY - a.ALLOC_QTY - CASE WHEN a.HOLD_QTY IS NULL THEN 0 ELSE a.HOLD_QTY END ) AVAIL_QTY "
++"FROM STOCK A, "
++"LOCATION B, "
++"INVSTAT C "
++"WHERE A.LOC_CODE = B.LOC_CODE "
++"AND B.INV_STAT = C.INV_STAT "
++"AND A.ITEM_CODE = ? "
++"AND A.SITE_CODE = ? "
++"AND C.AVAILABLE = 'Y' "
++"AND C.STAT_TYPE = 'M' "
++"group by a.item_code) x on m.item_code = x.item_code where m.item_code = ? ";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, checkNull(itemCode));
 			pstmt.setString(2, checkNull(siteCode));
+			pstmt.setString(3, checkNull(itemCode));
 			/*pstmt.setString(2, checkNull(itemCode));
 			pstmt.setString(3, checkNull(itemCode));
 			pstmt.setString(4, checkNull(itemCode));
 			pstmt.setString(5, checkNull(itemCode));*/
 			
-			//Changed By PriyankaC on 18March2018...[END]
+			//Changed By PriyankaC on 05April2018...[END]
 			rs = pstmt.executeQuery();
 			if ( rs.next())
 			{
@@ -152,7 +169,7 @@ public class ItemDetails extends ValidatorEJB
 			itemList.add(String.valueOf(allocQty));
 			itemList.add(String.valueOf(holdQty));
 			itemList.add(String.valueOf(availQty));
-			//itemList.add(String.valueOf(hsnNo));//Changed By Priyankac On 18MARCH2018.
+		  //itemList.add(String.valueOf(hsnNo));//Changed By Priyankac On 18MARCH2018.
 		}
 		catch (Exception e) 
 		{