get packlist sql queries changed as per PB code

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

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

@@ -1550,9 +1550,15 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				despId = genericUtility.getColumnValue("desp_id",dom1);
 				System.out.println("saleOrder :"+saleOrder);
 				System.out.println("despId :"+despId);
-
-				sqlOrderNoSo = "SELECT ORDER_NO FROM INV_PACK WHERE ORDER_NO ='"+saleOrder+"'"+" AND "
-							  +"ORDER_TYPE IN ('S','I') AND CONFIRMED ='Y'";
+				
+				// 27/02/10 manoharan changed as per PB code
+				//sqlOrderNoSo = "SELECT ORDER_NO FROM INV_PACK WHERE ORDER_NO ='"+saleOrder+"'"+" AND "
+				//			  +"ORDER_TYPE IN ('S','I') AND CONFIRMED ='Y'";
+				sqlOrderNoSo = "select order_no from inv_pack "
+					+ " where order_no 	= '" + saleOrder + "' "
+					+ " and	order_type	in	('S','I') "
+					+ " and	confirmed 	= 'Y' ";
+				// 27/02/10 manoharan changed as per PB code
 				System.out.println("sqlOrderNoSo :"+sqlOrderNoSo);
 				rs = stmt.executeQuery(sqlOrderNoSo);
 				while (rs.next())
@@ -1565,8 +1571,14 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				}
 				stmt.close();
 				stmt = null;
-				sqlOrderNoPo = "SELECT ORDER_NO FROM INV_PACK WHERE ORDER_NO IN (SELECT PURC_ORDER FROM PORDER WHERE " 
-							  +"SALE_ORDER ='"+saleOrder+"'"+") AND ORDER_TYPE = 'P' AND CONFIRMED = 'Y'";
+				// 27/02/10 manoharan changed as per PB code
+				//sqlOrderNoPo = "SELECT ORDER_NO FROM INV_PACK WHERE ORDER_NO IN (SELECT PURC_ORDER FROM PORDER WHERE " 
+				//			  +"SALE_ORDER ='"+saleOrder+"'"+") AND ORDER_TYPE = 'P' AND CONFIRMED = 'Y'";
+				sqlOrderNoPo = "select order_no from inv_pack "
+					+ " where order_no 	in ( select purc_order from porder where sale_order = '" + saleOrder + "') "
+					+ " and order_type	in	('P','I') "
+					+ " and confirmed 	= 'Y' ";
+				// end 27/02/10 manoharan changed as per PB code
 				System.out.println("sqlOrderNoPo :"+sqlOrderNoPo);
 				stmt = conn.createStatement();
 				rs = stmt.executeQuery(sqlOrderNoPo);
@@ -1580,8 +1592,37 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				}
 				stmt.close();
 				stmt = null;
-				sqlOrderNoDo = "SELECT ORDER_NO FROM INV_PACK WHERE ORDER_NO IN (SELECT DIST_ORDER FROM DISTORDER "
-							  +"WHERE SALE_ORDER ='"+saleOrder+"' ) AND ORDER_TYPE ='D' AND CONFIRMED = 'Y'";	
+				// 27/02/10 manoharan changed as per PB code
+				//sqlOrderNoPo = "SELECT ORDER_NO FROM INV_PACK WHERE ORDER_NO IN (SELECT PURC_ORDER FROM PORDER WHERE " 
+				//			  +"SALE_ORDER ='"+saleOrder+"'"+") AND ORDER_TYPE = 'P' AND CONFIRMED = 'Y'";
+				sqlOrderNoPo = " select order_no from inv_pack where order_no "
+					+ " in ( select sale_order from sorder where cust_pord "
+					+ " in (Select purc_order from porder where sale_order = '" + saleOrder + "')) "
+					+ " and order_type	in	('S') "
+					+ " and  confirmed 	= 'Y' "
+					+ " and site_code in (select site_code__ship from sorder where sale_order = '" + saleOrder + "') ";
+				// end 27/02/10 manoharan changed as per PB code
+				System.out.println("sqlOrderNoPo :"+sqlOrderNoPo);
+				stmt = conn.createStatement();
+				rs = stmt.executeQuery(sqlOrderNoPo);
+				while (rs.next())
+				{
+					orderNoPo = rs.getString(1);
+					if(orderNoPo != null){
+						orderNoArrList.add(orderNoPo);
+					}
+					System.out.println("orderNoPo :"+orderNoPo);
+				}
+				stmt.close();
+				stmt = null;
+				// 27/02/10 manoharan changed as per PB code
+				//sqlOrderNoDo = "SELECT ORDER_NO FROM INV_PACK WHERE ORDER_NO IN (SELECT DIST_ORDER FROM DISTORDER "
+				//			  +"WHERE SALE_ORDER ='"+saleOrder+"' ) AND ORDER_TYPE ='D' AND CONFIRMED = 'Y'";	
+				sqlOrderNoDo = "select order_no from inv_pack  "
+					+ " where order_no 	in ( select dist_order from distorder where sale_order = ' " + saleOrder + "') "
+					+ " and order_type	in	('D','I')  "
+					+ " and confirmed 	= 'Y' ";
+				// end 27/02/10 manoharan
 				System.out.println("sqlOrderNoDo :"+sqlOrderNoDo);
 				stmt = conn.createStatement();
 				rs = stmt.executeQuery(sqlOrderNoDo);