changed by sankara on 22/05/2014 updated deallocartprc, wavegenerationprc given by pragyan

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

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

@@ -316,6 +316,8 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 					" AND DESPATCH.SORD_NO = WTD.SALE_ORDER " +
 					" AND DESPATCH.CONFIRMED <> 'Y' AND WAVE_TASK.CANCEL <> 'Y' " +
 					" AND CM.STATUS <> 'R' AND CM.CARTON_TYPE = 'A' " +
+					//Changed By Pragyan 21-MAY-14 tO join carton master with pick_ord_det
+					" AND CM.CARTON_NO = POD.CARTON_NO "+
 					" AND (POD.QUANTITY - CASE WHEN POD.DEALLOC_QTY IS NULL THEN 0 ELSE POD.DEALLOC_QTY END) > 0 "+
 					/////////////////////////////////////
 					" UNION ALL "+

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

@@ -12408,8 +12408,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 								{
 									
 									System.out.println("Inside Normal Block...");
-									
-									double stkQty = getStockQty(itemCode, siteCode, lotNo, lotSl, locCode);
+									//Changed By Pragyan 21-may-14 to take stock quantity for prsv only
+									//double stkQty = getStockQty(itemCode, siteCode, lotNo, lotSl, locCode);
 									
 									System.out.println("Stock Quantity"+stkQty);
 									//if(locInvStat.equalsIgnoreCase(invDeepReserve) || locInvStat.equalsIgnoreCase(invReserve) ||  locInvStat.equalsIgnoreCase(casePickInv))
@@ -12525,8 +12525,27 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 										
 										if(locInvStat.equalsIgnoreCase(partialResrvLoc))
 										{
-											packSizeCase = stkQty;
-											pstmtRplDet.setDouble(11, stkQty);
+											//Changed By Pragyan 21-may-14 to get stock quantity.start
+											/*packSizeCase = stkQty;
+											pstmtRplDet.setDouble(11, stkQty);*/
+											
+											//double stkQty = getStockQty(itemCode, siteCode, lotNo, lotSl, locCode);
+											double stkQty = getStockQuantity(itemCode, siteCode, locCode, lotNo, lotSl, 0.0, conn) ;
+											System.out.println("Stock Quantity for prsv"+stkQty);
+											
+											if(stkQty > 0)
+											{
+												
+												packSizeCase = stkQty;
+												pstmtRplDet.setDouble(11, stkQty);
+											}
+											else
+											{
+												
+													errString = itmDBAccessEJB.getErrorString("","VTREPLQUAN","","",conn);
+													return errString;
+											}
+											//Changed By Pragyan 21-may-14 to get stock quantity.end
 											
 										}