bug in view data master,parcel selection

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

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

@@ -581,6 +581,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					minSelfLife = 0;
 					orderByStkStr = "";
 					tranName = "";
+					pickType = "";
+					//shipType = genericUtility.getColumnValue("ship_type",headerDom);
 					isActives = false;
 					pendingQty = rs.getDouble("PENDING_QUANTITY");
 					itemCode = checkNull(rs.getString(6));
@@ -592,6 +594,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					activePickAllow =checkNull( rs.getString("ACTIVE_PICK_ALLOW"));
 					stockToDockAllow = checkNull(rs.getString("STOCK_TO_DOCK_ALLOW"));
 					parcelPackAllow = checkNull(rs.getString("PARCELPACK_ALLOW"));
+					System.out.println("globalMasterPackAllow ["+globalMasterPackAllow+"] globalActivePickAllow ["+globalActivePickAllow+"] globalStockToDockAllow ["+globalStockToDockAllow+"]globalParcelPackAllow ["+globalParcelPackAllow+"]");
 					System.out.println("masterPackAllow ["+masterPackAllow+"] activePickAllow ["+activePickAllow+"] stockToDockAllow ["+stockToDockAllow+"]parcelPackAllow ["+parcelPackAllow+"]");
 					mbaseUnit = checkNull(rs.getString("UNIT_STD"));
 					unit =  checkNull(rs.getString("ORDER_UNIT"));
@@ -647,36 +650,39 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					double noArt = pendingQty/packSize;				
 					getTranInfo = new HashMap();
 					saleOrderTran = rs.getString("SALE_ORDER");
-					
+					System.out.println("CURRENT PICK TYPE BEFORE["+pickType+"]ShipType["+shipType+"]");
 					//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) || (globalParcelPackAllow.length() == 0 && "Y".equalsIgnoreCase(parcelPackAllow)))
+					if("Y".equalsIgnoreCase(globalParcelPackAllow) || (globalParcelPackAllow.length() == 0 && "Y".equalsIgnoreCase(parcelPackAllow)))
 					{
 						pickType = "P";
 					}
 					
 					//Changed By Pragyan recursive call if master pack yes and as well as parcel pick yes.start			
-										
+					System.out.println("CURRENT PICK TYPE AFTER["+pickType+"]ShipType["+shipType+"]");					
 					/*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)) || (singleLot.length() == 0 && "Y".equalsIgnoreCase(masterPackAllow) && "Y".equalsIgnoreCase(parcelPackAllow)))
+					if(("Y".equalsIgnoreCase(globalMasterPackAllow) && "Y".equalsIgnoreCase(globalParcelPackAllow)) || (globalSingleLot.length() == 0 && "Y".equalsIgnoreCase(masterPackAllow) && "Y".equalsIgnoreCase(parcelPackAllow)))
 					{
+						
+						System.out.println("searching for parcel transporter");
 						pickType = "P";
 						getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType, conn);
 						if(!pickType.equalsIgnoreCase((String)getTranInfo.get("SHIP_TYPE")))
 						{
+							System.out.println("searching for master transporter");
 							pickType = "M";
 							getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType, conn);
 						}
 					}
 					else
 					{
+						System.out.println("searching for  transporter["+pickType);
 						getTranInfo = getTransporterInfoMap(saleOrderTran, itemWeight * pendingQty, noArt, pickType, shipType, conn);
 					}