Changed By Pragyan Parcel Picking /LTL to Master & Parcel covert and Repl confirmation

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

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

@@ -1130,7 +1130,9 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 						System.out.println( updCnt + " wave_task rows updated successfully" );
 					}	
 					pstmt.close();pstmt = null;	
-					updateSql = " UPDATE WAVE_TASK_DET SET WAVE_STATUS = 'C' WHERE STATUS = ? AND REF_ID IN (SELECT PICK_ORDER FROM PICK_ORD_DET WHERE REPL_ORDER = ? )";
+					//Changed By Pragyan 28/02/13 To check all the pick status
+					
+					/*updateSql = " UPDATE WAVE_TASK_DET SET WAVE_STATUS = 'C' WHERE STATUS = ? AND REF_ID IN (SELECT PICK_ORDER FROM PICK_ORD_DET WHERE REPL_ORDER = ? )";
 					pstmt = conn.prepareStatement(updateSql);
 					pstmt.setString(1, "N");
 					pstmt.setString(2, replOrder);					
@@ -1147,8 +1149,42 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 					if( updCnt > 0 )
 					{					
 						System.out.println( updCnt + " wave_task rows updated successfully" );
-					}	
-					pstmt.close();pstmt = null;	
+					}	*/
+					updateSql = "  UPDATE WAVE_TASK_DET SET WAVE_STATUS = 'C' WHERE STATUS = ? AND REF_ID = ?";
+					PreparedStatement updPstmt = conn.prepareStatement(updateSql);
+					
+					String updPickOrd = "";
+					sql = "SELECT PICK_ORDER FROM PICK_ORD_DET WHERE REPL_ORDER = ?";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1,replOrder);
+					rs = pstmt.executeQuery();
+					while( rs.next() )
+					{
+						updPickOrd = rs.getString(1);
+						replStatus = isAllDependentTaskConf(replOrder, updPickOrd, conn);
+						if("Y".equalsIgnoreCase(replStatus))
+						{
+							updPstmt.setString(1, "N");
+							updPstmt.setString(2, updPickOrd);	
+							updCnt = updPstmt.executeUpdate();
+							updPstmt.clearParameters();
+						}
+						if( updCnt > 0 )
+						{					
+							System.out.println( updCnt + " wave_task rows updated successfully" );
+						}
+					}
+					if( rs != null)
+					{
+						rs.close();
+						rs = null;
+					}
+					if(pstmt != null)
+					{
+						pstmt.close();
+						pstmt = null;
+					}
+					//pstmt.close();pstmt = null;	
 					//Changed by sumit on 11/09/12 updating wave_status of pick_order of wave_task_det end.
 					
 					updCnt= 0;
@@ -1459,7 +1495,7 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 	}
 	//
 	
-	//Changed by sumit on 21/02/13 checking whether all repl is confirmed or not start.
+	/*//Changed by sumit on 21/02/13 checking whether all repl is confirmed or not start.
 	private String isAllDependentTaskConf(String replOrder, Connection conn) throws ITMException
 	{
 		String sql = "";
@@ -1514,4 +1550,61 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 		return status;
 	}
 	//Changed by sumit on 21/02/13 checking whether all repl is confirmed or not end.
+*/
+	
+//Changed by sumit on 21/02/13 checking whether all repl is confirmed or not start.
+	private String isAllDependentTaskConf(String replOrder,String pickOrder , Connection conn) throws ITMException
+	{
+		String sql = "";
+		String status = "";
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		try
+		{
+			sql = " SELECT STATUS, REF_ID FROM WAVE_TASK_DET  WHERE REF_ID IN (" 
+				+ " SELECT  REPL_ORDER FROM PICK_ORD_DET WHERE PICK_ORDER = ?)";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, pickOrder);
+			rs = pstmt.executeQuery();
+			while(rs.next())
+			{
+				status = rs.getString("STATUS");
+				System.out.println(" status of repl_order ["+rs.getString("REF_ID")+"] is ["+status+"]");
+				if( "N".equalsIgnoreCase(status))
+				{
+					return status;
+				}
+			}
+			rs.close(); rs= null;
+			pstmt.close(); pstmt = null;			
+				
+		}
+		catch(Exception e)
+		{
+			e.printStackTrace();
+			throw new ITMException(e);
+		}
+		finally
+		{
+			try
+			{
+				if(pstmt != null)
+				{
+					pstmt.close(); pstmt = null;
+				}
+				if( rs != null)
+				{
+					rs.close(); rs = null;
+				}				
+			}
+			catch(Exception ex)
+			{
+				ex.printStackTrace();
+				throw new ITMException(ex);
+			}
+		}
+		return status;
+	}
+	//Changed by sumit on 21/02/13 checking whether all repl is confirmed or not end.
+
 }

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

