merge old code which removed by B Pandey while merging

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

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

@@ -183,8 +183,6 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				
 				conn.close();
 				conn = null;
-				rs.close();
-				rs = null;
 				if(pstmt != null)
 				{
 					pstmt.close();
@@ -198,7 +196,11 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				
 				
 			}
-			catch(Exception e){}
+			catch(Exception e)
+			{
+				System.out.println("Exception :Dispatch :actionHandler(String xmlString):" + e.getMessage() + ":");
+				throw new ITMException(e);
+			}
 		}
 		
 		return retString;
@@ -2087,7 +2089,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 					+"AND INV_PACK_RCP.LOT_NO = STOCK.LOT_NO "
 					+"AND INV_PACK_RCP.LOT_SL = STOCK.LOT_SL "
 					+"AND INV_PACK.ORDER_NO IN(" +orderNo+") "
-					+"AND INV_PACK.ORDER_TYPE = 'I' "
+					+"AND INV_PACK.ORDER_TYPE  in	('S','I')  "
 					+"AND INV_PACK.CONFIRMED  = 'Y' "
 					+"AND STOCK.QUANTITY >= INV_PACK_RCP.QUANTITY "   
 					+"ORDER BY INV_PACK.TRAN_DATE ,INV_PACK.TRAN_ID,INV_PACK_RCP.LINE_NO ASC ";