Changed by Manish on 30/04/16

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

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

@@ -15696,7 +15696,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 							unitValue = getRateStdoum(saleOrder, itemCode, conn);
 							System.out.println("shipedQty["+shipedQty+"]");
 							actWeight = actWeight + itemWeight * shipedQty;
-
+							
+							//Changed by Manish on 29/04/16 for round off for actWeight[Start]
+							System.out.println("Active Weight before round ["+actWeight+"]");
+							actWeight = discommon.getRndamt(actWeight, "R", 0.001);
+							//Changed by Manish on 29/04/16 for round off for actWeight[end]
+							
 							if("Y".equalsIgnoreCase(hazardous))
 							{
 								pkg2.setHazmatFlag(true);
@@ -24220,12 +24225,21 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				pstmt = null;
 			}
 
-			sql = "SELECT SUM(D.QUANTITY) AS QUANTITY FROM REPL_ORD_DET D, REPL_ORD_HDR H WHERE D.ITEM_CODE = ? " 
+			/*sql = "SELECT SUM(D.QUANTITY) AS QUANTITY FROM REPL_ORD_DET D, REPL_ORD_HDR H WHERE D.ITEM_CODE = ? " 
 				+" AND D.SITE_CODE = ? AND D.LOC_CODE = ? AND D.LOT_NO = ? AND D.LOT_SL = ? "
 				+" AND CASE WHEN CANCEL_MODE IS NULL THEN 'N' ELSE CANCEL_MODE END <> 'Y'  "
 				//Changed By Pragyan 01/07/15
 				//+" AND H.REPL_ORDER = D.REPL_ORDER AND H.ORDER_TYPE IN('Q','T','P','E','I') ";
-				+" AND H.REPL_ORDER = D.REPL_ORDER AND H.ORDER_TYPE IN('Q','T','P','E','I','U','V') ";
+				+" AND H.REPL_ORDER = D.REPL_ORDER AND H.ORDER_TYPE IN('Q','T','P','E','I','U','V') ";*/
+			
+			// Changed by Manish on 28/04/16 [start]
+			sql = " SELECT SUM(CASE WHEN D.QUANTITY IS NULL THEN 0 ELSE D.QUANTITY END) AS QUANTITY FROM REPL_ORD_DET D, REPL_ORD_HDR H" +
+			" WHERE D.ITEM_CODE = ?  AND D.SITE_CODE = ? AND D.LOC_CODE = ? AND D.LOT_NO = ? AND D.LOT_SL = ?" +
+			" AND CASE WHEN CANCEL_MODE IS NULL THEN 'N' ELSE CANCEL_MODE END <> 'Y'" +
+			" AND H.REPL_ORDER = D.REPL_ORDER AND H.ORDER_TYPE IN('Q','T','P','E','I','U','V') " +
+			" AND ((SELECT COUNT(*) FROM REPL_ISS_HDR WHERE REPL_ORDER = H.REPL_ORDER AND CONFIRMED = 'Y ') = 0 ) ";
+			// Changed by Manish on 28/04/16 [end]
+			
 			pstmt =  conn.prepareStatement(sql);
 			pstmt.setString(1, itemCode);
 			pstmt.setString(2, siteCode);