changed by sankara on 30/09/13 for update PickOrderPrc and PickAssignIc for...

changed by sankara on 30/09/13 for update PickOrderPrc and PickAssignIc for getting unconfirmed repl orders


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

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

@@ -74,6 +74,8 @@ public class PickAssignIC extends ValidatorEJB implements PickAssignICRemote,Pic
 		String orddatTo = "";
 		String pickOrderFrom = "";
 		String pickOrderTo = "";
+		//changed by sankara on 28/09/13 for getting unconfirmed repl_order start.
+		String pickreplStatus = "";
 		int currentFormNo = 0;
 		GenericUtility genericUtility = GenericUtility.getInstance();
 		java.sql.Date dateFrom = null;
@@ -108,10 +110,15 @@ public class PickAssignIC extends ValidatorEJB implements PickAssignICRemote,Pic
 					System.out.println("PICKORDERFROM====="+pickOrderFrom);
 					pickOrderTo = checkNull( genericUtility.getColumnValue("pick_order_to",dom) );
 					System.out.println("PICKORDERTO======="+pickOrderTo);
-					dateMap = getOrderDate(  pickOrderFrom,pickOrderTo,conn);					
+					//changed by sankara on 28/09/13 for getting unconfirmed repl_order start.
+					pickreplStatus = checkNull( genericUtility.getColumnValue("status",dom) );
+					System.out.println("PICKREPLSTATUS======"+pickreplStatus);
+					//dateMap = getOrderDate(  pickOrderFrom,pickOrderTo,conn);
+					dateMap = getOrderDate(  pickOrderFrom,pickOrderTo,pickreplStatus,conn);
+					//changed by sankara on 28/09/13 for getting unconfirmed repl_order end.
 					dateFrom = ((java.sql.Date)dateMap.get("MIN_DATE"));
 					System.out.println("dateFrom=="+dateFrom);
-		
+						            
 					if( dateFrom == null )
 					{	
 						valueXmlString.append( "<from_date><![CDATA[" ).append("").append( "]]></from_date>\r\n" );
@@ -193,8 +200,9 @@ public class PickAssignIC extends ValidatorEJB implements PickAssignICRemote,Pic
 		System.out.println( "\n****ValueXmlString :" + valueXmlString.toString() + ":********" );
 		return valueXmlString.toString();
 	}
-
-	public HashMap getOrderDate( String pickOrderFrom, String pickOrderTo,Connection conn )throws RemoteException, ITMException
+    //changed by sankara on 28/09/13 for getting unconfirmed repl_orders
+	//public HashMap getOrderDate( String pickOrderFrom, String pickOrderTo,Connection conn )throws RemoteException, ITMException
+	public HashMap getOrderDate( String pickOrderFrom, String pickOrderTo, String pickreplStatus, Connection conn )throws RemoteException, ITMException
 	{
 		String sql = "";
 		PreparedStatement pstmt = null;
@@ -204,8 +212,18 @@ public class PickAssignIC extends ValidatorEJB implements PickAssignICRemote,Pic
 		HashMap dateMap = new HashMap();
 		GenericUtility genericUtility = GenericUtility.getInstance();
 		try
-		{		 
-			sql = " SELECT MIN( ORDER_DATE ), MAX( ORDER_DATE ) FROM PICK_ORD_HDR WHERE PICK_ORDER BETWEEN ? AND ? ";
+		{
+			//changed by sankara on 28/09/13 for getting unconfirmed repl_orders start.
+			//sql = " SELECT MIN( ORDER_DATE ), MAX( ORDER_DATE ) FROM PICK_ORD_HDR WHERE PICK_ORDER BETWEEN ? AND ? ";
+			if(pickreplStatus.trim().equalsIgnoreCase("P"))
+			{
+			  sql = " SELECT MIN( ORDER_DATE ), MAX( ORDER_DATE ) FROM PICK_ORD_HDR WHERE PICK_ORDER BETWEEN ? AND ? ";
+			}
+			else
+			{
+				sql = " SELECT MIN( ORDER_DATE ), MAX( ORDER_DATE ) FROM REPL_ORD_HDR WHERE REPL_ORDER BETWEEN ? AND ? ";
+			}
+			//changed by sankara on 28/09/13 for getting unconfirmed repl_orders end.
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, pickOrderFrom);
 			pstmt.setString(2, pickOrderTo);