bug in view data master,parcel selection

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

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

@@ -648,12 +648,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					getTranInfo = new HashMap();
 					saleOrderTran = rs.getString("SALE_ORDER");
 					
-					if("Y".equalsIgnoreCase(globalMasterPackAllow))
+					//if("Y".equalsIgnoreCase(globalMasterPackAllow))
+					if("Y".equalsIgnoreCase(globalMasterPackAllow) || (globalMasterPackAllow.length() == 0 && "Y".equalsIgnoreCase(masterPackAllow)))
 					{
 						pickType = "M";
 					}
 
-					else if("Y".equalsIgnoreCase(globalParcelPackAllow))
+					//else if("Y".equalsIgnoreCase(globalParcelPackAllow))
+					else if("Y".equalsIgnoreCase(globalParcelPackAllow) || (globalParcelPackAllow.length() == 0 && "Y".equalsIgnoreCase(parcelPackAllow)))
 					{
 						pickType = "P";
 					}
@@ -662,7 +664,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 										
 					/*getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType, conn);
 					tranCod = (String)getTranInfo.get("TRAN_CODE");*/
-					if("Y".equalsIgnoreCase(globalMasterPackAllow) && "Y".equalsIgnoreCase(globalParcelPackAllow))
+					//if("Y".equalsIgnoreCase(globalMasterPackAllow) && "Y".equalsIgnoreCase(globalParcelPackAllow))
+					if(("Y".equalsIgnoreCase(globalMasterPackAllow) && "Y".equalsIgnoreCase(globalParcelPackAllow)) || (singleLot.length() == 0 && "Y".equalsIgnoreCase(masterPackAllow) && "Y".equalsIgnoreCase(parcelPackAllow)))
 					{
 						pickType = "P";
 						getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType, conn);