stock availability considered while packlist button

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

webitm-dis/ibase/webitm/ejb/dis/adv/DistIssueAct.java

@@ -585,10 +585,11 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
 				tareWeight = genericUtility.getColumnValue("tare_weight",dom1);	
 				netWeight = genericUtility.getColumnValue("net_weight",dom1);	
 				*/
-				sql = "SELECT COUNT(*) FROM INV_PACK WHERE ORDER_NO = ? AND ORDER_TYPE = 'D' ";
+				sql = "SELECT COUNT(*) FROM INV_PACK WHERE ORDER_NO = ? AND ORDER_TYPE = 'D' and site_code = ? ";
 				//System.out.println("sql :"+sql);
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1,distOrder);
+				pstmt.setString(2,siteCode);
 				rs = pstmt.executeQuery();
 				if (rs.next())
 				{
@@ -622,10 +623,10 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
 				{
 					//sql = "SELECT TRAN_ID, TRAN_DATE, ORDER_NO, SITE_CODE FROM INV_PACK WHERE ORDER_NO = ? "; 
 
-					sql = " SELECT inv_pack.TRAN_ID,inv_pack.TRAN_DATE,inv_pack.ORDER_NO,inv_pack.SITE_CODE FROM INV_PACK inv_pack ,site site WHERE inv_pack.ORDER_NO = ? and inv_pack.site_code = site.site_code ";  // modify by cpatil adding site_code joint on 5/11/12
+					sql = " SELECT inv_pack.TRAN_ID,inv_pack.TRAN_DATE,inv_pack.ORDER_NO,inv_pack.SITE_CODE FROM INV_PACK inv_pack  WHERE inv_pack.ORDER_NO = ? and inv_pack.site_code = ? ";  // modify by cpatil adding site_code joint on 5/11/12
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1,distOrder);
-					
+					pstmt.setString(2,siteCode);
 					rs = pstmt.executeQuery();
 					while (rs.next())
 					{
@@ -721,10 +722,14 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
 				tranIds = "''";
 			}
 			
-			sql = "SELECT LINE_NO__ORD, ITEM_CODE, LOT_NO, LOT_SL, QUANTITY,UNIT, PACK_CODE, "
-				 +"PACK_INSTR,LOC_CODE,GROSS_WEIGHT, TARE_WEIGHT, NET_WEIGHT, DIMENSION, NO_ART "
-				 +"FROM INV_PACK_RCP "
-				 +"WHERE TRAN_ID in (" + tranIds + " ) ORDER BY LINE_NO__ORD";
+			sql = "SELECT i.LINE_NO__ORD, i.ITEM_CODE, i.LOT_NO, i.LOT_SL, i.QUANTITY,i.UNIT, i.PACK_CODE, "
+				 +"i.PACK_INSTR,i.LOC_CODE,i.GROSS_WEIGHT, i.TARE_WEIGHT, i.NET_WEIGHT, i.DIMENSION, i.NO_ART "
+				 +"FROM INV_PACK_RCP  i, inv_pack h "
+				 +"WHERE h.tran_id = i.tran_id "
+				 + " and i.TRAN_ID in (" + tranIds + " ) "
+				 + " AND (select s.quantity - case when s.alloc_qty is null then 0 else s.alloc_qty end from stock s where s.item_code = i.item_code and i.site_code = h.site_code " 
+				 + " and i.loc_code = s.loc_code and i.lot_no = s.lot_no and i.lot_sl = s.lot_sl ) > i.QUANTITY "
+				 + " ORDER BY i.LINE_NO__ORD";
 			pstmt = conn.prepareStatement(sql);
 			rs =  pstmt.executeQuery();
 			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());