@@ -785,12 +785,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					//getTranInfo = getTransportInfo(saleOrderTran,itemWeight * pendingQty, conn);
 					//getTranInfo = getTransportInfo(saleOrderTran,itemWeight * pendingQty,noArt, conn);
 					
-					if("Y".equalsIgnoreCase(globalMasterPackAllow) && "Y".equalsIgnoreCase(masterPackAllow))
+					//Changed By Pragyan 27/02/13 To check changed values
+					//if("Y".equalsIgnoreCase(globalMasterPackAllow) && "Y".equalsIgnoreCase(masterPackAllow))
+					if("Y".equalsIgnoreCase(globalMasterPackAllow))
 					{
 						pickType = "M";
 					}
-					
-					else if("Y".equalsIgnoreCase(globalParcelPackAllow) && "Y".equalsIgnoreCase(parcelPackAllow))
+					//else if("Y".equalsIgnoreCase(globalParcelPackAllow) && "Y".equalsIgnoreCase(parcelPackAllow))
+					else if("Y".equalsIgnoreCase(globalParcelPackAllow))
 					{
 						pickType = "P";
 					}
@@ -11291,7 +11293,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					  + " WHERE ( A.PIN__FR =  ?  OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ?  OR   A.PIN__TO = ' ') AND (A.STAN_CODE__FR  =?  OR A.STAN_CODE__FR  = ' ' ) " 
 					  + " AND ( A.STAN_CODE__TO =?   OR A.STAN_CODE__TO = ' ')  AND ( A.STATE_CODE__FR  = ?   OR A.STATE_CODE__FR  = ' ') "
 					  + " AND ( A.STATE_CODE__TO = ?  OR  A.STATE_CODE__TO = ' ' )  AND A.DIST_ROUTE = B.DIST_ROUTE AND B.CUST_CODE = ?  "
-					  +	" AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? ";
+					  +	" AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE NOT IN ('M','P')";
 			}
 					
 			pstmt = conn.prepareStatement(sql);
@@ -11404,7 +11406,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						  + " WHERE ( A.PIN__FR =  ?  OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ?  OR   A.PIN__TO = ' ') AND (A.STAN_CODE__FR  =?  OR A.STAN_CODE__FR  = ' ' ) " 
 						  + " AND ( A.STAN_CODE__TO =?   OR A.STAN_CODE__TO = ' ')  AND ( A.STATE_CODE__FR  = ?   OR A.STATE_CODE__FR  = ' ') "
 						  + " AND ( A.STATE_CODE__TO = ?  OR  A.STATE_CODE__TO = ' ' )  AND A.DIST_ROUTE = B.DIST_ROUTE AND B.CUST_CODE = ?  "
-						  +	" AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? ";
+						  +	" AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE NOT IN ('M','P')";
 					
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1,pinFrm);
@@ -11441,7 +11443,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 							  + " WHERE ( A.PIN__FR =  ?  OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ?  OR   A.PIN__TO = ' ') AND (A.STAN_CODE__FR  =?  OR A.STAN_CODE__FR  = ' ' ) " 
 							  + " AND ( A.STAN_CODE__TO =?   OR A.STAN_CODE__TO = ' ')  AND ( A.STATE_CODE__FR  = ?   OR A.STATE_CODE__FR  = ' ') "
 							  + " AND ( A.STATE_CODE__TO = ?  OR  A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND MIN_WEIGHT <= ? "
-							  +	" AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ?";
+							  +	" AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE NOT IN ('M','P')";
 						
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1,pinFrm);
@@ -11506,7 +11508,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						  + " WHERE ( A.PIN__FR =  ?  OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ?  OR   A.PIN__TO = ' ') AND (A.STAN_CODE__FR  =?  OR A.STAN_CODE__FR  = ' ' ) " 
 						  + " AND ( A.STAN_CODE__TO =?   OR A.STAN_CODE__TO = ' ')  AND ( A.STATE_CODE__FR  = ?   OR A.STATE_CODE__FR  = ' ') "
 						  + " AND ( A.STATE_CODE__TO = ?  OR  A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND MIN_WEIGHT <= ? "
-						  +	" AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ?";
+						  //+	" AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ?";
+						  +	" AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ? AND SHIP_TYPE NOT IN ('M','P')";
 				}