Changed by Rohan on 20-06-13 for not allocate active stock from dso,pso,caspk...

Changed by Rohan on 20-06-13 for not allocate active stock from dso,pso,caspk location if active quantity is N


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

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

@@ -3217,7 +3217,18 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				
 				
 				/*Ashish */
+				//Chnaged by Rohan on 20-06-13 for not allocate stock from dso,pso,caspk location if actve quantity present & active pick is N.start
+				invStat = invStat != null?invStat.trim():"";
 				System.out.println("allocQty"+allocQty+"qtyAvailAlloc:::"+qtyAvailAlloc);
+				
+				if(((invStat.equalsIgnoreCase(resrvLoc) || invStat.equalsIgnoreCase(deepStoreLoc)  || invStat.equalsIgnoreCase(casePickLoc) )) && "N".equalsIgnoreCase(isActivePickChecked))
+				{
+					qtyAvailAlloc = Math.floor(qtyAvailAlloc/packSizeActive) * packSizeActive;
+					System.out.println("Only Case avilable Quantity["+qtyAvailAlloc+"]");
+				}
+				//Chnaged by Rohan on 20-06-13 for not allocate stock from dso,pso,caspk location if actve quantity present & active pick is N.end
+				System.out.println("allocQty"+allocQty+"qtyAvailAlloc:::"+qtyAvailAlloc);
+				
 				if (allocQty >= qtyAvailAlloc)
 				{
 					lotQtyToBeAllocated = qtyAvailAlloc;
@@ -4565,11 +4576,16 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						if(itemSortList.size() > 0)
 						{
 							errString = updatePickOrder(headerDom, detailDom,waveId, siteCode,saleOrder ,xtraParams, itemSortList,ptcnID,transPorterInfoMap,totActVolume,totActWeight,totCaseVolume,totCaseWeight,totCaseCount, conn);
+							//changed by Rohan on 20-06-13 for return errorstring
+							return errString;
+							
 						}
 						
 						if(itemHazSortList.size() > 0)
 						{
 							errString = updatePickOrder(headerDom, detailDom,waveId, siteCode,saleOrder ,xtraParams, itemHazSortList,ptcnID,transPorterInfoMap,totActHazVolume,totActHazWeight,totCaseHazVolume,totCaseHazWeight,totHazCaseCount, conn);
+							//changed by Rohan on 20-06-13 for return errorstring
+							return errString;
 						}
 												
 						//System.out.println("replListPSO.size() ["+replListPSO.size()+"] replListDSO.size() ["+replListDSO.size()+"] pickList.size()"+pickList.size());	
@@ -4618,6 +4634,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						{
 							String dspRefId = updateWaveTaskDet(waveId,4,saleOrder,"","",ptcnID,conn);
 							errString = updateShipment(headerDom, detailDom,waveId,saleOrder,dspRefId,tranCode,transMode, xtraParams, conn);
+							//changed by Rohan on 20-06-13 for return errorstring
+							return errString;
 							
 						}
 						else
@@ -4707,6 +4725,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				//changed by sumit on 23/08/12 update wave_status   
 				//errString = updateWaveSatus(waveId, conn);
 				errString = updateWaveSatus(waveId,directPickLoc, conn);
+				//changed by Rohan on 20-06-13 for return errorstring
+				return errString;
 			}
 			else
 			{