Changed by Rohan on 21-06-13 for despach not populate becaus of returning error string

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

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

@@ -4577,14 +4577,22 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						{
 							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;
+							//return errString;
 							
 						}
 						
-						if(itemHazSortList.size() > 0)
+						if(errString == null || errString.trim().length() == 0)
+						{
+						
+							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
+								
+							}
+						}
+						else
 						{
-							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;
 						}
 												
@@ -4635,7 +4643,7 @@ 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;
+							//return errString;
 							
 						}
 						else