issues in wave and shipment validation only for fedex/ups

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

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

@@ -100,6 +100,8 @@ public class CheckSheetIC extends ValidatorEJB implements CheckSheetICLocal,Chec
 		String sql = "";
 		//Changed by sumit on 04/10/12 created variable confirmed
 		String confirmed = "";
+		String tranCode = "";
+		String serviceCode = "";
 		int count = 0;
 		int noOfChilds = 0;
 		int noOfParent = 0;
@@ -167,8 +169,8 @@ public class CheckSheetIC extends ValidatorEJB implements CheckSheetICLocal,Chec
 						{
 							//Changed by sumit on 04/10/12 changing sql for getting confirmed value
 							//sql = "SELECT COUNT(*) AS COUNT FROM SHIPMENT  WHERE SHIPMENT_ID = ?";
-							sql = "SELECT CONFIRMED FROM SHIPMENT S, SHIP_DOCS SD  WHERE S.SHIPMENT_ID = ? " +
-									" AND S.SHIPMENT_ID = SD.SHIPMENT_ID "+
+							sql = "SELECT S.CONFIRMED,T.TRAN_CODE,T.SERVICE_CODE FROM SHIPMENT S, SHIP_DOCS SD,TRANSPORTER T  WHERE S.SHIPMENT_ID = ? " +
+									" AND S.SHIPMENT_ID = SD.SHIPMENT_ID AND T.TRAN_CODE  = S.TRAN_CODE "+
 									" AND SD.REF_SER = ?";
 							pstmt = conn.prepareStatement( sql );
 							pstmt.setString( 1, shipmentId );
@@ -180,6 +182,9 @@ public class CheckSheetIC extends ValidatorEJB implements CheckSheetICLocal,Chec
 								//changed by sumit on 04/10/12 for validation of confirmed shipment id start.
 								//count = rs.getInt("COUNT");
 								confirmed = rs.getString("CONFIRMED");
+								tranCode =  rs.getString("TRAN_CODE");
+								serviceCode =  rs.getString("SERVICE_CODE");
+								
 								if( "Y".contentEquals(confirmed))
 								{
 									errList.add( "VMSHIPACON" );
@@ -212,7 +217,9 @@ public class CheckSheetIC extends ValidatorEJB implements CheckSheetICLocal,Chec
 							while( rs.next() )
 							{
 								printStatus = rs.getString("PRINT_STATUS");
-								if("N".equalsIgnoreCase(printStatus))
+								
+								//if("N".equalsIgnoreCase(printStatus))
+								if("N".equalsIgnoreCase(printStatus) && serviceCode != null && serviceCode.length() > 0)
 								{
 									errList.add( "INVPRINTST" );
 									errFields.add( childNodeName.toLowerCase() );

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

@@ -11090,6 +11090,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 								{
 									 tempReplList = getActiveCaseReplMap("I",locInvStat,invPndReserve,invDeepReserve,invReserve, itemCode, siteCode, locCode, lotNo, lotSl, quantity, conn);
 									 tempCaseReplList = getActiveCaseReplMap("",locInvStat,invPndReserve,invDeepReserve,invReserve, itemCode, siteCode, locCode, lotNo, lotSl, quantity, conn);
+									 
+									 if(tempReplList.size() == 0 && tempCaseReplList.size() == 0)
+									 {
+										 tempCaseReplList = getActiveCaseReplMap("X",locInvStat,invPndReserve,invDeepReserve,invReserve, itemCode, siteCode, locCode, lotNo, lotSl, quantity, conn);
+									 }
 								}					
 								if(tempReplList.size() > 0)
 								{
@@ -20235,6 +20240,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						//+" AND R.LOC_CODE = ? AND R.LOT_NO = ? AND R.LOT_SL = ? AND R.REPL_TYPE IS NULL AND R.ACTUAL_QTY > 0";
 					     +" AND R.LOC_CODE = ? AND R.LOT_NO = ? AND R.LOT_SL = ? AND CASE WHEN R.CANCEL_MODE IS NULL THEN 'N' ELSE R.CANCEL_MODE END <> 'Y' AND R.REPL_TYPE IS NULL AND R.ACTUAL_QTY > 0 ";
 				}
+				else if(replType == "X")
+				{
+					sql= "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R WHERE R.ITEM_CODE = ? AND R.SITE_CODE = ? "
+						//Change by Rohan on 20-02-13 not select uncacle repanishment.	
+						//+" AND R.LOC_CODE = ? AND R.LOT_NO = ? AND R.LOT_SL = ? AND R.REPL_TYPE IS NULL AND R.ACTUAL_QTY > 0";
+					     +" AND R.LOC_CODE = ? AND R.LOT_NO = ? AND R.LOT_SL = ? AND CASE WHEN R.CANCEL_MODE IS NULL THEN 'N' ELSE R.CANCEL_MODE END <> 'Y' AND R.REPL_TYPE IS NULL";
+				}
 				else
 				{
 					sql= "SELECT R.REPL_ORDER,R.LINE_NO,R.PICK_ORDER,R.LINE_NO__PICK,R.LOC_CODE__TO,R.ACTUAL_QTY FROM REPL_ORD_DET R WHERE R.ITEM_CODE = ? AND R.SITE_CODE = ? "
@@ -20258,12 +20270,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			pstmt.setString(3, locCode);
 			pstmt.setString(4, lotNo);
 			pstmt.setString(5, lotSl);
-			if(replType != "")
+			if(replType != "" && replType != "X")
 			{
 				pstmt.setString(6, replType);
 			}
 			
 			rs = pstmt.executeQuery();
+			
 			if(rs.next())
 			{
 				System.out.println("case1");