Parcel Picking

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

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

@@ -229,9 +229,11 @@ public class ConsolidatToDoc {
 							System.out.println("CURRENT KEY ["+key+"]");
 
 							//if(key.equalsIgnoreCase("P-TASK"))
+							//Changed By Pragyan 02/01/13 to check the consolidetion
 							// 23/09/12 manoharan M-PICK and M-PACK to considered together and split accordingly to number of M-PACK
 							//if("A-PICK".equalsIgnoreCase(key) || "C-PICK".equalsIgnoreCase(key)  || "M-PICK".equalsIgnoreCase(key)  || "M-PACK".equalsIgnoreCase(key) )
-							if("A-PICK".equalsIgnoreCase(key) || "C-PICK".equalsIgnoreCase(key))
+							//if("A-PICK".equalsIgnoreCase(key) || "C-PICK".equalsIgnoreCase(key))
+							if("A-PICK".equalsIgnoreCase(key) || "C-PICK".equalsIgnoreCase(key) || "P-PICK".equalsIgnoreCase(key))
 							{
 								//Changed by rohan on 10-08-12 
 								//isPick = true;
@@ -433,7 +435,8 @@ public class ConsolidatToDoc {
 
 											palletNo = rs.getString("CARTON_NO");
 										}
-										else if ( key.equalsIgnoreCase("P-TASK") || key.equalsIgnoreCase("A-PICK") || key.equalsIgnoreCase("C-PICK") || key.equalsIgnoreCase("M-PICK") || key.equalsIgnoreCase("M-PACK"))
+										//else if ( key.equalsIgnoreCase("P-TASK") || key.equalsIgnoreCase("A-PICK") || key.equalsIgnoreCase("C-PICK") || key.equalsIgnoreCase("M-PICK") || key.equalsIgnoreCase("M-PACK"))
+										else if ( key.equalsIgnoreCase("P-TASK") || key.equalsIgnoreCase("A-PICK") || key.equalsIgnoreCase("C-PICK") || key.equalsIgnoreCase("M-PICK") || key.equalsIgnoreCase("M-PACK") || key.equalsIgnoreCase("P-PICK"))
 										{
 											//Selecting loc_code__to from pick_iss_det
 											pstmtIss.setString(1, pickOrder);
@@ -875,7 +878,8 @@ public class ConsolidatToDoc {
 							String keyList = (String)itr.next();
 							System.out.println("CURRENT KEY ["+keyList+"]");
 						
-							if("A-PICK".equalsIgnoreCase(keyList) || "C-PICK".equalsIgnoreCase(keyList))
+							//if("A-PICK".equalsIgnoreCase(keyList) || "C-PICK".equalsIgnoreCase(keyList))
+							if("A-PICK".equalsIgnoreCase(keyList) || "C-PICK".equalsIgnoreCase(keyList) || "P-PICK".equalsIgnoreCase(keyList))
 							{
 								
 								sql2 = 	" SELECT P.ITEM_CODE,PO.WAVE_ID "+  
@@ -1319,7 +1323,8 @@ public class ConsolidatToDoc {
 				String key = (String)it.next();
 
 				System.out.println("Key  ["+key+"]");
-				if(key.equalsIgnoreCase("P-TASK") || key.equalsIgnoreCase("C-PICK"))
+				//if(key.equalsIgnoreCase("P-TASK") || key.equalsIgnoreCase("C-PICK"))
+				if(key.equalsIgnoreCase("P-TASK") || key.equalsIgnoreCase("C-PICK") || key.equalsIgnoreCase("P-PICK"))
 				{
 
 					sql = "select status from pick_ord_hdr where pick_order =  ? ";
@@ -1362,7 +1367,8 @@ public class ConsolidatToDoc {
 
 					if(rs.next())
 					{
-						if(key.equalsIgnoreCase("P-TASK")  || key.equalsIgnoreCase("C-PICK") )  //added by Kunal on 11/09/12
+						//if(key.equalsIgnoreCase("P-TASK")  || key.equalsIgnoreCase("C-PICK") )  //added by Kunal on 11/09/12
+						if(key.equalsIgnoreCase("P-TASK")  || key.equalsIgnoreCase("C-PICK")  || key.equalsIgnoreCase("P-PICK") )  //added by Kunal on 11/09/12
 						{
 							status = rs.getString("status");
 							if(!"C".equalsIgnoreCase(status))

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

@@ -232,7 +232,8 @@ public class DespEditPrc extends ProcessEJB implements DespEditPrcLocal,DespEdit
 							+ " AND W.WAVE_ID = WH.WAVE_ID "
 							+ " AND W.REF_ID = D.PICK_ORDER "
 							+ " AND D.PICK_ORDER = DD.PICK_ORDER "
-							+ " AND W.REF_SER IN( 'A-PICK','C-PICK','M-PICK') "
+							//+ " AND W.REF_SER IN( 'A-PICK','C-PICK','M-PICK') "
+							+ " AND W.REF_SER IN( 'A-PICK','C-PICK','M-PICK','P-PICK') "
 							+ " AND  CASE WHEN D.STATUS IS NULL THEN 'O' ELSE D.STATUS END = 'O' "
 							+ " AND  CASE WHEN WH.CANCEL IS NULL THEN 'N' ELSE WH.CANCEL END = 'N' "
 							+ " AND  S.SITE_CODE = ? "

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

@@ -285,7 +285,8 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 				
 				System.out.println("Curren refser:"+refSer+"REF_ID"+refId);
 				
-				if(refSer.equalsIgnoreCase("C-PICK") || refSer.equalsIgnoreCase("M-PICK") || refSer.equalsIgnoreCase("A-PICK") || refSer.trim().equalsIgnoreCase("S-DOC") || refSer.equalsIgnoreCase("RP-PND") || refSer.equalsIgnoreCase("RP-PSO"))
+				//if(refSer.equalsIgnoreCase("C-PICK") || refSer.equalsIgnoreCase("M-PICK") || refSer.equalsIgnoreCase("A-PICK") || refSer.trim().equalsIgnoreCase("S-DOC") || refSer.equalsIgnoreCase("RP-PND") || refSer.equalsIgnoreCase("RP-PSO"))
+				if(refSer.equalsIgnoreCase("C-PICK") || refSer.equalsIgnoreCase("M-PICK") || refSer.equalsIgnoreCase("A-PICK") || refSer.equalsIgnoreCase("P-PICK") || refSer.trim().equalsIgnoreCase("S-DOC") || refSer.equalsIgnoreCase("RP-PND") || refSer.equalsIgnoreCase("RP-PSO"))
 				{
 					if(refSer.trim().equalsIgnoreCase("S-DOC") || refSer.equalsIgnoreCase("RP-PND") || refSer.equalsIgnoreCase("RP-PSO"))
 					{
@@ -368,13 +369,14 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 									System.out.println("Replenishment updated with actual quantity "+quantity+" For replenishment oder :"+replOrder +" and line no :"+replLineNo);
 								}
 								//to check pick type
+								//if(refSer.equalsIgnoreCase("C-PICK"))
 								if(refSer.equalsIgnoreCase("C-PICK"))
 								{
 									locCode = locCodeTo;
 									System.out.println("Caspick loc code"+locCode);
 									break;
 								}
-								else if(refSer.equalsIgnoreCase("M-PICK") || refSer.equalsIgnoreCase("A-PICK"))
+								else if(refSer.equalsIgnoreCase("M-PICK") || refSer.equalsIgnoreCase("A-PICK") || refSer.equalsIgnoreCase("P-PICK"))
 								{
 									//to check transfer status
 									if("Y".equalsIgnoreCase(transferStatus))
@@ -385,7 +387,7 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 									else
 									{
 										//stock allocate from staging location
-										if(refSer.equalsIgnoreCase("M-PICK")) 
+										if(refSer.equalsIgnoreCase("M-PICK") || refSer.equalsIgnoreCase("P-PICK")) 
 										{
 											locCode = stagingLocMpick;
 											break;

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

@@ -127,6 +127,7 @@ etc
 		String saleOrderTo = "";
 		String printLabel = "";//Added by sumit on 24/11/12
 		String waveMode = ""; //Added by sumit 06/12/12
+		String parcelPackAllow = "";//Addded by sumit 20/12/12
 		
 		try
 		{
@@ -178,8 +179,14 @@ etc
 						//Changed by sumit on 18/09/12 for single lot and Packing allow end.
 						//Changed by sumit on 18/09/12 adding print_label and printer name start.
 						valueXmlString.append( "<print_label protect ='1'><![CDATA[" ).append( "" ).append( "]]></print_label>\r\n" );
-						valueXmlString.append( "<printer_name protect ='1'><![CDATA[" ).append( "" ).append( "]]></printer_name>\r\n" );
+						valueXmlString.append( "<printer_name protect ='1'><![CDATA[" ).append( "" ).append( "]]></printer_name>\r\n" );						
 						//Changed by sumit on 18/09/12 adding print_label and printer name end.
+						
+						//Changed by sumit on 29/12/12 adding parcel packing start.
+						valueXmlString.append( "<parcelpack_allow protect ='1'><![CDATA[" ).append( "" ).append( "]]></parcelpack_allow>\r\n" );
+						valueXmlString.append( "<master_override><![CDATA[" ).append( "N" ).append( "]]></master_override>\r\n" );
+						valueXmlString.append( "<parcel_override><![CDATA[" ).append( "N" ).append( "]]></parcel_override>\r\n" );
+						//Changed by sumit on 29/12/12 adding parcel packing end.
 						valueXmlString.append( "</Detail1>\r\n" );
 					}
 					//Changed By Pragyan 21/06/12 Statrt
@@ -198,7 +205,7 @@ etc
 								System.out.println("Hello sale_order__from2");
 								//Changed by sumit 20/09/12 getting cust code start.								
 								//sSQL = "SELECT DUE_DATE FROM SORDER WHERE SALE_ORDER = ?";
-								sSQL = " SELECT S.DUE_DATE,C.CUST_CODE, C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW, W.STOCK_TO_DOCK_ALLOW " +
+								sSQL = " SELECT S.DUE_DATE,C.CUST_CODE, C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW, W.STOCK_TO_DOCK_ALLOW, W.PARCELPACK_ALLOW " +
 										" FROM SORDER S, CUSTOMER C, WAVE_TYPE W  WHERE SALE_ORDER = ? " +
 										" AND C.CUST_CODE = S.CUST_CODE " +
 										" AND C.WAVE_TYPE = W.WAVE_TYPE ";
@@ -215,6 +222,7 @@ etc
 									masterPackAllow = rs.getString("MASTER_PACK_ALLOW");
 									activePickAllow = rs.getString("ACTIVE_PICK_ALLOW");
 									stockToDockAllow = rs.getString("STOCK_TO_DOCK_ALLOW");
+									parcelPackAllow = rs.getString("PARCELPACK_ALLOW");
 								}
 								
 								if(dateFrom != null)
@@ -234,6 +242,7 @@ etc
 										valueXmlString.append( "<master_pack_allow protect ='0' ><![CDATA[" ).append( checkNull(masterPackAllow) ).append( "]]></master_pack_allow>\r\n" );
 										valueXmlString.append( "<active_pick_allow protect ='0' ><![CDATA[" ).append( checkNull(activePickAllow) ).append( "]]></active_pick_allow>\r\n" );
 										valueXmlString.append( "<stock_to_dock_allow protect ='0' ><![CDATA[" ).append( checkNull(stockToDockAllow) ).append( "]]></stock_to_dock_allow>\r\n" );
+										valueXmlString.append( "<parcelpack_allow protect ='0' ><![CDATA[" ).append( checkNull(parcelPackAllow) ).append( "]]></parcelpack_allow>\r\n" );
 									}
 									else
 									{
@@ -242,7 +251,8 @@ etc
 										valueXmlString.append( "<single_lot protect ='1' ><![CDATA[" ).append( "" ).append( "]]></single_lot>\r\n" );
 										valueXmlString.append( "<master_pack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></master_pack_allow>\r\n" );
 										valueXmlString.append( "<active_pick_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></active_pick_allow>\r\n" );
-										valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );										
+										valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );		
+										valueXmlString.append( "<parcelpack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></parcelpack_allow>\r\n" );
 									}
 									System.out.println("Hello sale_order__from4");
 									if(pstmt!=null)
@@ -266,6 +276,7 @@ etc
 									valueXmlString.append( "<master_pack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></master_pack_allow>\r\n" );
 									valueXmlString.append( "<active_pick_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></active_pick_allow>\r\n" );
 									valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );
+									valueXmlString.append( "<parcelpack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></parcelpack_allow>\r\n" );
 								}
 							}
 							else
@@ -278,7 +289,8 @@ etc
 								valueXmlString.append( "<master_pack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></master_pack_allow>\r\n" );
 								valueXmlString.append( "<active_pick_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></active_pick_allow>\r\n" );
 								valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );
-								//Changed by sumit on 20/09/12 setting value of cust_code__to in case of no data.
+								//Changed by sumit on 20/09/12 setting value of cust_code__to in case of no data.								
+								valueXmlString.append( "<parcelpack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></parcelpack_allow>\r\n" );
 							}
 							valueXmlString.append( "</Detail1>\r\n" );
 						
@@ -299,7 +311,9 @@ etc
 								System.out.println("Hello sale_order__from2");
 								//Changed by sumit 20/09/12 getting cust code start.								
 								//sSQL = "SELECT DUE_DATE FROM SORDER WHERE SALE_ORDER = ?";
-								sSQL = " SELECT S.DUE_DATE,C.CUST_CODE, C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW, W.STOCK_TO_DOCK_ALLOW " +
+								//Changed by sumit 20/09/12 getting cust code start.								
+								//sSQL = "SELECT DUE_DATE FROM SORDER WHERE SALE_ORDER = ?";
+								sSQL = " SELECT S.DUE_DATE,C.CUST_CODE, C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW, W.STOCK_TO_DOCK_ALLOW, W.PARCELPACK_ALLOW " +
 										" FROM SORDER S, CUSTOMER C, WAVE_TYPE W  WHERE SALE_ORDER = ? " +
 										" AND C.CUST_CODE = S.CUST_CODE " +
 										" AND C.WAVE_TYPE = W.WAVE_TYPE ";
@@ -316,6 +330,7 @@ etc
 									masterPackAllow = rs.getString("MASTER_PACK_ALLOW");
 									activePickAllow = rs.getString("ACTIVE_PICK_ALLOW");
 									stockToDockAllow = rs.getString("STOCK_TO_DOCK_ALLOW");
+									parcelPackAllow = rs.getString("PARCELPACK_ALLOW");
 								}
 								if(dateFrom != null)
 								{						
@@ -333,6 +348,7 @@ etc
 										valueXmlString.append( "<master_pack_allow protect ='0' ><![CDATA[" ).append( checkNull(masterPackAllow) ).append( "]]></master_pack_allow>\r\n" );
 										valueXmlString.append( "<active_pick_allow protect ='0' ><![CDATA[" ).append( checkNull(activePickAllow) ).append( "]]></active_pick_allow>\r\n" );
 										valueXmlString.append( "<stock_to_dock_allow protect ='0' ><![CDATA[" ).append( checkNull(stockToDockAllow) ).append( "]]></stock_to_dock_allow>\r\n" );
+										valueXmlString.append( "<parcelpack_allow protect ='0' ><![CDATA[" ).append( checkNull(parcelPackAllow) ).append( "]]></parcelpack_allow>\r\n" );
 									}
 									else
 									{	
@@ -341,7 +357,8 @@ etc
 										valueXmlString.append( "<single_lot protect ='1' ><![CDATA[" ).append( "" ).append( "]]></single_lot>\r\n" );
 										valueXmlString.append( "<master_pack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></master_pack_allow>\r\n" );
 										valueXmlString.append( "<active_pick_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></active_pick_allow>\r\n" );
-										valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );										
+										valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );	
+										valueXmlString.append( "<parcelpack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></parcelpack_allow>\r\n" );
 									}
 									//System.out.println("Hello sale_order__from4");
 								}
@@ -355,6 +372,7 @@ etc
 									valueXmlString.append( "<master_pack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></master_pack_allow>\r\n" );
 									valueXmlString.append( "<active_pick_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></active_pick_allow>\r\n" );
 									valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );
+									valueXmlString.append( "<parcelpack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></parcelpack_allow>\r\n" );
 									
 								}
 								
@@ -381,6 +399,7 @@ etc
 								valueXmlString.append( "<master_pack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></master_pack_allow>\r\n" );
 								valueXmlString.append( "<active_pick_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></active_pick_allow>\r\n" );
 								valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );
+								valueXmlString.append( "<parcelpack_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></parcelpack_allow>\r\n" );
 							}
 							valueXmlString.append( "</Detail1>\r\n" );
 						
@@ -830,6 +849,39 @@ etc
 							}
 						}
 					}
+					else if ( "parcelpack_allow".equalsIgnoreCase( childNodeName ) )
+					{
+						stockToDockAllow = checkNull(genericUtility.getColumnValue( "parcelpack_allow", currFormDataDom ));
+						custCode = genericUtility.getColumnValue( "cust_code__from", currFormDataDom );
+						if(stockToDockAllow.trim().length() > 0 )
+						{
+							sql = 	"SELECT C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW, W.STOCK_TO_DOCK_ALLOW, W.PARCELPACK_ALLOW " +
+									"FROM CUSTOMER C, WAVE_TYPE W WHERE C.WAVE_TYPE = W.WAVE_TYPE AND C.CUST_CODE = ? ";
+							pstmt = conn.prepareStatement(sql);
+							pstmt.setString(1, custCode);
+							rs = pstmt.executeQuery();
+							if( rs.next())
+							{								
+								if( !stockToDockAllow.equalsIgnoreCase(rs.getString("PARCELPACK_ALLOW")))
+								{
+									//errList.add( "STOCK2DOC" );
+									errFields.add( childNodeName.toLowerCase() );
+									errList.add( "CHSINGLELT" );
+									//errFields.add( "" );
+								}
+							}
+							if( rs != null )
+							{
+								rs.close();
+								rs = null;
+							}
+							if( pstmt != null )
+							{
+								pstmt.close();
+								pstmt = null;								
+							}
+						}
+					}
 					//Changed by sumit on 03/10/12 validating printer service name with existing printer in system start.
 					//Changed by sumit on 24/11/12 changing field name 
 					//else if ( "printer".equalsIgnoreCase( childNodeName ) )

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

@@ -90,6 +90,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 	String globalStockToDockAllow = "";
 	//Changed by sumit on 18/09/12 create single_lot, master_pack_allow, active_pick_allow, stock_to_dock_allow end.
 	
+	//Changed by sumit on 11/12/12 adding variable start
+	//String globalSaleOrder = "";	
+	private HashMap pickSaleOrderDetail = new  HashMap();
+	String globalParcelPackAllow = "";
+	//Changed by sumit on 11/12/12 adding variable end
 	
 	double balStockQty = 0;
 
@@ -411,6 +416,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			globalActivePickAllow = checkNull(genericUtility.getColumnValue("active_pick_allow",headerDom));
 			globalStockToDockAllow = checkNull(genericUtility.getColumnValue("stock_to_dock_allow",headerDom));
 			//Change by sumit sarkar on 09/03/12 getting the value of SINGLE_LOT, MASTER_PACK_ALLOW, ACTIVE_PICK_ALLOW, STOCK_TO_DOCK_ALLOW END.
+			//Changed by sumit on 20/12/12 getting parcelpacking_allow 
+			globalParcelPackAllow = checkNull(genericUtility.getColumnValue("parcelpack_allow",headerDom));
 			
 			//Changed by sumit on 03/10/12 getting value of printer start
 			/*printer = "";
@@ -542,7 +549,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				   //Changed by sumit 20/08/12 getting column data start.
 				   //+",SORDER.ALLOC_FLAG AS ALLOC_FLAG "		   
 				   //+"FROM SORDDET,SORDER,SORDITEM,CUSTOMER,ITEM "
-				   +" ,SORDER.ALLOC_FLAG AS ALLOC_FLAG , WAVE_TYPE.MASTER_PACK_ALLOW , WAVE_TYPE.ACTIVE_PICK_ALLOW , WAVE_TYPE.STOCK_TO_DOCK_ALLOW "		   
+				   //Changed by sumit on 20/12/12 getting value of parcelpacking_allow
+				   //+" ,SORDER.ALLOC_FLAG AS ALLOC_FLAG , WAVE_TYPE.MASTER_PACK_ALLOW , WAVE_TYPE.ACTIVE_PICK_ALLOW , WAVE_TYPE.STOCK_TO_DOCK_ALLOW "		   
+				   +" ,SORDER.ALLOC_FLAG AS ALLOC_FLAG , WAVE_TYPE.MASTER_PACK_ALLOW , WAVE_TYPE.ACTIVE_PICK_ALLOW , WAVE_TYPE.STOCK_TO_DOCK_ALLOW, WAVE_TYPE.PARCELPACK_ALLOW  "	   
 				   +"FROM SORDDET,SORDER,SORDITEM,CUSTOMER,ITEM , WAVE_TYPE "
 				   //Changed by sumit 20/08/12 getting column data end.
 				   +"WHERE ( SORDER.SALE_ORDER = SORDDET.SALE_ORDER ) AND "
@@ -713,10 +722,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					double packSize = (Double)itemVolMap.get("PACK_SIZE");
 					double itemWeight = (Double)itemVolMap.get("ITEM_WEIGHT");
 					System.out.println("itemWeight =["+itemWeight+"]");
+					double noArt = pendingQty/packSize;
 					//Change by Rohan Bhogale on 19/07/12 To display transporte details.start
 					getTranInfo = new HashMap();
 					saleOrderTran = rs.getString("SALE_ORDER");
-					getTranInfo = getTransportInfo(saleOrderTran,itemWeight * pendingQty, conn);
+					//getTranInfo = getTransportInfo(saleOrderTran,itemWeight * pendingQty, conn);
+					getTranInfo = getTransportInfo(saleOrderTran,itemWeight * pendingQty,noArt, conn);
 					tranCod = (String)getTranInfo.get("TRAN_CODE");
 					docLocation = getDocLoc(tranCod, conn);
 					
@@ -742,6 +753,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					/*HashMap itemVolMap = getItemVoumeMap(itemCode, "", conn);
 					double packSize = (Double)itemVolMap.get("PACK_SIZE");*/
 					
+					
 					//if(globalSingleLot != null && !globalSingleLot.equalsIgnoreCase(singleLot))
 					if(globalSingleLot != null && !globalSingleLot.equalsIgnoreCase(singleLot) && globalSingleLot.length() > 0)
 					{
@@ -979,7 +991,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 							//STOCK_TO_DOCK_ALLOW
 							//Changed by sankara on 23/11/12 append stock_to_dock_allow in porpar format 
 							//retTabSepStrBuff.append(globalStockToDockAllow).append("\t");							
-							retTabSepStrBuff.append( "<stock_to_dock_allow><![CDATA[" ).append(globalStockToDockAllow).append( "]]></stock_to_dock_allow>\r\n" );					
+							retTabSepStrBuff.append( "<stock_to_dock_allow><![CDATA[" ).append(globalStockToDockAllow).append( "]]></stock_to_dock_allow>\r\n" );
+							
+							//Changed by sumit on 20/12/12 dispaly parcel pack value 
+							//PARCELPACK_ALLOW
+							retTabSepStrBuff.append( "<parcelpack_allow><![CDATA[" ).append(globalParcelPackAllow).append( "]]></parcelpack_allow>\r\n" );
 
 						}
 						else
@@ -1002,7 +1018,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 							//STOCK_TO_DOCK_ALLOW
 							//Changed by sankara on 23/11/12 append stock_to_dock_allow in porpar format 
 							//retTabSepStrBuff.append(stockToDockAllow).append("\t");	
-							retTabSepStrBuff.append( "<stock_to_dock_allow><![CDATA[" ).append(stockToDockAllow).append( "]]></stock_to_dock_allow>\r\n" );							
+							retTabSepStrBuff.append( "<stock_to_dock_allow><![CDATA[" ).append(stockToDockAllow).append( "]]></stock_to_dock_allow>\r\n" );
+							//Changed by sumit on 20/12/12 dispaly parcel pack value 
+							//PARCELPACK_ALLOW
+							retTabSepStrBuff.append( "<parcelpack_allow><![CDATA[" ).append(rs.getString("PARCELPACK_ALLOW")).append( "]]></parcelpack_allow>\r\n" );
 
 						}	
 						//Changed by sumit on 18/09/12 getting value from header field in case data end
@@ -1122,9 +1141,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 							retTabSepStrBuff.append( "<qty_alloc><![CDATA[" ).append("0.0").append( "]]></qty_alloc>\r\n" );
 						}
 						
-						//Changed by sumit sarkar on 22/06/12 to display hold quantity
+						//Changed by sumit sarkar on 22/06/12 to display hold quantity.start
 						// HOLD_QUANTITY
-						if (bappend == true)
+						/*if (bappend == true)
 						{
 							//Changed by sankara on 23/11/12 append hold_qty in porpar format 
 							//retTabSepStrBuff.append(holdQty).append("\t");
@@ -1139,8 +1158,19 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 							//retTabSepStrBuff.append("0.0").append("\t");
 							retTabSepStrBuff.append( "<hold_qty><![CDATA[" ).append("0.0").append( "]]></hold_qty>\r\n" );
 						}					
+						*/
+						sql = "SELECT SUM(HOLD_QTY) AS HOLD_QTY FROM STOCK WHERE ITEM_CODE = ?";
+						pstmt1 = conn.prepareStatement(sql);
+						pstmt1.setString(1, itemCode);
+						rs2 = pstmt1.executeQuery();
+						if(rs2.next())
+						{
+							retTabSepStrBuff.append( "<hold_qty><![CDATA[" ).append(rs2.getDouble(1)).append( "]]></hold_qty>\r\n" );
+						}
 						
-					
+						rs2.close();rs2 = null;
+						pstmt1.close();pstmt1 = null;
+						//changed by sumit on 28/12/12 commented  and displaying hold_qty end
 						// this line has to be commented later
 						// as this will be a input from the user
 												
@@ -1513,6 +1543,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		String isActivePickChecked = "N";
 		String isStockToDockChecked = "N";
 		String isMasterPickChecked = "N";
+		//Changed By Pragyan 31/12/12 To get Parcel Pack Flag
+		String isParcelPickChecked = "N";
 		HashMap saleOrderWiseMapCopy = null;
 		HashMap saleOrderWiseMapCpy = null;
 		boolean isStockToDock = false;
@@ -1636,6 +1668,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			}
 			//Ended by Chandni - 11-06-2012
 			 */
+			//Changed by sumit on 11/12/12 clear instance varaible start.			
+			pickSaleOrderDetail.clear();
 			parentNodeList = detailDom.getElementsByTagName("Detail2");
 			parentNodeListLength = parentNodeList.getLength(); 
 			System.out.println("parentNodeListLength------------------->"+parentNodeListLength);
@@ -1737,6 +1771,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					{
 						isMasterPickChecked = childNode.getFirstChild().getNodeValue();
 					}
+					//Changed By Pragyan 31/12/12 To get Parcel Pack Flag.start
+					if (childNodeName.equals("parcelpack_allow"))
+					{
+						isParcelPickChecked = childNode.getFirstChild().getNodeValue();
+					}
+					//Changed By Pragyan 31/12/12 To get Parcel Pack Flag.end
 					//Changed by sumit on 14/12/12 adding validation incase of manualy allocating saleorder and modifiying qty_allow start.
 					if (childNodeName.equals("manual_allocqty"))
 					{
@@ -1777,9 +1817,15 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					errString = getError(saleOrder,errString,conn);
 					return errString;								
 				}
-				
-				
-				// Changed by rohan on 14/08/12 for stock allocation end. 
+				// Changed by rohan on 14/08/12 for stock allocation end.
+				//Changed by sumit on 31/12/12 validation if allocation quantity is less then shiper size start			
+				if("N".equalsIgnoreCase(isActivePickChecked) && allocQty < (Double)getItemVoumeMap(itemCode,"",conn).get("PACK_SIZE"))
+				{
+					System.out.println(" inside sumit active");
+					errString = getError(saleOrder,"INVORDQTY",conn);
+					return errString;
+				}
+				//Changed by sumit on 31/12/12 validation if allocation quantity is less then shiper size end
 				//Changed by Rohan to set resons detail null in sorder item.start
 				
 				SqlSord = "UPDATE SORDITEM SET REAS_DETAIL =  ? "
@@ -2105,9 +2151,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					//changed by Rohan on 18-04-12 [WM1ESUN006] To clear saleOrderWiseMap.end
                    */					
 					System.out.println("if calling...===>.....");	
+					//Changed By Pragyan 31/12/12 To pass the Pacel pack flag to the method
 					//errString = sorderAllocate(saleOrder, lineNo, itemCode, allocQty, expLev);
 					//errString = sorderAllocate(headerDom, detailDom, saleOrder, lineNo, itemCode, allocQty, expLev, xtraParams, conn );
-					errString = sorderAllocate(headerDom, detailDom, saleOrder, lineNo, itemCode, allocQty,singleLot,pendingQuantity,isActivePickChecked,isMasterPickChecked,isStockToDockChecked, expLev, xtraParams, conn );
+					//errString = sorderAllocate(headerDom, detailDom, saleOrder, lineNo, itemCode, allocQty,singleLot,pendingQuantity,isActivePickChecked,isMasterPickChecked,isStockToDockChecked, expLev, xtraParams, conn );
+					errString = sorderAllocate(headerDom, detailDom, saleOrder, lineNo, itemCode, allocQty,singleLot,pendingQuantity,isActivePickChecked,isMasterPickChecked,isStockToDockChecked,isParcelPickChecked, expLev, xtraParams, conn );
 					if (errString != null && errString.trim().length() > 0)
 					{
 						System.out.println("errString :"+errString);
@@ -2341,7 +2389,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 
 	//Changed by sumit sarkar on 23/08/11 [ WM1ESUN006 ] to make compitable to call updateWaveTask() method.
 	//private String sorderAllocate(String saleOrder, String lineNo, String itemCode, double allocQty, String expLev) throws ITMException
-	private String sorderAllocate(Document headerDom, Document detailDom , String saleOrder, String lineNo, String itemCode, double allocQty,String singleLot,double pendingQty,String isActivePickChecked,String isMasterPackChecked,String isStockToDockChecked, String expLev, String xtraParams, Connection conn ) throws ITMException
+	private String sorderAllocate(Document headerDom, Document detailDom , String saleOrder, String lineNo, String itemCode, double allocQty,String singleLot,double pendingQty,String isActivePickChecked,String isMasterPackChecked,String isStockToDockChecked,String isParcelPickChecked, String expLev, String xtraParams, Connection conn ) throws ITMException
 	{
 		System.out.println("updateSOrder calling ....**************..........["+saleOrder+"]");
 		String getDataSql = null;
@@ -2552,7 +2600,17 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 							pstmtStock.setInt(6,minShelfLife);
 							pstmtStock.setString(7,resrvLoc);
 							pstmtStock.setString(8,casePickLoc);
-							pstmtStock.setString(9,activePickLoc);
+							//Changed by sumit on 29/12/12 hiding active pick if user no need from active start
+							//pstmtStock.setString(9,activePickLoc);
+							if( "N".equalsIgnoreCase(isActivePickChecked))
+							{
+								pstmtStock.setString(9,"");
+							}
+							else
+							{
+								pstmtStock.setString(9,activePickLoc);
+							}
+							//Changed by sumit on 29/12/12 hiding active pick if user no need from active end
 							pstmtStock.setString(10,deepStoreLoc);
 							
 							if(isActives)
@@ -2594,7 +2652,17 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 							pstmtStock.setInt(3,minShelfLife);
 							pstmtStock.setString(4,resrvLoc);
 							pstmtStock.setString(5,casePickLoc);
-							pstmtStock.setString(6,activePickLoc);
+							//Changed by sumit on 29/12/12 hiding active pick if user no need from active start
+							//pstmtStock.setString(6,activePickLoc);
+							if( "N".equalsIgnoreCase(isActivePickChecked))
+							{
+								pstmtStock.setString(6,"");
+							}
+							else
+							{
+								pstmtStock.setString(6,activePickLoc);
+							}
+							//Changed by sumit on 29/12/12 hiding active pick if user no need from active end
 							pstmtStock.setString(7,deepStoreLoc);
 							
 							if(isActives)
@@ -3096,6 +3164,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
                     	tempMap.put("stock2_dock", "N");
                     	System.out.println("STOCK TO DOCK TRUE----NNNN->");
                     }
+                    tempMap.put("master_pack", isMasterPackChecked);
+                    tempMap.put("active_pick", isActivePickChecked);
+                    tempMap.put("parcel_pick", isParcelPickChecked);
                     tempMap.put("exp_lev", expLev);
                     //Changed By Pragyan add the pack_size in the map.
                     tempMap.put("pack_size", packSize);
@@ -3637,7 +3708,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					}
 					
 					System.out.println("Final weight for th shipment "+totalWeightCurrentshipment+"]");
-					HashMap transPorterInfoMap = getTransportInfo(saleOrder,totalWeightCurrentshipment, conn);
+					//Changed By Pragyan 02/12/12 to pass the total no cases
+					//HashMap transPorterInfoMap = getTransportInfo(saleOrder,totalWeightCurrentshipment, conn);
+					HashMap transPorterInfoMap = getTransportInfo(saleOrder,totalWeightCurrentshipment,totCaseCount, conn);
 					tranCode = (String)transPorterInfoMap.get("TRAN_CODE");
 					transMode = (String)transPorterInfoMap.get("TRANS_MODE");
 					
@@ -10731,6 +10804,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		String mPackAllow = "";
 		String aPickAllow = "";
 		String stockToDoc = "";
+		String pPickAllow = "";
+		String masterPackOverride = "N";
+		String parcelPickOverride = "N";
 		//Changed by Rohan on 24-11-12 for define variable
 		int cartonCount = 0;
 		//Changed by Rohan on 13-09-12 to generate only one Repalnishmement Header.start
@@ -10775,12 +10851,22 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			isSinglePickMasterPack = discommon.getDisparams("999999","MASTER_PACK_SINGLE_PICK",conn);
 			//Changed by Rohan on 24-11-12 to get variable from disparam for active pick case count
 			String actPkCnt = discommon.getDisparams("999999","ACTIVE_PICK_CASE_COUNT",conn);
+			
+			//Changed By Pragyan 31/12/12 To get the valu of values from each line item wize
 			mPackAllow = genericUtility.getColumnValue("master_pack_allow",detailDom);
 			mPackAllow = (mPackAllow != null && mPackAllow.length() > 0)?mPackAllow:"N";
 			aPickAllow = genericUtility.getColumnValue("active_pick_allow",detailDom);
 			aPickAllow = (aPickAllow != null && aPickAllow.length() > 0)?aPickAllow:"Y";
 			stockToDoc = genericUtility.getColumnValue("stock_to_dock_allow",detailDom);
 			stockToDoc = (stockToDoc != null && stockToDoc.length() > 0)?stockToDoc:"Y";
+			pPickAllow  = genericUtility.getColumnValue("parcelpack_allow",detailDom);
+			pPickAllow = (pPickAllow != null && pPickAllow.length() > 0)?pPickAllow:"Y";
+			masterPackOverride = genericUtility.getColumnValue("master_override",headerDom);
+			masterPackOverride = (masterPackOverride != null && masterPackOverride.length() > 0)?masterPackOverride:"N";
+			parcelPickOverride = genericUtility.getColumnValue("parcel_override",headerDom);
+			parcelPickOverride = (parcelPickOverride != null && parcelPickOverride.length() > 0)?parcelPickOverride:"N";
+			System.out.println("mPackAllow:["+mPackAllow+"]aPickAllow["+aPickAllow+"]stockToDoc["+stockToDoc+"]Parcel Pick["+pPickAllow+"]");
+			System.out.println("Master Pack Override["+masterPackOverride+"]Parcel Pick Override["+parcelPickOverride+"]");
 			
 			if(totActWeight > 0 && totActVolume > 0)
 			{
@@ -10801,7 +10887,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			
 			
 			//if(totCaseVolume > 0 && totCaseWeight > 0)
-			if(totCaseVolume > 0 && totCaseWeight > 0 && totCaseWeight <= masterPackWeightPerOrder && "Y".equalsIgnoreCase(mPackAllow))
+			//if(totCaseVolume > 0 && totCaseWeight > 0 && totCaseWeight <= masterPackWeightPerOrder && "Y".equalsIgnoreCase(mPackAllow))
+			if(totCaseVolume > 0 && totCaseWeight > 0 &&  "Y".equalsIgnoreCase(mPackAllow) && (totCaseWeight <= masterPackWeightPerOrder || "Y".equalsIgnoreCase(masterPackOverride)))
 			{
 				
 				if(totCaseWeight < masterPackWeight)
@@ -10837,7 +10924,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			stockToDoc = (stockToDoc != null && stockToDoc.length() > 0)?stockToDoc:"Y";*/
 			
 			//Changed by Rohan on 14/08/12 to get wave type info.end
-			System.out.println("mPackAllow:["+mPackAllow+"]aPickAllow["+aPickAllow+"]stockToDoc["+stockToDoc);
+		//	System.out.println("mPackAllow:["+mPackAllow+"]aPickAllow["+aPickAllow+"]stockToDoc["+stockToDoc);
 			//masterPackWeightPerOrder  = Double.parseDouble(discommon.getDisparams("999999","MASTER_PACK_WEIGHT_PER_ORDER",conn));
 			if (maxWeight != null && maxWeight.length()> 0)
 			{
@@ -10865,8 +10952,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				quantity =  (Double)dataMap.get("alloc_qty");
 				System.out.println("Can not Cast"+quantity);
 				stockToDock =  (String)dataMap.get("stock2_dock");
+				/*mPackAllow = (String)dataMap.get("master_pack");
+				aPickAllow =(String)dataMap.get("active_pick");
+				pPickAllow =(String)dataMap.get("parcel_pick");*/
 				expLevel = (String)dataMap.get("exp_lev");
-				 
+				System.out.println("mPackAllow:["+mPackAllow+"]aPickAllow["+aPickAllow+"]stockToDoc["+stockToDoc+"]Parcel Pick["+pPickAllow+"]");
 				System.out.println("SITE_CODE["+siteCode+"]\n LOCCODE["+locCode+"]\n" +
 				"ITEM CODE["+itemCode+"]\n LOTNO["+lotNo+"]\n LOT SL["+lotSl+"]\n ALLOC QUANTITY["+quantity+"]\n Exp Level["+expLevel+"]");	
 				HashMap itmVolumeMap = getItemVoumeMap(itemCode,lotNo,conn);
@@ -10912,7 +11002,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 
 				System.out.println("GOING --INSIDE MASTER PACK BLOCK--");
 			
-				if("Y".equalsIgnoreCase(mPackAllow) && quantity >= packSize && ("N".equalsIgnoreCase(stockToDock) || "N".equalsIgnoreCase(stockToDoc)))
+				//Changed By Pragyan 31/12/12 for Parcel Pick
+				//if("Y".equalsIgnoreCase(mPackAllow) && quantity >= packSize && ("N".equalsIgnoreCase(stockToDock) || "N".equalsIgnoreCase(stockToDoc)))
+				if(("Y".equalsIgnoreCase(mPackAllow) || "Y".equalsIgnoreCase(pPickAllow)) && quantity >= packSize && ("N".equalsIgnoreCase(stockToDock) || "N".equalsIgnoreCase(stockToDoc)))
 				{
 					System.out.println("--INSIDE MASTER PACK BLOCK--");
 					cashCount = Math.floor(quantity /packSize) ;
@@ -10946,8 +11038,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						System.out.println("POSSIBLE MASTER PACK COUNT["+mPackCounter+"]");
 						System.out.println("MASTER PACK STARTING COUNT["+totalCaseOnPallet+"]");
 						
+						//Changed By Pragyan 31/12/12 
 						//if(cashCount >= 2)
-						if(totCaseCount >= 2)
+						//if(totCaseCount >= 2)
+						if(totCaseCount >= 2 || "Y".equalsIgnoreCase(pPickAllow))
 						{	
 							if("Y".equalsIgnoreCase(isSinglePickMasterPack))
 							{
@@ -11151,18 +11245,98 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 									//Logic stands clear.start
 									int allMasterListlen = allMasterList.size();
 									
-									//To store best FIT Algorithem and NFT Next Fit Algrthem as per user requirement.
-									if(allMasterListlen > 0)
+									if(!"Y".equalsIgnoreCase(pPickAllow))
 									{
-										if("Y".equalsIgnoreCase(isMasterPackBestFit))
-										{
-										
-										
-												for(int j = 0 ;j < allMasterListlen ; j++)
+									
+									
+											//To store best FIT Algorithem and NFT Next Fit Algrthem as per user requirement.
+											if(allMasterListlen > 0)
+											{
+												if("Y".equalsIgnoreCase(isMasterPackBestFit))
 												{
-													
-													ArrayList tempList = (ArrayList)allMasterList.get(j);
-													System.out.println("Loop============"+j);
+												
+												
+														for(int j = 0 ;j < allMasterListlen ; j++)
+														{
+															
+															ArrayList tempList = (ArrayList)allMasterList.get(j);
+															System.out.println("Loop============"+j);
+															System.out.println("Remaining cashCount Count+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ["+cashCount+"]");
+															
+															if(cashCount > 0)
+															{
+															
+																	HashMap tempMap = (HashMap)tempList.get(tempList.size() -1);
+																	
+																	if(cashCount > 0)
+																	{
+																	
+																			if(tempMap.containsKey("LAST_PACK_WEIGHT") && tempMap.containsKey("LAST_PACK_VOLUME") && tempMap.containsKey("LAST_PACK_COUNT"))
+																			{
+																				System.out.println("Item Name"+tempMap.get("item"));
+																				System.out.println("Alloc Qty"+tempMap.get("alloc_qty"));
+																				
+																				double lastPackWeight = (Double)tempMap.get("LAST_PACK_WEIGHT");
+																				double lastPackVolume = (Double)tempMap.get("LAST_PACK_VOLUME");
+																				double lastPackCount = (Double)tempMap.get("LAST_PACK_COUNT");
+																				System.out.println("Last Pack Volume#############["+tempMap.get("LAST_PACK_VOLUME")+"]");
+																				System.out.println("Last Pack Weight#############["+tempMap.get("LAST_PACK_WEIGHT")+"]");
+																				System.out.println("Last Pack Count#############["+tempMap.get("LAST_PACK_COUNT")+"]");
+																				
+																				double remainingWeight = masterPackWeight - lastPackWeight;
+																				double remainingVolume = masterPackVolume  - 	lastPackVolume;	
+																				if(remainingWeight >= caseWeight && remainingVolume >= caseVolume && lastPackCount < masterPackCount)
+																				{
+																					
+																										
+																						double caseToBeStore = Math.floor(remainingWeight / caseWeight);	
+																						double caseToBeStore1 = Math.floor(remainingVolume / caseVolume);
+																						
+																						if(caseToBeStore > caseToBeStore1)
+																						{
+																							caseToBeStore = caseToBeStore1;
+																						}
+																						
+																						if(caseToBeStore > cashCount)
+																						{
+																							caseToBeStore = cashCount;
+																						}
+																						
+																						if((lastPackCount + caseToBeStore) <= masterPackCount)
+																						{
+																						
+																							HashMap caseTempMap = (HashMap)dataMap.clone();	
+																							caseTempMap.put("no_art", ""+caseToBeStore);
+																							caseTempMap.put("alloc_qty", caseToBeStore * packSize);
+																							caseTempMap.put("LAST_PACK_WEIGHT",lastPackWeight + (caseToBeStore * caseWeight));
+																							caseTempMap.put("LAST_PACK_VOLUME", (caseToBeStore * caseVolume) + lastPackVolume);
+																							caseTempMap.put("LAST_PACK_COUNT", (lastPackCount + caseToBeStore));	
+																							caseTempMap.put("CASE_VOLUME_TOT", (caseToBeStore * caseVolume));
+																							caseTempMap.put("CASE_WEIGHT_TOT", (caseToBeStore * caseWeight));
+																							
+																							tempList.add(caseTempMap);
+																							cashCount = cashCount - caseToBeStore;
+																					
+																							allMasterList.set(j,tempList);
+																						}
+																				}
+																			}
+																	}
+																	else
+																	{
+																		break;
+																	}
+																//}
+															}
+															else
+															{
+																break;
+															}
+														}
+												}
+												else
+												{
+													ArrayList tempList = (ArrayList)allMasterList.get(allMasterListlen-1);
 													System.out.println("Remaining cashCount Count+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ["+cashCount+"]");
 													
 													if(cashCount > 0)
@@ -11219,7 +11393,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 																					tempList.add(caseTempMap);
 																					cashCount = cashCount - caseToBeStore;
 																			
-																					allMasterList.set(j,tempList);
+																					allMasterList.set(allMasterListlen-1,tempList);
 																				}
 																		}
 																	}
@@ -11235,349 +11409,274 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 														break;
 													}
 												}
-										}
-										else
-										{
-											ArrayList tempList = (ArrayList)allMasterList.get(allMasterListlen-1);
-											System.out.println("Remaining cashCount Count+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ["+cashCount+"]");
+											}
+											//To store best FIT Algorithem and NFT Next Fit Algrthem as per user requirement.end
+											//Logic stands.end
+											
+															
+											System.out.println("Now cashCount Count======================================================================= ["+cashCount+"]");
 											
 											if(cashCount > 0)
 											{
 											
-													HashMap tempMap = (HashMap)tempList.get(tempList.size() -1);
+													mPackCounter = Math.floor(cashCount / masterPackCount);	
+													totalCaseOnPallet = masterPackCount;
+													counter = 0;
 													
-													if(cashCount > 0)
+													if(cashCount/mPackCounter != 0)
 													{
-													
-															if(tempMap.containsKey("LAST_PACK_WEIGHT") && tempMap.containsKey("LAST_PACK_VOLUME") && tempMap.containsKey("LAST_PACK_COUNT"))
-															{
-																System.out.println("Item Name"+tempMap.get("item"));
-																System.out.println("Alloc Qty"+tempMap.get("alloc_qty"));
-																
-																double lastPackWeight = (Double)tempMap.get("LAST_PACK_WEIGHT");
-																double lastPackVolume = (Double)tempMap.get("LAST_PACK_VOLUME");
-																double lastPackCount = (Double)tempMap.get("LAST_PACK_COUNT");
-																System.out.println("Last Pack Volume#############["+tempMap.get("LAST_PACK_VOLUME")+"]");
-																System.out.println("Last Pack Weight#############["+tempMap.get("LAST_PACK_WEIGHT")+"]");
-																System.out.println("Last Pack Count#############["+tempMap.get("LAST_PACK_COUNT")+"]");
-																
-																double remainingWeight = masterPackWeight - lastPackWeight;
-																double remainingVolume = masterPackVolume  - 	lastPackVolume;	
-																if(remainingWeight >= caseWeight && remainingVolume >= caseVolume && lastPackCount < masterPackCount)
-																{
-																	
-																						
-																		double caseToBeStore = Math.floor(remainingWeight / caseWeight);	
-																		double caseToBeStore1 = Math.floor(remainingVolume / caseVolume);
-																		
-																		if(caseToBeStore > caseToBeStore1)
-																		{
-																			caseToBeStore = caseToBeStore1;
-																		}
-																		
-																		if(caseToBeStore > cashCount)
-																		{
-																			caseToBeStore = cashCount;
-																		}
-																		
-																		if((lastPackCount + caseToBeStore) <= masterPackCount)
-																		{
-																		
-																			HashMap caseTempMap = (HashMap)dataMap.clone();	
-																			caseTempMap.put("no_art", ""+caseToBeStore);
-																			caseTempMap.put("alloc_qty", caseToBeStore * packSize);
-																			caseTempMap.put("LAST_PACK_WEIGHT",lastPackWeight + (caseToBeStore * caseWeight));
-																			caseTempMap.put("LAST_PACK_VOLUME", (caseToBeStore * caseVolume) + lastPackVolume);
-																			caseTempMap.put("LAST_PACK_COUNT", (lastPackCount + caseToBeStore));	
-																			caseTempMap.put("CASE_VOLUME_TOT", (caseToBeStore * caseVolume));
-																			caseTempMap.put("CASE_WEIGHT_TOT", (caseToBeStore * caseWeight));
-																			
-																			tempList.add(caseTempMap);
-																			cashCount = cashCount - caseToBeStore;
-																	
-																			allMasterList.set(allMasterListlen-1,tempList);
-																		}
-																}
-															}
+														mPackCounter = mPackCounter + 1;
 													}
-													else
+												
+													if(totalCaseOnPallet > cashCount)
 													{
-														break;
+														totalCaseOnPallet = cashCount;
 													}
-												//}
-											}
-											else
-											{
-												break;
-											}
-										}
-									}
-									//To store best FIT Algorithem and NFT Next Fit Algrthem as per user requirement.end
-									//Logic stands.end
-									
 													
-									System.out.println("Now cashCount Count======================================================================= ["+cashCount+"]");
-									
-									if(cashCount > 0)
-									{
-									
-											mPackCounter = Math.floor(cashCount / masterPackCount);	
-											totalCaseOnPallet = masterPackCount;
-											counter = 0;
-											
-											if(cashCount/mPackCounter != 0)
-											{
-												mPackCounter = mPackCounter + 1;
-											}
-										
-											if(totalCaseOnPallet > cashCount)
-											{
-												totalCaseOnPallet = cashCount;
-											}
-											
-											System.out.println("mPackCounter["+mPackCounter+"]");
-											masterPackWeightCount = Math.floor(masterPackWeight/caseWeight);
-											System.out.println("masterPackWeightCount..............["+masterPackWeightCount+"]");
-											System.out.println("totalCaseOnPallet["+totalCaseOnPallet+"]");
-											double masterPackVolumeCount = Math.floor(masterPackVolume/caseVolume);
-											System.out.println("masterPackVolumeCount--------------["+masterPackVolumeCount+"]");
-											///New Veraibles Start
-											
-											//// New Veriables End
-											
-											if(masterPackWeightCount > masterPackVolumeCount)
-											{
-												masterPackWeightCount = masterPackVolumeCount;
-											}
-											
-											
-											do
-											{
-												double currentCaseCount = 	totalCaseOnPallet;			
-												
-												System.out.println("totalCaseOnPallet["+totalCaseOnPallet+"]");
-												double casesWeightCount = Math.floor(currentCaseCount/masterPackWeightCount);
-												System.out.println("CURRENT CASE COUNT["+currentCaseCount+"]");
-																				
-												double wCounter = 0;
-												if(masterPackWeightCount > currentCaseCount)
-												{
-													System.out.println("masterPackWeightCount---"+masterPackWeightCount);
-													masterPackWeightCount = currentCaseCount;
-												}
-												
-												do
-												{
-													if(allMasterList.size() > 0)
+													System.out.println("mPackCounter["+mPackCounter+"]");
+													masterPackWeightCount = Math.floor(masterPackWeight/caseWeight);
+													System.out.println("masterPackWeightCount..............["+masterPackWeightCount+"]");
+													System.out.println("totalCaseOnPallet["+totalCaseOnPallet+"]");
+													double masterPackVolumeCount = Math.floor(masterPackVolume/caseVolume);
+													System.out.println("masterPackVolumeCount--------------["+masterPackVolumeCount+"]");
+													///New Veraibles Start
+													
+													//// New Veriables End
+													
+													if(masterPackWeightCount > masterPackVolumeCount)
 													{
-														int allListLen = allMasterList.size();
-														masterTempList = (ArrayList)allMasterList.get(allListLen -1);
-														int innerListLen = masterTempList.size();
-														Map tempMap = (HashMap)masterTempList.get(innerListLen -1);							
-									
-															if(tempMap.containsKey("LAST_PACK_WEIGHT") && tempMap.containsKey("LAST_PACK_VOLUME") && tempMap.containsKey("LAST_PACK_COUNT"))
-															{		
-																	double remainingWeight = 0.0;
-																	double remainingVolume = 0.0;
-																	double lastPackWeight = (Double)tempMap.get("LAST_PACK_WEIGHT");
-																	double lastPackVolume = (Double)tempMap.get("LAST_PACK_VOLUME");
-																	double lastPackCount = (Double)tempMap.get("LAST_PACK_COUNT");
-																	System.out.println("LAST PACK WEIGHT FROM THE MAP["+lastPackWeight+"]");
-																	System.out.println("LAST PACK VOLUME FROM THE MAP>>>>>>>>>>>>["+lastPackVolume+"]");
-																	double currentWeight = masterPackWeightCount * caseWeight;
-																	double currentCaseVolume = masterPackWeightCount * caseVolume;
-																	
-																	
-																	System.out.println("CURRENT WEIGHT TO STORE["+currentWeight+"]");
-																	System.out.println("CURRENT VOLUME TO STORE["+currentCaseVolume+"]");
-																	
-																	if(lastPackWeight < masterPackWeight && lastPackVolume < masterPackVolume && lastPackCount < masterPackCount)
-																	{
-																		remainingWeight = masterPackWeight - lastPackWeight;
-																		remainingVolume = masterPackVolume  - 	lastPackVolume;	
-																		
-																		System.out.println("REMAINING WEIGHT TO STORE ["+remainingWeight+"]");
-																		System.out.println("REMAINING VOLUME TO STORE ["+remainingVolume+"]");
-																		
-									
-																		if(remainingWeight >= caseWeight && remainingVolume >= caseVolume )
-																		{
-																			if(remainingWeight >= currentWeight && remainingVolume >= currentCaseVolume && (lastPackCount + masterPackWeightCount) <= masterPackCount)
+														masterPackWeightCount = masterPackVolumeCount;
+													}
+													
+													
+													do
+													{
+														double currentCaseCount = 	totalCaseOnPallet;			
+														
+														System.out.println("totalCaseOnPallet["+totalCaseOnPallet+"]");
+														double casesWeightCount = Math.floor(currentCaseCount/masterPackWeightCount);
+														System.out.println("CURRENT CASE COUNT["+currentCaseCount+"]");
+																						
+														double wCounter = 0;
+														if(masterPackWeightCount > currentCaseCount)
+														{
+															System.out.println("masterPackWeightCount---"+masterPackWeightCount);
+															masterPackWeightCount = currentCaseCount;
+														}
+														
+														do
+														{
+															if(allMasterList.size() > 0)
+															{
+																int allListLen = allMasterList.size();
+																masterTempList = (ArrayList)allMasterList.get(allListLen -1);
+																int innerListLen = masterTempList.size();
+																Map tempMap = (HashMap)masterTempList.get(innerListLen -1);							
+											
+																	if(tempMap.containsKey("LAST_PACK_WEIGHT") && tempMap.containsKey("LAST_PACK_VOLUME") && tempMap.containsKey("LAST_PACK_COUNT"))
+																	{		
+																			double remainingWeight = 0.0;
+																			double remainingVolume = 0.0;
+																			double lastPackWeight = (Double)tempMap.get("LAST_PACK_WEIGHT");
+																			double lastPackVolume = (Double)tempMap.get("LAST_PACK_VOLUME");
+																			double lastPackCount = (Double)tempMap.get("LAST_PACK_COUNT");
+																			System.out.println("LAST PACK WEIGHT FROM THE MAP["+lastPackWeight+"]");
+																			System.out.println("LAST PACK VOLUME FROM THE MAP>>>>>>>>>>>>["+lastPackVolume+"]");
+																			double currentWeight = masterPackWeightCount * caseWeight;
+																			double currentCaseVolume = masterPackWeightCount * caseVolume;
+																			
+																			
+																			System.out.println("CURRENT WEIGHT TO STORE["+currentWeight+"]");
+																			System.out.println("CURRENT VOLUME TO STORE["+currentCaseVolume+"]");
+																			
+																			if(lastPackWeight < masterPackWeight && lastPackVolume < masterPackVolume && lastPackCount < masterPackCount)
 																			{
+																				remainingWeight = masterPackWeight - lastPackWeight;
+																				remainingVolume = masterPackVolume  - 	lastPackVolume;	
 																				
-																				HashMap caseTempMap = (HashMap)dataMap.clone();			
-																				caseTempMap.put("no_art", ""+masterPackWeightCount);
-																				caseTempMap.put("alloc_qty", masterPackWeightCount * packSize	);
-																				caseTempMap.put("LAST_PACK_WEIGHT", lastPackWeight + (masterPackWeightCount * caseWeight));
-																				caseTempMap.put("LAST_PACK_VOLUME", (currentCaseVolume + lastPackVolume));
-																				caseTempMap.put("LAST_PACK_COUNT", (lastPackCount + masterPackWeightCount));
-																				caseTempMap.put("CASE_VOLUME_TOT", (masterPackWeightCount * caseVolume));
-																				caseTempMap.put("CASE_WEIGHT_TOT", (masterPackWeightCount * caseWeight));
-																				masterTempList.add(caseTempMap);
-																				int updLen = allMasterList.size()-1;
-																				allMasterList.set(updLen,masterTempList);
-																				
-																			}
-																			else
-																			{
-																								
-																				double caseToBeStore = Math.floor(remainingWeight / caseWeight);															
-																				HashMap caseTempMap = (HashMap)dataMap.clone();	
-																				caseTempMap.put("no_art", ""+caseToBeStore);
-																				caseTempMap.put("alloc_qty", caseToBeStore * packSize);
-																				caseTempMap.put("LAST_PACK_WEIGHT",lastPackWeight + (caseToBeStore * caseWeight));
-																				caseTempMap.put("LAST_PACK_VOLUME", (caseToBeStore * caseVolume) + lastPackVolume);	
-																				caseTempMap.put("LAST_PACK_COUNT", (lastPackCount + caseToBeStore));
-																				caseTempMap.put("CASE_VOLUME_TOT", (caseToBeStore * caseVolume));
-																				caseTempMap.put("CASE_WEIGHT_TOT", (caseToBeStore * caseWeight));
-																				masterTempList.add(caseTempMap);
-																				lastPackWeight = lastPackWeight + (caseToBeStore * caseWeight);
-																				double requiredVolumeToStore = currentCaseVolume - (caseToBeStore * caseVolume);
-																				double requiredWeightToStore = currentWeight - (caseToBeStore * caseWeight);
-																				masterTempList = new ArrayList();
-																				HashMap caseTempMap1 = (HashMap)dataMap.clone();	
-																				caseToBeStore = Math.floor(requiredWeightToStore / caseWeight);
-																				caseTempMap1.put("no_art", ""+caseToBeStore);
-																				caseTempMap1.put("alloc_qty", caseToBeStore * packSize);
+																				System.out.println("REMAINING WEIGHT TO STORE ["+remainingWeight+"]");
+																				System.out.println("REMAINING VOLUME TO STORE ["+remainingVolume+"]");
 																				
-																				if((requiredWeightToStore + lastPackWeight) > masterPackWeight)
+											
+																				if(remainingWeight >= caseWeight && remainingVolume >= caseVolume )
 																				{
-																					caseTempMap1.put("LAST_PACK_WEIGHT", requiredWeightToStore);
+																					if(remainingWeight >= currentWeight && remainingVolume >= currentCaseVolume && (lastPackCount + masterPackWeightCount) <= masterPackCount)
+																					{
+																						
+																						HashMap caseTempMap = (HashMap)dataMap.clone();			
+																						caseTempMap.put("no_art", ""+masterPackWeightCount);
+																						caseTempMap.put("alloc_qty", masterPackWeightCount * packSize	);
+																						caseTempMap.put("LAST_PACK_WEIGHT", lastPackWeight + (masterPackWeightCount * caseWeight));
+																						caseTempMap.put("LAST_PACK_VOLUME", (currentCaseVolume + lastPackVolume));
+																						caseTempMap.put("LAST_PACK_COUNT", (lastPackCount + masterPackWeightCount));
+																						caseTempMap.put("CASE_VOLUME_TOT", (masterPackWeightCount * caseVolume));
+																						caseTempMap.put("CASE_WEIGHT_TOT", (masterPackWeightCount * caseWeight));
+																						masterTempList.add(caseTempMap);
+																						int updLen = allMasterList.size()-1;
+																						allMasterList.set(updLen,masterTempList);
+																						
+																					}
+																					else
+																					{
+																										
+																						double caseToBeStore = Math.floor(remainingWeight / caseWeight);															
+																						HashMap caseTempMap = (HashMap)dataMap.clone();	
+																						caseTempMap.put("no_art", ""+caseToBeStore);
+																						caseTempMap.put("alloc_qty", caseToBeStore * packSize);
+																						caseTempMap.put("LAST_PACK_WEIGHT",lastPackWeight + (caseToBeStore * caseWeight));
+																						caseTempMap.put("LAST_PACK_VOLUME", (caseToBeStore * caseVolume) + lastPackVolume);	
+																						caseTempMap.put("LAST_PACK_COUNT", (lastPackCount + caseToBeStore));
+																						caseTempMap.put("CASE_VOLUME_TOT", (caseToBeStore * caseVolume));
+																						caseTempMap.put("CASE_WEIGHT_TOT", (caseToBeStore * caseWeight));
+																						masterTempList.add(caseTempMap);
+																						lastPackWeight = lastPackWeight + (caseToBeStore * caseWeight);
+																						double requiredVolumeToStore = currentCaseVolume - (caseToBeStore * caseVolume);
+																						double requiredWeightToStore = currentWeight - (caseToBeStore * caseWeight);
+																						masterTempList = new ArrayList();
+																						HashMap caseTempMap1 = (HashMap)dataMap.clone();	
+																						caseToBeStore = Math.floor(requiredWeightToStore / caseWeight);
+																						caseTempMap1.put("no_art", ""+caseToBeStore);
+																						caseTempMap1.put("alloc_qty", caseToBeStore * packSize);
+																						
+																						if((requiredWeightToStore + lastPackWeight) > masterPackWeight)
+																						{
+																							caseTempMap1.put("LAST_PACK_WEIGHT", requiredWeightToStore);
+																						}
+																						else
+																						{
+																							caseTempMap1.put("LAST_PACK_WEIGHT", (requiredWeightToStore + lastPackWeight));
+																						}
+																						
+																						if((requiredVolumeToStore + lastPackVolume) > masterPackVolume)
+																						{
+																							caseTempMap1.put("LAST_PACK_COUNT", (lastPackCount + caseToBeStore));
+																							caseTempMap1.put("LAST_PACK_VOLUME", requiredVolumeToStore);
+																							System.out.println("&&&& if After storing 2nd  Last Pack Volume  Volume ["+requiredVolumeToStore+"]");
+																						}
+																						else
+																						{
+																							caseTempMap1.put("LAST_PACK_COUNT", (lastPackCount + caseToBeStore));
+																							caseTempMap1.put("LAST_PACK_VOLUME", requiredVolumeToStore + lastPackVolume);
+																							System.out.println("&&&& else After storing 2nd  Last Pack Volume  Volume ["+requiredVolumeToStore + lastPackVolume+"]");
+																						}		
+																						caseTempMap1.put("CASE_VOLUME_TOT", (caseToBeStore * caseVolume));
+																						caseTempMap1.put("CASE_WEIGHT_TOT", (caseToBeStore * caseWeight));
+																						masterTempList.add(caseTempMap1);
+																						int updLen1 = masterTempList.size()-1;
+																						allMasterList.add(masterTempList);
+																						
+																					}
 																				}
 																				else
 																				{
-																					caseTempMap1.put("LAST_PACK_WEIGHT", (requiredWeightToStore + lastPackWeight));
-																				}
-																				
-																				if((requiredVolumeToStore + lastPackVolume) > masterPackVolume)
-																				{
-																					caseTempMap1.put("LAST_PACK_COUNT", (lastPackCount + caseToBeStore));
-																					caseTempMap1.put("LAST_PACK_VOLUME", requiredVolumeToStore);
-																					System.out.println("&&&& if After storing 2nd  Last Pack Volume  Volume ["+requiredVolumeToStore+"]");
+																					masterTempList = new ArrayList();
+																					HashMap caseTempMap = (HashMap)dataMap.clone();	
+																					caseTempMap.put("no_art", ""+masterPackWeightCount);
+																					caseTempMap.put("alloc_qty", masterPackWeightCount * packSize	);				
+																					caseTempMap.put("LAST_PACK_WEIGHT", masterPackWeightCount * caseWeight);	
+																					caseTempMap.put("LAST_PACK_VOLUME", (masterPackWeightCount * caseVolume));
+																					caseTempMap.put("CASE_VOLUME_TOT", (masterPackWeightCount * caseVolume));
+																					caseTempMap.put("CASE_WEIGHT_TOT", (masterPackWeightCount * caseWeight));
+																					caseTempMap.put("LAST_PACK_COUNT", masterPackWeightCount);
+																					masterTempList.add(caseTempMap);
+																					allMasterList.add(masterTempList);
 																				}
-																				else
-																				{
-																					caseTempMap1.put("LAST_PACK_COUNT", (lastPackCount + caseToBeStore));
-																					caseTempMap1.put("LAST_PACK_VOLUME", requiredVolumeToStore + lastPackVolume);
-																					System.out.println("&&&& else After storing 2nd  Last Pack Volume  Volume ["+requiredVolumeToStore + lastPackVolume+"]");
-																				}		
-																				caseTempMap1.put("CASE_VOLUME_TOT", (caseToBeStore * caseVolume));
-																				caseTempMap1.put("CASE_WEIGHT_TOT", (caseToBeStore * caseWeight));
-																				masterTempList.add(caseTempMap1);
-																				int updLen1 = masterTempList.size()-1;
+																			}
+																			else
+																			{
+																				masterTempList = new ArrayList();
+																				HashMap caseTempMap = (HashMap)dataMap.clone();	
+																				caseTempMap.put("no_art", ""+masterPackWeightCount);
+																				caseTempMap.put("alloc_qty", masterPackWeightCount * packSize	);				
+																				caseTempMap.put("LAST_PACK_WEIGHT", masterPackWeightCount * caseWeight);		
+																				caseTempMap.put("LAST_PACK_VOLUME", (masterPackWeightCount * caseVolume));
+																				caseTempMap.put("CASE_VOLUME_TOT", (masterPackWeightCount * caseVolume));
+																				caseTempMap.put("CASE_WEIGHT_TOT", (masterPackWeightCount * caseWeight));
+																				caseTempMap.put("LAST_PACK_COUNT", masterPackWeightCount);
+																				masterTempList.add(caseTempMap);
 																				allMasterList.add(masterTempList);
-																				
+											
 																			}
-																		}
-																		else
-																		{
-																			masterTempList = new ArrayList();
-																			HashMap caseTempMap = (HashMap)dataMap.clone();	
-																			caseTempMap.put("no_art", ""+masterPackWeightCount);
-																			caseTempMap.put("alloc_qty", masterPackWeightCount * packSize	);				
-																			caseTempMap.put("LAST_PACK_WEIGHT", masterPackWeightCount * caseWeight);	
-																			caseTempMap.put("LAST_PACK_VOLUME", (masterPackWeightCount * caseVolume));
-																			caseTempMap.put("CASE_VOLUME_TOT", (masterPackWeightCount * caseVolume));
-																			caseTempMap.put("CASE_WEIGHT_TOT", (masterPackWeightCount * caseWeight));
-																			caseTempMap.put("LAST_PACK_COUNT", masterPackWeightCount);
-																			masterTempList.add(caseTempMap);
-																			allMasterList.add(masterTempList);
-																		}
-																	}
-																	else
-																	{
-																		masterTempList = new ArrayList();
-																		HashMap caseTempMap = (HashMap)dataMap.clone();	
-																		caseTempMap.put("no_art", ""+masterPackWeightCount);
-																		caseTempMap.put("alloc_qty", masterPackWeightCount * packSize	);				
-																		caseTempMap.put("LAST_PACK_WEIGHT", masterPackWeightCount * caseWeight);		
-																		caseTempMap.put("LAST_PACK_VOLUME", (masterPackWeightCount * caseVolume));
-																		caseTempMap.put("CASE_VOLUME_TOT", (masterPackWeightCount * caseVolume));
-																		caseTempMap.put("CASE_WEIGHT_TOT", (masterPackWeightCount * caseWeight));
-																		caseTempMap.put("LAST_PACK_COUNT", masterPackWeightCount);
-																		masterTempList.add(caseTempMap);
-																		allMasterList.add(masterTempList);
-									
 																	}
+																
 															}
+															else
+															{
+																
+																
+																System.out.println("### MASTER PACK MAP Doesn't Exist.......");
+																masterTempList = new ArrayList();
+																HashMap caseTempMap = (HashMap)dataMap.clone();			
+																caseTempMap.put("no_art", ""+masterPackWeightCount);
+																caseTempMap.put("alloc_qty", masterPackWeightCount * packSize	);
+																caseTempMap.put("LAST_PACK_WEIGHT", masterPackWeightCount * caseWeight);
+																caseTempMap.put("LAST_PACK_VOLUME", (masterPackWeightCount * caseVolume));
+																caseTempMap.put("CASE_VOLUME_TOT", (masterPackWeightCount * caseVolume));
+																caseTempMap.put("CASE_WEIGHT_TOT", (masterPackWeightCount * caseWeight));
+																caseTempMap.put("LAST_PACK_COUNT", masterPackWeightCount);
+																masterTempList.add(caseTempMap);
+																allMasterList.add(masterTempList);									
+															}
+																				
+															
+															System.out.println("masterPackWeightCount**************["+masterPackWeightCount+"]");
+															
+															
+															currentCaseCount = currentCaseCount - masterPackWeightCount;
+											
+															System.out.println("currentCaseCount+++++++++++++++["+currentCaseCount+"]");
+											
+															if((currentCaseCount /masterPackWeightCount) < 1)
+															{						
+																System.out.println("masterPackWeightCount**************["+masterPackWeightCount+"]");
+																
+																masterPackWeightCount = currentCaseCount;
+															}
+											
+															if(currentCaseCount <= 0)
+															{
+																System.out.println("currentCaseCount===============["+currentCaseCount+"]");
+																break;
+															}
+															
+															if(masterPackWeightCount <= 0)
+															{
+																System.out.println("masterPackWeightCount===============["+masterPackWeightCount+"]");
+																break;
+															}
+											
+															
+															
+															System.out.println("MASTER PACK COUNTER["+wCounter+"]MASTER PACK WEIGHT COUNT["+masterPackWeightCount+"]");
+															wCounter++;
+														}		
+														while(wCounter <= casesWeightCount);
+														/////////////////////End Weight Wize
+														masterPackWeightCount = Math.floor(masterPackWeight/caseWeight);
+														System.out.println("masterPackWeightCount--new "+masterPackWeightCount);
+														cashCount = cashCount - totalCaseOnPallet;
+														if(cashCount / masterPackCount >=1)
+														{
+															totalCaseOnPallet = masterPackCount;
+														}
+														else
+														{
+															totalCaseOnPallet = cashCount;
+														}
 														
-													}
-													else
-													{
-														
-														
-														System.out.println("### MASTER PACK MAP Doesn't Exist.......");
-														masterTempList = new ArrayList();
-														HashMap caseTempMap = (HashMap)dataMap.clone();			
-														caseTempMap.put("no_art", ""+masterPackWeightCount);
-														caseTempMap.put("alloc_qty", masterPackWeightCount * packSize	);
-														caseTempMap.put("LAST_PACK_WEIGHT", masterPackWeightCount * caseWeight);
-														caseTempMap.put("LAST_PACK_VOLUME", (masterPackWeightCount * caseVolume));
-														caseTempMap.put("CASE_VOLUME_TOT", (masterPackWeightCount * caseVolume));
-														caseTempMap.put("CASE_WEIGHT_TOT", (masterPackWeightCount * caseWeight));
-														caseTempMap.put("LAST_PACK_COUNT", masterPackWeightCount);
-														masterTempList.add(caseTempMap);
-														allMasterList.add(masterTempList);									
-													}
-																		
-													
-													System.out.println("masterPackWeightCount**************["+masterPackWeightCount+"]");
-													
-													
-													currentCaseCount = currentCaseCount - masterPackWeightCount;
-									
-													System.out.println("currentCaseCount+++++++++++++++["+currentCaseCount+"]");
-									
-													if((currentCaseCount /masterPackWeightCount) < 1)
-													{						
-														System.out.println("masterPackWeightCount**************["+masterPackWeightCount+"]");
+														if(totalCaseOnPallet <=0)
+														{
+															break;
+														}
 														
-														masterPackWeightCount = currentCaseCount;
-													}
-									
-													if(currentCaseCount <= 0)
-													{
-														System.out.println("currentCaseCount===============["+currentCaseCount+"]");
-														break;
-													}
-													
-													if(masterPackWeightCount <= 0)
-													{
-														System.out.println("masterPackWeightCount===============["+masterPackWeightCount+"]");
-														break;
-													}
-									
-													
-													
-													System.out.println("MASTER PACK COUNTER["+wCounter+"]MASTER PACK WEIGHT COUNT["+masterPackWeightCount+"]");
-													wCounter++;
+														counter++;
+														System.out.println("REMAINING CASE COUNT["+cashCount+"]");
+														System.out.println("CURRENT PACKET COUNTER"+mPackCounter+"]COUNT["+counter+"]");
+											
 												}		
-												while(wCounter <= casesWeightCount);
-												/////////////////////End Weight Wize
-												masterPackWeightCount = Math.floor(masterPackWeight/caseWeight);
-												System.out.println("masterPackWeightCount--new "+masterPackWeightCount);
-												cashCount = cashCount - totalCaseOnPallet;
-												if(cashCount / masterPackCount >=1)
-												{
-													totalCaseOnPallet = masterPackCount;
-												}
-												else
-												{
-													totalCaseOnPallet = cashCount;
-												}
-												
-												if(totalCaseOnPallet <=0)
-												{
-													break;
-												}
-												
-												counter++;
-												System.out.println("REMAINING CASE COUNT["+cashCount+"]");
-												System.out.println("CURRENT PACKET COUNTER"+mPackCounter+"]COUNT["+counter+"]");
-									
-										}		
-										while(counter < mPackCounter);
-								}
+												while(counter < mPackCounter);
+											}
+									}//If parcelPack Not allowed
 									
 							
 								
@@ -11780,9 +11879,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				//Changed by Rohan on 4-12-11 [WMIESUN006] for Master Packing 
 				//if(quantity >= packSize)
 				System.out.println("masterPackAllow"+masterPackAllow+"quantity"+quantity+"packSize"+packSize+"stockToDock"+stockToDock);
+				//Changed By Pragyan 02/12/12 For 
 				//Changed by rohan on 14/08/12 to generate task depending upon wave type info
 				//if(!masterPackAllow && quantity >= packSize && stockToDock.equalsIgnoreCase("N"))
-				if(("N".equalsIgnoreCase(mPackAllow)) && (quantity >= packSize || "N".equalsIgnoreCase(aPickAllow)) && (stockToDock.equalsIgnoreCase("N") || "N".equalsIgnoreCase(stockToDoc)))
+				//if(("N".equalsIgnoreCase(mPackAllow)) && (quantity >= packSize || "N".equalsIgnoreCase(aPickAllow)) && (stockToDock.equalsIgnoreCase("N") || "N".equalsIgnoreCase(stockToDoc)))
+				if(("N".equalsIgnoreCase(mPackAllow)) && ("N".equalsIgnoreCase(pPickAllow)) && (quantity >= packSize || "N".equalsIgnoreCase(aPickAllow)) && (stockToDock.equalsIgnoreCase("N") || "N".equalsIgnoreCase(stockToDoc)))
 				{
 					System.out.println("--INSIDE CASE PACK BLOCK--");
 					
@@ -12639,17 +12740,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					double caseWeightTotal=0.0;
 					boolean isPick = false;
 					double packSizeCase = 0.0;
-					
+					pickType = "M";
 					for(int cCTR = 0;cCTR < lengthOfMaster; cCTR ++)
 					{
 						isPick = true;
-						pickType = "M";					
 						ArrayList tempListToRepl = (ArrayList)allMasterPackList.get(cCTR);
 						int tempListToReplLen = tempListToRepl.size();
 						String isCreateReplHeader ="N";
 						
-						
-						
 						ArrayList tempList = (ArrayList)allMasterPackList.get(cCTR);
 						int tempLen = tempList.size();				
 						int replCtr = 1;
@@ -12669,6 +12767,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 							sordLineNo = (String)tempMap.get("sord_lineNo");
 							itemGrossWeight =(Double)tempMap.get("item_weight");
 							itemLocType = (String)tempMap.get("loc_type");
+							//pPickAllow = (String)tempMap.get("parcel_pick");
+							//pickType = ("Y".equalsIgnoreCase(pPickAllow))?"P":"M";
 							locZonePref = Integer.parseInt(String.valueOf(tempMap.get("loc_zone_pref")));
 							invStat = (String)tempMap.get("inv_stat");
 							invStat = invStat.trim();
@@ -12729,7 +12829,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 								
 								if(("Y".equalsIgnoreCase(isSinglePickMasterPack)) && cCTR == 0)
 								{
-									pickRefId = updateWaveTaskDet(waveID,2,saleOrder,"M-PICK","M",ptcn,conn);
+									if(("Y".equalsIgnoreCase(pPickAllow)))
+									{
+										pickRefId = updateWaveTaskDet(waveID,2,saleOrder,"P-PICK","P",ptcn,conn);
+									}
+									else
+									{
+										pickRefId = updateWaveTaskDet(waveID,2,saleOrder,"M-PICK","M",ptcn,conn);
+									}
 									pstmt.setString(1,pickRefId);
 									pstmt.setDate( 2, orderDate );
 									pstmt.setString(3,siteCode);
@@ -12743,7 +12850,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 								}
 								else if (!("Y".equalsIgnoreCase(isSinglePickMasterPack)))
 								{
-									pickRefId = updateWaveTaskDet(waveID,2,saleOrder,"M-PICK","M",ptcn,conn);
+									if(("Y".equalsIgnoreCase(pPickAllow)))
+									{
+										pickRefId = updateWaveTaskDet(waveID,2,saleOrder,"P-PICK","P",ptcn,conn);
+									}
+									else
+									{
+										pickRefId = updateWaveTaskDet(waveID,2,saleOrder,"M-PICK","M",ptcn,conn);
+									}
 									pstmt.setString(1,pickRefId);
 									pstmt.setDate( 2, orderDate );
 									pstmt.setString(3,siteCode);
@@ -12932,31 +13046,35 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 								}
 							}
 							
-							if("Y".equalsIgnoreCase(isSinglePickMasterPack))
+							if((!"Y".equalsIgnoreCase(pPickAllow)))
 							{
+								HashMap tempPickMap = new HashMap();
+								tempPickMap.put("pick_order", pickRefId);
+								tempPickMap.put("line_no_pick", pickCtr);
+								tempPickMap.put("no_art", Double.parseDouble(noArt));
+								tempPickMap.put("case_weight", caseWeight);
+								tempPickMap.put("case_volume", caseVolume);
 								
-							}
-							
-							HashMap tempPickMap = new HashMap();
-							tempPickMap.put("pick_order", pickRefId);
-							tempPickMap.put("line_no_pick", pickCtr);
-							tempPickMap.put("no_art", Double.parseDouble(noArt));
-							tempPickMap.put("case_weight", caseWeight);
-							tempPickMap.put("case_volume", caseVolume);
-							
-							if(mapItemPick.containsKey(itemCode))
-							{
-								allItemPickkList = (ArrayList)mapItemPick.get(itemCode);
-								allItemPickkList.add(tempPickMap);
-								mapItemPick.put(itemCode, allItemPickkList);
+								if(mapItemPick.containsKey(itemCode))
+								{
+									allItemPickkList = (ArrayList)mapItemPick.get(itemCode);
+									allItemPickkList.add(tempPickMap);
+									mapItemPick.put(itemCode, allItemPickkList);
+								}
+								else
+								{								
+									allItemPickkList = new ArrayList();
+									allItemPickkList.add(tempPickMap);
+									mapItemPick.put(itemCode, allItemPickkList);
+								}
 							}
 							else
-							{								
-								allItemPickkList = new ArrayList();
-								allItemPickkList.add(tempPickMap);
-								mapItemPick.put(itemCode, allItemPickkList);
+							{
+								updateCartonMaster(pickRefId, pickCtr,Double.parseDouble(noArt),ptcn,"P-PICK", xtraParams,"", conn);
 							}
 							
+							
+							
 							/*updateCartonMaster(pickRefId, pickCtr,Double.parseDouble(noArt),ptcn,"M-PICK", xtraParams, conn);//Not Required;
 							
 							if("Y".equalsIgnoreCase(isSinglePickMasterPack))
@@ -13039,63 +13157,66 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						ctrMaster++;
 					}
 					
-					int allMasterListlen = allMasterList.size();
-					String masterCartonNo = "";
-					for(int j = 0 ;j < allMasterListlen ; j++)
+					if((!"Y".equalsIgnoreCase(pPickAllow)))
 					{
-						caseWeightTotal = 0.0;
-						caseVolumeTotal = 0.0;
-						ArrayList tempList = (ArrayList)allMasterList.get(j);
-						System.out.println("Loop============"+j);
-						packRefId = updateWaveTaskDet(waveID,3,saleOrder,"","",ptcn,conn);
-						updatePacking(waveID,saleOrder,packRefId,pickRefId,ptcn,xtraParams, conn);
-						for(int ctrM =0 ; ctrM < tempList.size() ; ctrM++)
-						{	//caseTempMap.put("CASE_VOLUME_TOT", (caseToBeStore * caseWeight));
-							//caseTempMap.put("CASE_WEIGHT_TOT", (caseToBeStore * caseVolume));
-							HashMap tempMap = (HashMap)tempList.get(ctrM);
-							caseWeightTotal = caseWeightTotal + (Double)tempMap.get("CASE_WEIGHT_TOT");
-							caseVolumeTotal = caseVolumeTotal + (Double)tempMap.get("CASE_VOLUME_TOT");
-						}
-						System.out.println("CURRENT CASE WEIGHT TOTAL["+caseWeightTotal+"]");
-						System.out.println("CURRENT CASE VOLUME TOTAL["+caseVolumeTotal+"]");
-						
-						masterCartonNo = updateCartonMaster(packRefId, j + 1,Double.parseDouble("1"),ptcn,"M-PACK", xtraParams, conn,caseWeightTotal,caseVolumeTotal,pickType);
-						
-						for(int k =0 ; k < tempList.size() ; k++)
+						int allMasterListlen = allMasterList.size();
+						String masterCartonNo = "";
+						for(int j = 0 ;j < allMasterListlen ; j++)
 						{
+							caseWeightTotal = 0.0;
+							caseVolumeTotal = 0.0;
+							ArrayList tempList = (ArrayList)allMasterList.get(j);
+							System.out.println("Loop============"+j);
+							packRefId = updateWaveTaskDet(waveID,3,saleOrder,"","",ptcn,conn);
+							updatePacking(waveID,saleOrder,packRefId,pickRefId,ptcn,xtraParams, conn);
+							for(int ctrM =0 ; ctrM < tempList.size() ; ctrM++)
+							{	//caseTempMap.put("CASE_VOLUME_TOT", (caseToBeStore * caseWeight));
+								//caseTempMap.put("CASE_WEIGHT_TOT", (caseToBeStore * caseVolume));
+								HashMap tempMap = (HashMap)tempList.get(ctrM);
+								caseWeightTotal = caseWeightTotal + (Double)tempMap.get("CASE_WEIGHT_TOT");
+								caseVolumeTotal = caseVolumeTotal + (Double)tempMap.get("CASE_VOLUME_TOT");
+							}
+							System.out.println("CURRENT CASE WEIGHT TOTAL["+caseWeightTotal+"]");
+							System.out.println("CURRENT CASE VOLUME TOTAL["+caseVolumeTotal+"]");
 							
-							HashMap tempMap = (HashMap)tempList.get(k);
-							itemCode = (String)tempMap.get("item_code");
-							noArt = (String)tempMap.get("no_art");
-							System.out.println("Item Name["+itemCode+"]");
-							System.out.println("No Of Art["+noArt+"]");
-							System.out.println("Alloc Qty["+tempMap.get("alloc_qty")+"]");
-							ArrayList valList = (ArrayList)mapItemPick.get(itemCode);
-							int valListLen = valList.size();
-							for(int vCtr = 0; vCtr < valListLen;vCtr++)
+							masterCartonNo = updateCartonMaster(packRefId, j + 1,Double.parseDouble("1"),ptcn,"M-PACK", xtraParams, conn,caseWeightTotal,caseVolumeTotal,pickType);
+							
+							for(int k =0 ; k < tempList.size() ; k++)
 							{
-								HashMap vMap = (HashMap)valList.get(vCtr);
-								double currentnoArt = (Double)vMap.get("no_art");
 								
-								if(currentnoArt <= 0.0)
+								HashMap tempMap = (HashMap)tempList.get(k);
+								itemCode = (String)tempMap.get("item_code");
+								noArt = (String)tempMap.get("no_art");
+								System.out.println("Item Name["+itemCode+"]");
+								System.out.println("No Of Art["+noArt+"]");
+								System.out.println("Alloc Qty["+tempMap.get("alloc_qty")+"]");
+								ArrayList valList = (ArrayList)mapItemPick.get(itemCode);
+								int valListLen = valList.size();
+								for(int vCtr = 0; vCtr < valListLen;vCtr++)
 								{
-									continue;
+									HashMap vMap = (HashMap)valList.get(vCtr);
+									double currentnoArt = (Double)vMap.get("no_art");
+									
+									if(currentnoArt <= 0.0)
+									{
+										continue;
+									}
+									
+									pickRefId = (String)vMap.get("pick_order");
+									int pickCtr = (Integer)vMap.get("line_no_pick");
+									
+									System.out.println("Pick Order["+pickRefId+"]");
+									System.out.println("Line No Pick["+vMap.get("line_no_pick")+"]");
+									System.out.println("Total No art["+currentnoArt+"]");
+									System.out.println("case Weight["+vMap.get("case_weight")+"]");
+									System.out.println("case Volume["+vMap.get("case_volume")+"]");
+									updateCartonMaster(pickRefId, pickCtr,Double.parseDouble(noArt),ptcn,"M-PICK", xtraParams,masterCartonNo, conn);
+									vMap.put("no_art", currentnoArt - Double.parseDouble(noArt));
 								}
 								
-								pickRefId = (String)vMap.get("pick_order");
-								int pickCtr = (Integer)vMap.get("line_no_pick");
-								
-								System.out.println("Pick Order["+pickRefId+"]");
-								System.out.println("Line No Pick["+vMap.get("line_no_pick")+"]");
-								System.out.println("Total No art["+currentnoArt+"]");
-								System.out.println("case Weight["+vMap.get("case_weight")+"]");
-								System.out.println("case Volume["+vMap.get("case_volume")+"]");
-								updateCartonMaster(pickRefId, pickCtr,Double.parseDouble(noArt),ptcn,"M-PICK", xtraParams,masterCartonNo, conn);
-								vMap.put("no_art", currentnoArt - Double.parseDouble(noArt));
 							}
 							
 						}
-						
 					}
 				}
 				
@@ -14450,6 +14571,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				//keyString = "DOC,"+keyString;
 				crtnType = "S";
 			}
+			else if(refSeries.startsWith("P-PICK"))
+			{
+				//keyString = "DOC,"+keyString;
+				crtnType = "P";
+			}
 			
 			for(int i=1; i<= noArt ;i++)
 			{
@@ -14484,7 +14610,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				pstmtInsert.setString(8,ptcn);
 				pstmtInsert.setString(9,refSeries);
 				pstmtInsert.setString(10,crtnType);
-				pstmtInsert.setString(11,masterCartonNo);
+				if(refSeries.startsWith("P-PICK"))
+				{
+					pstmtInsert.setString(11,cartonNumber);
+				}
+				else
+				{
+					pstmtInsert.setString(11,masterCartonNo);
+				}
 				pstmtInsert.addBatch();
 				pstmtInsert.clearParameters();
 						
@@ -16132,7 +16265,17 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						}
 						else
 						{
-							return suggLocCode;
+							//Changed by sumit on 11/12/12 suggesting  active pick location start
+							//return suggLocCode;
+							if("A".equalsIgnoreCase(pickType.trim()))
+							{								
+								return getPickLocForSameItemLotNo(invStat,pickType.trim(),itemCode,lotNo, lpnNo, suggLocCode, conn);
+							}
+							else
+							{
+								return suggLocCode;
+							}
+							//Changed by sumit on 11/12/12 suggesting  active pick location end
 						}				
 					}
 					else if( itemLotOpt.trim().equals("1") )  //Validation for single item_code multiple lot_no
@@ -16177,12 +16320,32 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						}
 						else
 						{
-							return suggLocCode;
+							//Changed by sumit on 11/12/12 suggesting  active pick location start
+							//return suggLocCode;
+							if("A".equalsIgnoreCase(pickType.trim()))
+							{								
+								return getPickLocForSameItemLotNo(invStat,pickType.trim(),itemCode,lotNo, lpnNo, suggLocCode, conn);
+							}
+							else
+							{
+								return suggLocCode;
+							}
+							//Changed by sumit on 11/12/12 suggesting  active pick location end
 						}
 					}
 					else
 					{
-						return suggLocCode;
+						//Changed by sumit on 11/12/12 suggesting  active pick location start
+						//return suggLocCode;
+						if("A".equalsIgnoreCase(pickType.trim()))
+						{								
+							return getPickLocForSameItemLotNo(invStat,pickType.trim(),itemCode,lotNo, lpnNo, suggLocCode, conn);
+						}
+						else
+						{
+							return suggLocCode;
+						}
+						//Changed by sumit on 11/12/12 suggesting  active pick location end
 					}
 				}
 				
@@ -16312,7 +16475,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 	  System.out.println("Return Suggested Location will throw error  == >["+suggLocCode+"]");
 	 return suggLocCode;	
 	}
-	private HashMap getTransportInfo(String saleOrder,double perShipWeight ,Connection conn) throws ITMException
+	private HashMap getTransportInfo(String saleOrder,double perShipWeight ,double noArt,Connection conn) throws ITMException
 	{
 		String sql = "";
 		String sql1 = "";
@@ -16432,8 +16595,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			sql =  " SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE FROM DISTROUTEDET A,DISTROUTE B "  
 				  + " WHERE ( A.PIN__FR =  ?  OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ?  OR   A.PIN__TO = ' ') AND (A.STAN_CODE__FR  =?  OR A.STAN_CODE__FR  = ' ' ) " 
 				  + " AND ( A.STAN_CODE__TO =?   OR A.STAN_CODE__TO = ' ')  AND ( A.STATE_CODE__FR  = ?   OR A.STATE_CODE__FR  = ' ') "
+				  //Change By Pragyan 02/01/12 to check max & min case
 				 // + "AND ( A.STATE_CODE__TO = ?  OR  A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND B.CUST_CODE = ? ";
-				  + "AND ( A.STATE_CODE__TO = ?  OR  A.STATE_CODE__TO = ' ' )  AND A.DIST_ROUTE = B.DIST_ROUTE AND B.CUST_CODE = ?  AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ?";
+				 // + "AND ( A.STATE_CODE__TO = ?  OR  A.STATE_CODE__TO = ' ' )  AND A.DIST_ROUTE = B.DIST_ROUTE AND B.CUST_CODE = ?  AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ?";
+				  + "AND ( A.STATE_CODE__TO = ?  OR  A.STATE_CODE__TO = ' ' )  AND A.DIST_ROUTE = B.DIST_ROUTE AND B.CUST_CODE = ?  AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ?";
 					
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1,pinFrm);
@@ -16445,6 +16610,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			pstmt.setString(7,custCodeDlv);
 			pstmt.setDouble(8,perShipWeight);
 			pstmt.setDouble(9,perShipWeight);
+			pstmt.setDouble(10,noArt);
+			pstmt.setDouble(11,noArt);
 			rs = pstmt.executeQuery();
 
 			if(rs.next())
@@ -16469,8 +16636,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				sql =  " SELECT A.TRAN_CODE AS TRAN_CODE,A.TRANS_MODE AS TRANS_MODE,A.MAX_WEIGHT,A.LOC_TYPE FROM DISTROUTEDET A,DISTROUTE B "  
 						  + " WHERE ( A.PIN__FR =  ?  OR A.PIN__FR = ' ' ) AND (A.PIN__TO = ?  OR   A.PIN__TO = ' ') AND (A.STAN_CODE__FR  =?  OR A.STAN_CODE__FR  = ' ' ) " 
 						  + " AND ( A.STAN_CODE__TO =?   OR A.STAN_CODE__TO = ' ')  AND ( A.STATE_CODE__FR  = ?   OR A.STATE_CODE__FR  = ' ') "
+						  //Change By Pragyan 02/01/12 to check max & min case
 						 // + "AND ( A.STATE_CODE__TO = ?  OR  A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE  ";
-						  + "AND ( A.STATE_CODE__TO = ?  OR  A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? ";
+						 // + "AND ( A.STATE_CODE__TO = ?  OR  A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? ";
+						  + "AND ( A.STATE_CODE__TO = ?  OR  A.STATE_CODE__TO = ' ' ) AND A.DIST_ROUTE = B.DIST_ROUTE AND MIN_WEIGHT <= ? AND MAX_WEIGHT >= ? AND MIN_CASE <= ? AND MAX_CASE >= ?";
 				
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1,pinFrm);
@@ -16481,7 +16650,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				pstmt.setString(6,stateCodeCust);
 				pstmt.setDouble(7,perShipWeight);
 				pstmt.setDouble(8,perShipWeight);
-				
+				pstmt.setDouble(9,noArt);
+				pstmt.setDouble(10,noArt);
 				rs = pstmt.executeQuery();
 				if(rs.next())
 				{
@@ -20283,5 +20453,209 @@ private String generatedLabelPrint(String waveId, String printer, Connection con
 	return errString;
 }
 //Chnged by sumit on 24/11/12 to get label print end.
-	
+//Changed by sumit on 10/12/12 suggesting active location for same item code and lot No. start.	
+private String getPickLocForSameItemLotNo(String invStat, String pickType, String itemCode, String lotNo, String lotSl, String suggLocCode, Connection conn) throws ITMException
+{
+	 
+	 String itemCodeTemp = "";
+	 String lotNoTemp = "";
+	 String lotSlTemp = "";
+	 String locCodeTo = "";
+	 String saleOrder = "";
+	 PreparedStatement pstmt = null, pstmt1 = null;
+	 ResultSet rs = null, rs1 = null;
+	 
+	 try
+	 {
+	 	Set sordList = saleOrderWiseMap.keySet();
+		Iterator it = sordList.iterator();			
+		while(it.hasNext())
+		{			
+			String sorderKey = (String)it.next();			
+			ArrayList itemMapList = (ArrayList)saleOrderWiseMap.get(sorderKey);
+			saleOrder = sorderKey.substring(0,sorderKey.indexOf(":"));			
+			System.out.println(" saleOrder ["+saleOrder+"] invStat ["+invStat+"]");			
+			int itemMapListLen = itemMapList.size();				
+			for(int i =0;i<itemMapListLen;i++)
+			{					
+				HashMap loadMap = (HashMap)itemMapList.get(i);
+				if(itemCode.equalsIgnoreCase(loadMap.get("item_code").toString()) && lotNo.equalsIgnoreCase(loadMap.get("lot_no").toString()))
+				{					
+					itemCodeTemp = (String)loadMap.get("item_code");
+					lotNoTemp = (String)loadMap.get("lot_no");
+					lotSlTemp = (String)loadMap.get("lot_sl");
+					Map temp = new HashMap();
+					temp.put("item_code", itemCodeTemp);
+					temp.put("lot_no", lotNoTemp);
+					
+					sql = "SELECT LOC_CODE FROM STOCK WHERE ITEM_CODE = ? AND INV_STAT = ? AND LOT_NO = ? ";
+					pstmt= conn.prepareStatement(sql);
+					pstmt.setString(1, itemCode);
+					pstmt.setString(2,invStat);
+					pstmt.setString(3, lotNo);
+					rs = pstmt.executeQuery();
+					if(rs.next())
+					{
+						locCodeTo = rs.getString("LOC_CODE");
+						suggLocCode = locCodeTo;
+						temp.put("loc_code__to", locCodeTo);
+					}
+					else
+					{
+						sql = "SELECT PD.LOC_CODE FROM PICK_ORD_DET PD, PICK_ORD_HDR PH WHERE " +
+								" PH.PICK_ORDER  = PD.PICK_ORDER AND PH.PICK_TYPE = ? " +
+								" AND PD.ITEM_CODE = ? AND PD.LOT_NO = ?";
+						pstmt1 = conn.prepareStatement(sql);
+						pstmt1.setString(1, "A");
+						pstmt1.setString(2, itemCode);
+						pstmt1.setString(3, lotNo);
+						rs1 = pstmt1.executeQuery();
+						if( rs1.next())
+						{
+							locCodeTo = rs1.getString("LOC_CODE");							
+							suggLocCode = locCodeTo;
+							temp.put("loc_code__to", locCodeTo);
+						}
+						else
+						{
+						//loop for already suggested location for same item and lot no.
+							if(pickSaleOrderDetail.size() > 0)
+							{
+								Set lotSlKey = pickSaleOrderDetail.keySet();
+								Iterator is = lotSlKey.iterator();			
+								while(is.hasNext())
+								{
+									String lo = (String)is.next();
+									System.out.println(" key is ["+lo+"]");								
+									ArrayList lotSLLIST = (ArrayList) pickSaleOrderDetail.get(lo);
+									locCodeTo = "";
+									int temp1 = lotSLLIST.size();
+									boolean isSame = false;
+									for(int j = 0; j < temp1 ;j++)
+									{
+										HashMap loadMap2 = (HashMap)lotSLLIST.get(j);
+										if(itemCode.equalsIgnoreCase(loadMap2.get("item_code").toString()) && lotNo.equalsIgnoreCase(loadMap2.get("lot_no").toString()))
+										{
+											isSame = true;										
+											temp.put("loc_code__to", loadMap2.get("loc_code__to").toString());
+											break;
+										}
+									}								
+									if(!isSame)
+									{
+										temp.put("loc_code__to", suggLocCode);
+									}								
+								}
+							}
+							else
+							{
+								temp.put("loc_code__to", suggLocCode);
+							}
+						}
+						if(pstmt1 != null)
+						{
+							pstmt1.close();
+							pstmt1 = null;
+						}
+						if( rs1 != null )
+						{
+							rs1.close();
+							rs1 = null;
+						}
+					}
+					ArrayList tempList = new ArrayList();
+					tempList.add(temp);
+					pickSaleOrderDetail.put((""+(pickSaleOrderDetail.size()+1)), tempList);						
+					System.out.println(" populated pickSaleOrderDetail "+pickSaleOrderDetail);
+					
+					if(pstmt != null)
+					{
+						pstmt.close();
+						pstmt = null;
+					}
+					if( rs != null )
+					{
+						rs.close();
+						rs = null;
+					}
+				}					
+				
+			}
+			
+			if(pickSaleOrderDetail.size() == 1)
+			{
+				return suggLocCode;
+			}
+			else
+			{
+				Set lotSlKey = pickSaleOrderDetail.keySet();
+				Iterator is = lotSlKey.iterator();			
+				while(is.hasNext())
+				{
+					String lo = (String)is.next();
+					System.out.println(" key iss ["+lo+"]");
+					//ArrayList lotSLLIST = new ArrayList();
+					ArrayList lotSLLIST = (ArrayList) pickSaleOrderDetail.get(lo);
+					locCodeTo = "";
+					int temp = lotSLLIST.size();
+					for(int j = 0; j < temp ;j++)
+					{
+						HashMap loadMap2 = (HashMap)lotSLLIST.get(j);
+						if(itemCode.equalsIgnoreCase(loadMap2.get("item_code").toString()) && lotNo.equalsIgnoreCase(loadMap2.get("lot_no").toString()))
+						{								
+							locCodeTo  =  loadMap2.get("loc_code__to").toString();
+							System.out.println(" item_code ["+loadMap2.get("item_code").toString()+"] lotno ["+loadMap2.get("lot_no").toString()+"] locCodeTo["+locCodeTo+"]");
+							return locCodeTo;
+						}
+					}
+					
+				}					
+				if( locCodeTo.length() == 0)
+				{						
+					return locCodeTo = suggLocCode;
+				}
+			}			
+			
+		}	
+		
+	 }
+	 catch(Exception e)
+	 {
+		 e.printStackTrace();
+		 throw new ITMException(e);
+	 }	
+	 finally
+	 {
+		 try
+		 {
+		 	if(pstmt != null)
+			{
+				pstmt.close();
+				pstmt = null;
+			}
+		 	if(pstmt1 != null)
+			{
+				pstmt1.close();
+				pstmt1 = null;
+			}			
+			if( rs != null )
+			{
+				rs.close();
+				rs = null;
+			}
+			if( rs1 != null )
+			{
+				rs1.close();
+				rs1 = null;
+			}
+		 }
+		 catch(Exception es)
+		 {
+			 es.printStackTrace();
+			 throw new ITMException(es);
+		 }
+	 }
+	 return locCodeTo;
+}
+//Changed by sumit on 10/12/12 suggesting active location for same item code and lot No. end.	
 }
\ No newline at end of file

webitm-wms/module-resource/metadata/wavegen11.xml

@@ -39,7 +39,7 @@
 		<color>536870912</color>
 	</Footer>
 	<Detail>
-		<height>392</height>
+		<height>372</height>
 		<color>536870912</color>
 	</Detail>
 	<TableDefinition>
@@ -201,6 +201,36 @@
 				<item display="NO" data="N"/>
 			</values>
 		</table_column>
+		<table_column>
+			<type size="1">char</type>
+			<updatewhereclause>no</updatewhereclause>
+			<name>parcelpack_allow</name>
+			<dbname>parcelpack_allow</dbname>
+			<values>
+				<item display="YES" data="Y"/>
+				<item display="NO" data="N"/>
+			</values>
+		</table_column>
+		<table_column>
+			<type size="1">char</type>
+			<updatewhereclause>no</updatewhereclause>
+			<name>master_override</name>
+			<dbname>master_override</dbname>
+			<values>
+				<item display="YES" data="Y"/>
+				<item display="NO" data="N"/>
+			</values>
+		</table_column>
+		<table_column>
+			<type size="1">char</type>
+			<updatewhereclause>no</updatewhereclause>
+			<name>parcel_override</name>
+			<dbname>parcel_override</dbname>
+			<values>
+				<item display="YES" data="Y"/>
+				<item display="NO" data="N"/>
+			</values>
+		</table_column>
 	</TableDefinition>
 	<GroupBox>
 		<band>Detail</band>
@@ -209,7 +239,7 @@
 		<color>33554432</color>
 		<x>20</x>
 		<y>6</y>
-		<height>337</height>
+		<height>353</height>
 		<width>525</width>
 		<name>gb_1</name>
 		<visible>1</visible>
@@ -424,98 +454,6 @@
 			<color>16777215</color>
 		</background>
 	</ColumnObject>
-	<TextObject>
-		<band>Detail</band>
-		<alignment>1</alignment>
-		<text>Stock To Dock Allow:</text>
-		<border>0</border>
-		<color>33554432</color>
-		<x>317</x>
-		<y>255</y>
-		<height>16</height>
-		<width>120</width>
-		<html>
-			<valueishtml>0</valueishtml>
-		</html>
-		<name>stock_to_dock_allow_t</name>
-		<visible>1</visible>
-		<font>
-			<face>Times New Roman</face>
-			<height>-10</height>
-			<weight>400</weight>
-			<family>1</family>
-			<pitch>2</pitch>
-			<charset>0</charset>
-		</font>
-		<background>
-			<mode>1</mode>
-			<color>553648127</color>
-		</background>
-	</TextObject>
-	<TextObject>
-		<band>Detail</band>
-		<alignment>1</alignment>
-		<text>Master Pack Allow:</text>
-		<border>0</border>
-		<color>33554432</color>
-		<x>317</x>
-		<y>230</y>
-		<height>16</height>
-		<width>120</width>
-		<html>
-			<valueishtml>0</valueishtml>
-		</html>
-		<name>master_pack_allow_t</name>
-		<visible>1</visible>
-		<font>
-			<face>Times New Roman</face>
-			<height>-10</height>
-			<weight>400</weight>
-			<family>1</family>
-			<pitch>2</pitch>
-			<charset>0</charset>
-		</font>
-		<background>
-			<mode>1</mode>
-			<color>553648127</color>
-		</background>
-	</TextObject>
-	<ColumnObject>
-		<band>Detail</band>
-		<id>17</id>
-		<alignment>0</alignment>
-		<tabsequence>170</tabsequence>
-		<border>5</border>
-		<color>33554432</color>
-		<x>441</x>
-		<y>230</y>
-		<height>16</height>
-		<width>95</width>
-		<format>[general]</format>
-		<html>
-			<valueishtml>0</valueishtml>
-		</html>
-		<name>master_pack_allow</name>
-		<visible>1</visible>
-		<EditStyle style="ddlb">
-			<limit>0</limit>
-			<allowedit>no</allowedit>
-			<case>any</case>
-			<imemode>0</imemode>
-		</EditStyle>
-		<font>
-			<face>Times New Roman</face>
-			<height>-10</height>
-			<weight>400</weight>
-			<family>1</family>
-			<pitch>2</pitch>
-			<charset>0</charset>
-		</font>
-		<background>
-			<mode>2</mode>
-			<color>1073741824</color>
-		</background>
-	</ColumnObject>
 	<TextObject>
 		<band>Detail</band>
 		<alignment>1</alignment>
@@ -608,42 +546,6 @@
 			<color>536870912</color>
 		</background>
 	</TextObject>
-	<ColumnObject>
-		<band>Detail</band>
-		<id>15</id>
-		<alignment>0</alignment>
-		<tabsequence>150</tabsequence>
-		<border>5</border>
-		<color>33554432</color>
-		<x>441</x>
-		<y>205</y>
-		<height>16</height>
-		<width>95</width>
-		<format>[general]</format>
-		<html>
-			<valueishtml>0</valueishtml>
-		</html>
-		<name>wave_mode</name>
-		<visible>1</visible>
-		<EditStyle style="ddlb">
-			<limit>2</limit>
-			<allowedit>no</allowedit>
-			<case>upper</case>
-			<imemode>0</imemode>
-		</EditStyle>
-		<font>
-			<face>Times New Roman</face>
-			<height>-10</height>
-			<weight>400</weight>
-			<family>1</family>
-			<pitch>2</pitch>
-			<charset>0</charset>
-		</font>
-		<background>
-			<mode>2</mode>
-			<color>1073741824</color>
-		</background>
-	</ColumnObject>
 	<TextObject>
 		<band>Detail</band>
 		<alignment>1</alignment>
@@ -1320,20 +1222,20 @@
 	</TextObject>
 	<ColumnObject>
 		<band>Detail</band>
-		<id>19</id>
+		<id>16</id>
 		<alignment>0</alignment>
-		<tabsequence>190</tabsequence>
+		<tabsequence>160</tabsequence>
 		<border>5</border>
 		<color>33554432</color>
-		<x>441</x>
-		<y>255</y>
+		<x>174</x>
+		<y>230</y>
 		<height>16</height>
 		<width>95</width>
 		<format>[general]</format>
 		<html>
 			<valueishtml>0</valueishtml>
 		</html>
-		<name>stock_to_dock_allow</name>
+		<name>single_lot</name>
 		<visible>1</visible>
 		<EditStyle style="ddlb">
 			<limit>0</limit>
@@ -1356,20 +1258,20 @@
 	</ColumnObject>
 	<ColumnObject>
 		<band>Detail</band>
-		<id>16</id>
+		<id>18</id>
 		<alignment>0</alignment>
-		<tabsequence>160</tabsequence>
+		<tabsequence>180</tabsequence>
 		<border>5</border>
 		<color>33554432</color>
 		<x>174</x>
-		<y>230</y>
+		<y>255</y>
 		<height>16</height>
 		<width>95</width>
 		<format>[general]</format>
 		<html>
 			<valueishtml>0</valueishtml>
 		</html>
-		<name>single_lot</name>
+		<name>active_pick_allow</name>
 		<visible>1</visible>
 		<EditStyle style="ddlb">
 			<limit>0</limit>
@@ -1392,7 +1294,7 @@
 	</ColumnObject>
 	<ColumnObject>
 		<band>Detail</band>
-		<id>21</id>
+		<id>22</id>
 		<alignment>0</alignment>
 		<tabsequence>210</tabsequence>
 		<border>5</border>
@@ -1405,7 +1307,7 @@
 		<html>
 			<valueishtml>0</valueishtml>
 		</html>
-		<name>print_label</name>
+		<name>parcelpack_allow</name>
 		<visible>1</visible>
 		<EditStyle style="ddlb">
 			<limit>0</limit>
@@ -1454,27 +1356,83 @@
 			<color>553648127</color>
 		</background>
 	</TextObject>
+	<TextObject>
+		<band>Detail</band>
+		<alignment>1</alignment>
+		<text>Parcel Pack Allow:</text>
+		<border>0</border>
+		<color>33554432</color>
+		<x>65</x>
+		<y>279</y>
+		<height>16</height>
+		<width>104</width>
+		<html>
+			<valueishtml>0</valueishtml>
+		</html>
+		<name>parcelpack_allow_t</name>
+		<visible>1</visible>
+		<font>
+			<face>Times New Roman</face>
+			<height>-10</height>
+			<weight>400</weight>
+			<family>1</family>
+			<pitch>2</pitch>
+			<charset>0</charset>
+		</font>
+		<background>
+			<mode>1</mode>
+			<color>553648127</color>
+		</background>
+	</TextObject>
+	<TextObject>
+		<band>Detail</band>
+		<alignment>1</alignment>
+		<text>Print Label:</text>
+		<border>0</border>
+		<color>33554432</color>
+		<x>65</x>
+		<y>303</y>
+		<height>16</height>
+		<width>104</width>
+		<html>
+			<valueishtml>0</valueishtml>
+		</html>
+		<name>print_label_t</name>
+		<visible>1</visible>
+		<font>
+			<face>Times New Roman</face>
+			<height>-10</height>
+			<weight>400</weight>
+			<family>1</family>
+			<pitch>2</pitch>
+			<charset>0</charset>
+		</font>
+		<background>
+			<mode>1</mode>
+			<color>553648127</color>
+		</background>
+	</TextObject>
 	<ColumnObject>
 		<band>Detail</band>
-		<id>18</id>
+		<id>21</id>
 		<alignment>0</alignment>
-		<tabsequence>180</tabsequence>
+		<tabsequence>200</tabsequence>
 		<border>5</border>
 		<color>33554432</color>
 		<x>174</x>
-		<y>255</y>
+		<y>303</y>
 		<height>16</height>
 		<width>95</width>
 		<format>[general]</format>
 		<html>
 			<valueishtml>0</valueishtml>
 		</html>
-		<name>active_pick_allow</name>
+		<name>print_label</name>
 		<visible>1</visible>
 		<EditStyle style="ddlb">
 			<limit>0</limit>
 			<allowedit>no</allowedit>
-			<case>any</case>
+			<case>upper</case>
 			<imemode>0</imemode>
 		</EditStyle>
 		<font>
@@ -1490,15 +1448,43 @@
 			<color>1073741824</color>
 		</background>
 	</ColumnObject>
+	<TextObject>
+		<band>Detail</band>
+		<alignment>1</alignment>
+		<text>Printer For Label:</text>
+		<border>0</border>
+		<color>33554432</color>
+		<x>65</x>
+		<y>327</y>
+		<height>16</height>
+		<width>104</width>
+		<html>
+			<valueishtml>0</valueishtml>
+		</html>
+		<name>printer_name_t</name>
+		<visible>1</visible>
+		<font>
+			<face>Times New Roman</face>
+			<height>-10</height>
+			<weight>400</weight>
+			<family>1</family>
+			<pitch>2</pitch>
+			<charset>0</charset>
+		</font>
+		<background>
+			<mode>1</mode>
+			<color>553648127</color>
+		</background>
+	</TextObject>
 	<ColumnObject>
 		<band>Detail</band>
 		<id>20</id>
 		<alignment>0</alignment>
-		<tabsequence>200</tabsequence>
+		<tabsequence>220</tabsequence>
 		<border>5</border>
 		<color>33554432</color>
 		<x>174</x>
-		<y>305</y>
+		<y>327</y>
 		<height>16</height>
 		<width>362</width>
 		<format>[general]</format>
@@ -1526,20 +1512,56 @@
 			<color>1073741824</color>
 		</background>
 	</ColumnObject>
+	<ColumnObject>
+		<band>Detail</band>
+		<id>15</id>
+		<alignment>0</alignment>
+		<tabsequence>150</tabsequence>
+		<border>5</border>
+		<color>33554432</color>
+		<x>441</x>
+		<y>205</y>
+		<height>16</height>
+		<width>95</width>
+		<format>[general]</format>
+		<html>
+			<valueishtml>0</valueishtml>
+		</html>
+		<name>wave_mode</name>
+		<visible>1</visible>
+		<EditStyle style="ddlb">
+			<limit>2</limit>
+			<allowedit>no</allowedit>
+			<case>upper</case>
+			<imemode>0</imemode>
+		</EditStyle>
+		<font>
+			<face>Times New Roman</face>
+			<height>-10</height>
+			<weight>400</weight>
+			<family>1</family>
+			<pitch>2</pitch>
+			<charset>0</charset>
+		</font>
+		<background>
+			<mode>2</mode>
+			<color>1073741824</color>
+		</background>
+	</ColumnObject>
 	<TextObject>
 		<band>Detail</band>
 		<alignment>1</alignment>
-		<text>Printer For Label:</text>
+		<text>Master Pack Allow:</text>
 		<border>0</border>
 		<color>33554432</color>
-		<x>65</x>
-		<y>305</y>
+		<x>317</x>
+		<y>230</y>
 		<height>16</height>
-		<width>104</width>
+		<width>120</width>
 		<html>
 			<valueishtml>0</valueishtml>
 		</html>
-		<name>printer_name_t</name>
+		<name>master_pack_allow_t</name>
 		<visible>1</visible>
 		<font>
 			<face>Times New Roman</face>
@@ -1557,17 +1579,45 @@
 	<TextObject>
 		<band>Detail</band>
 		<alignment>1</alignment>
-		<text>Print Label:</text>
+		<text>Stock To Dock Allow:</text>
 		<border>0</border>
 		<color>33554432</color>
-		<x>65</x>
+		<x>317</x>
+		<y>255</y>
+		<height>16</height>
+		<width>120</width>
+		<html>
+			<valueishtml>0</valueishtml>
+		</html>
+		<name>stock_to_dock_allow_t</name>
+		<visible>1</visible>
+		<font>
+			<face>Times New Roman</face>
+			<height>-10</height>
+			<weight>400</weight>
+			<family>1</family>
+			<pitch>2</pitch>
+			<charset>0</charset>
+		</font>
+		<background>
+			<mode>1</mode>
+			<color>553648127</color>
+		</background>
+	</TextObject>
+	<TextObject>
+		<band>Detail</band>
+		<alignment>1</alignment>
+		<text>Master Override:</text>
+		<border>0</border>
+		<color>33554432</color>
+		<x>317</x>
 		<y>280</y>
 		<height>16</height>
-		<width>104</width>
+		<width>120</width>
 		<html>
 			<valueishtml>0</valueishtml>
 		</html>
-		<name>print_label_t</name>
+		<name>master_override_t</name>
 		<visible>1</visible>
 		<font>
 			<face>Times New Roman</face>
@@ -1582,6 +1632,176 @@
 			<color>553648127</color>
 		</background>
 	</TextObject>
+	<TextObject>
+		<band>Detail</band>
+		<alignment>1</alignment>
+		<text>Parcel Override:</text>
+		<border>0</border>
+		<color>33554432</color>
+		<x>317</x>
+		<y>305</y>
+		<height>16</height>
+		<width>120</width>
+		<html>
+			<valueishtml>0</valueishtml>
+		</html>
+		<name>t_2</name>
+		<visible>1</visible>
+		<font>
+			<face>Times New Roman</face>
+			<height>-10</height>
+			<weight>400</weight>
+			<family>1</family>
+			<pitch>2</pitch>
+			<charset>0</charset>
+		</font>
+		<background>
+			<mode>1</mode>
+			<color>553648127</color>
+		</background>
+	</TextObject>
+	<ColumnObject>
+		<band>Detail</band>
+		<id>17</id>
+		<alignment>0</alignment>
+		<tabsequence>170</tabsequence>
+		<border>5</border>
+		<color>33554432</color>
+		<x>441</x>
+		<y>230</y>
+		<height>16</height>
+		<width>95</width>
+		<format>[general]</format>
+		<html>
+			<valueishtml>0</valueishtml>
+		</html>
+		<name>master_pack_allow</name>
+		<visible>1</visible>
+		<EditStyle style="ddlb">
+			<limit>0</limit>
+			<allowedit>no</allowedit>
+			<case>any</case>
+			<imemode>0</imemode>
+		</EditStyle>
+		<font>
+			<face>Times New Roman</face>
+			<height>-10</height>
+			<weight>400</weight>
+			<family>1</family>
+			<pitch>2</pitch>
+			<charset>0</charset>
+		</font>
+		<background>
+			<mode>2</mode>
+			<color>1073741824</color>
+		</background>
+	</ColumnObject>
+	<ColumnObject>
+		<band>Detail</band>
+		<id>19</id>
+		<alignment>0</alignment>
+		<tabsequence>190</tabsequence>
+		<border>5</border>
+		<color>33554432</color>
+		<x>441</x>
+		<y>255</y>
+		<height>16</height>
+		<width>95</width>
+		<format>[general]</format>
+		<html>
+			<valueishtml>0</valueishtml>
+		</html>
+		<name>stock_to_dock_allow</name>
+		<visible>1</visible>
+		<EditStyle style="ddlb">
+			<limit>0</limit>
+			<allowedit>no</allowedit>
+			<case>any</case>
+			<imemode>0</imemode>
+		</EditStyle>
+		<font>
+			<face>Times New Roman</face>
+			<height>-10</height>
+			<weight>400</weight>
+			<family>1</family>
+			<pitch>2</pitch>
+			<charset>0</charset>
+		</font>
+		<background>
+			<mode>2</mode>
+			<color>1073741824</color>
+		</background>
+	</ColumnObject>
+	<ColumnObject>
+		<band>Detail</band>
+		<id>23</id>
+		<alignment>0</alignment>
+		<tabsequence>230</tabsequence>
+		<border>5</border>
+		<color>33554432</color>
+		<x>441</x>
+		<y>280</y>
+		<height>16</height>
+		<width>95</width>
+		<html>
+			<valueishtml>0</valueishtml>
+		</html>
+		<name>master_override</name>
+		<visible>1</visible>
+		<EditStyle style="ddlb">
+			<limit>0</limit>
+			<allowedit>no</allowedit>
+			<case>upper</case>
+			<imemode>0</imemode>
+		</EditStyle>
+		<font>
+			<face>Times New Roman</face>
+			<height>-10</height>
+			<weight>400</weight>
+			<family>1</family>
+			<pitch>2</pitch>
+			<charset>0</charset>
+		</font>
+		<background>
+			<mode>2</mode>
+			<color>1073741824</color>
+		</background>
+	</ColumnObject>
+	<ColumnObject>
+		<band>Detail</band>
+		<id>24</id>
+		<alignment>0</alignment>
+		<tabsequence>240</tabsequence>
+		<border>5</border>
+		<color>33554432</color>
+		<x>441</x>
+		<y>305</y>
+		<height>16</height>
+		<width>95</width>
+		<html>
+			<valueishtml>0</valueishtml>
+		</html>
+		<name>parcel_override</name>
+		<visible>1</visible>
+		<EditStyle style="ddlb">
+			<limit>0</limit>
+			<allowedit>no</allowedit>
+			<case>upper</case>
+			<imemode>0</imemode>
+		</EditStyle>
+		<font>
+			<face>Times New Roman</face>
+			<height>-10</height>
+			<weight>400</weight>
+			<family>1</family>
+			<pitch>2</pitch>
+			<charset>0</charset>
+		</font>
+		<background>
+			<mode>2</mode>
+			<color>1073741824</color>
+		</background>
+	</ColumnObject>
 	<HtmlTable>
 		<border>1</border>
 	</HtmlTable>

webitm-wms/module-resource/metadata/wavegen12.xml

@@ -44,7 +44,7 @@
 		<color>536870912</color>
 	</Footer>
 	<Detail>
-		<height>24</height>
+		<height>18</height>
 		<color>536870912</color>
 	</Detail>
 	<TableDefinition>
@@ -117,6 +117,12 @@
 			<name>stock_to_dock_allow</name>
 			<dbname>wave_type.stock_to_dock_allow</dbname>
 		</table_column>
+		<table_column>
+			<type size="1">char</type>
+			<updatewhereclause>yes</updatewhereclause>
+			<name>parcelpack_allow</name>
+			<dbname>wave_type.parcelpack_allow</dbname>
+		</table_column>
 		<table_column>
 			<type precision="3">decimal</type>
 			<updatewhereclause>yes</updatewhereclause>
@@ -220,7 +226,7 @@
 			<name>last_col</name>
 			<dbname>last_col</dbname>
 		</table_column>
-		<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;sorddet&quot; )  TABLE(NAME=&quot;customer&quot; )  TABLE(NAME=&quot;item&quot; )  TABLE(NAME=&quot;sorder&quot; )  TABLE(NAME=&quot;sorditem&quot; )  TABLE(NAME=&quot;wave_type&quot; ) COLUMN(NAME=&quot;sorder.cust_code&quot;) COLUMN(NAME=&quot;customer.cust_name&quot;) COLUMN(NAME=&quot;sorddet.line_no&quot;) COLUMN(NAME=&quot;sorder.sale_order&quot;) COLUMN(NAME=&quot;sorder.due_date&quot;) COLUMN(NAME=&quot;sorditem.item_code&quot;) COLUMN(NAME=&quot;item.descr&quot;) COLUMN(NAME=&quot;customer.single_lot&quot;) COLUMN(NAME=&quot;wave_type.master_pack_allow&quot;) COLUMN(NAME=&quot;wave_type.active_pick_allow&quot;) COLUMN(NAME=&quot;wave_type.stock_to_dock_allow&quot;) COLUMN(NAME=&quot;sorditem.quantity&quot;) COLUMN(NAME=&quot;sorder.part_qty&quot;) COMPUTE(NAME=&quot;SORDITEM.QUANTITY-SORDITEM.QTY_DESP  PENDING_QUANTITY&quot;) COMPUTE(NAME=&quot;0 stock_quantity&quot;) COLUMN(NAME=&quot;sorditem.qty_alloc&quot;) COMPUTE(NAME=&quot;&apos;&apos; hold_qty&quot;) COMPUTE(NAME=&quot;0 bal_qty&quot;) COMPUTE(NAME=&quot;&apos; &apos; manual_allocqty&quot;) COLUMN(NAME=&quot;sorder.alloc_flag&quot;) COMPUTE(NAME=&quot;&apos; &apos; tran_code&quot;) COMPUTE(NAME=&quot;&apos; &apos; tran_name&quot;) COMPUTE(NAME=&quot;&apos; &apos; lock_code__dock&quot;) COLUMN(NAME=&quot;sorddet.pack_instr&quot;) COLUMN(NAME=&quot;sorddet.site_code&quot;) COLUMN(NAME=&quot;sorditem.exp_lev&quot;) COMPUTE(NAME=&quot;&apos;&apos; part_qty_real&quot;) COMPUTE(NAME=&quot;&apos;          &apos;  LAST_COL&quot;)    JOIN (LEFT=&quot;customer.wave_type&quot;    OP =&quot;=&quot;RIGHT=&quot;wave_type.wave_type&quot;    OUTER1 =&quot;customer.wave_type&quot; )    JOIN (LEFT=&quot;sorddet.sale_order&quot;    OP =&quot;=&quot;RIGHT=&quot;sorder.sale_order&quot; )    JOIN (LEFT=&quot;sorder.sale_order&quot;    OP =&quot;=&quot;RIGHT=&quot;sorditem.sale_order&quot; )    JOIN (LEFT=&quot;sorddet.line_no&quot;    OP =&quot;=&quot;RIGHT=&quot;sorditem.line_no&quot; )    JOIN (LEFT=&quot;sorditem.item_code__ord&quot;    OP =&quot;=&quot;RIGHT=&quot;item.item_code&quot; )    JOIN (LEFT=&quot;sorder.cust_code&quot;    OP =&quot;=&quot;RIGHT=&quot;customer.cust_code&quot; )    JOIN (LEFT=&quot;sorddet.site_code&quot;    OP =&quot;=&quot;RIGHT=&quot;sorditem.site_code&quot; )) </retrieve>
+		<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;sorddet&quot; )  TABLE(NAME=&quot;customer&quot; )  TABLE(NAME=&quot;item&quot; )  TABLE(NAME=&quot;sorder&quot; )  TABLE(NAME=&quot;sorditem&quot; )  TABLE(NAME=&quot;wave_type&quot; ) COLUMN(NAME=&quot;sorder.cust_code&quot;) COLUMN(NAME=&quot;customer.cust_name&quot;) COLUMN(NAME=&quot;sorddet.line_no&quot;) COLUMN(NAME=&quot;sorder.sale_order&quot;) COLUMN(NAME=&quot;sorder.due_date&quot;) COLUMN(NAME=&quot;sorditem.item_code&quot;) COLUMN(NAME=&quot;item.descr&quot;) COLUMN(NAME=&quot;customer.single_lot&quot;) COLUMN(NAME=&quot;wave_type.master_pack_allow&quot;) COLUMN(NAME=&quot;wave_type.active_pick_allow&quot;) COLUMN(NAME=&quot;wave_type.stock_to_dock_allow&quot;) COLUMN(NAME=&quot;wave_type.parcelpack_allow&quot;) COLUMN(NAME=&quot;sorditem.quantity&quot;) COLUMN(NAME=&quot;sorder.part_qty&quot;) COMPUTE(NAME=&quot;SORDITEM.QUANTITY-SORDITEM.QTY_DESP  PENDING_QUANTITY&quot;) COMPUTE(NAME=&quot;0 stock_quantity&quot;) COLUMN(NAME=&quot;sorditem.qty_alloc&quot;) COMPUTE(NAME=&quot;&apos;&apos; hold_qty&quot;) COMPUTE(NAME=&quot;0 bal_qty&quot;) COMPUTE(NAME=&quot;&apos; &apos; manual_allocqty&quot;) COLUMN(NAME=&quot;sorder.alloc_flag&quot;) COMPUTE(NAME=&quot;&apos; &apos; tran_code&quot;) COMPUTE(NAME=&quot;&apos; &apos; tran_name&quot;) COMPUTE(NAME=&quot;&apos; &apos; lock_code__dock&quot;) COLUMN(NAME=&quot;sorddet.pack_instr&quot;) COLUMN(NAME=&quot;sorddet.site_code&quot;) COLUMN(NAME=&quot;sorditem.exp_lev&quot;) COMPUTE(NAME=&quot;&apos;&apos; part_qty_real&quot;) COMPUTE(NAME=&quot;&apos;          &apos;  LAST_COL&quot;)    JOIN (LEFT=&quot;customer.wave_type&quot;    OP =&quot;=&quot;RIGHT=&quot;wave_type.wave_type&quot;    OUTER1 =&quot;customer.wave_type&quot; )    JOIN (LEFT=&quot;sorddet.sale_order&quot;    OP =&quot;=&quot;RIGHT=&quot;sorder.sale_order&quot; )    JOIN (LEFT=&quot;sorder.sale_order&quot;    OP =&quot;=&quot;RIGHT=&quot;sorditem.sale_order&quot; )    JOIN (LEFT=&quot;sorddet.line_no&quot;    OP =&quot;=&quot;RIGHT=&quot;sorditem.line_no&quot; )    JOIN (LEFT=&quot;sorditem.item_code__ord&quot;    OP =&quot;=&quot;RIGHT=&quot;item.item_code&quot; )    JOIN (LEFT=&quot;sorder.cust_code&quot;    OP =&quot;=&quot;RIGHT=&quot;customer.cust_code&quot; )    JOIN (LEFT=&quot;sorddet.site_code&quot;    OP =&quot;=&quot;RIGHT=&quot;sorditem.site_code&quot; )) </retrieve>
 	</TableDefinition>
 	<TextObject>
 		<band>Header</band>
@@ -533,23 +539,23 @@
 	<TextObject>
 		<band>Header</band>
 		<alignment>0</alignment>
-		<text>Dock Location</text>
+		<text>Parce Pack Allow</text>
 		<border>6</border>
 		<color>33554432</color>
-		<x>1905</x>
+		<x>953</x>
 		<y>2</y>
 		<height>16</height>
-		<width>84</width>
+		<width>98</width>
 		<html>
 			<valueishtml>0</valueishtml>
 		</html>
-		<name>lock_code__dock_t</name>
+		<name>parcelpack_allow_t</name>
 		<visible>1</visible>
 		<font>
-			<face>Arial</face>
+			<face>Times New Roman</face>
 			<height>-10</height>
 			<weight>400</weight>
-			<family>2</family>
+			<family>1</family>
 			<pitch>2</pitch>
 			<charset>0</charset>
 		</font>
@@ -564,7 +570,7 @@
 		<text>Quantity</text>
 		<border>6</border>
 		<color>33554432</color>
-		<x>953</x>
+		<x>1053</x>
 		<y>2</y>
 		<height>16</height>
 		<width>69</width>
@@ -586,13 +592,41 @@
 			<color>67108864</color>
 		</background>
 	</TextObject>
+	<TextObject>
+		<band>Header</band>
+		<alignment>0</alignment>
+		<text>Dock Location</text>
+		<border>6</border>
+		<color>33554432</color>
+		<x>2005</x>
+		<y>2</y>
+		<height>16</height>
+		<width>84</width>
+		<html>
+			<valueishtml>0</valueishtml>
+		</html>
+		<name>lock_code__dock_t</name>
+		<visible>1</visible>
+		<font>
+			<face>Arial</face>
+			<height>-10</height>
+			<weight>400</weight>
+			<family>2</family>
+			<pitch>2</pitch>
+			<charset>0</charset>
+		</font>
+		<background>
+			<mode>2</mode>
+			<color>67108864</color>
+		</background>
+	</TextObject>
 	<TextObject>
 		<band>Header</band>
 		<alignment>1</alignment>
 		<text>Part Quantity</text>
 		<border>6</border>
 		<color>33554432</color>
-		<x>1024</x>
+		<x>1124</x>
 		<y>2</y>
 		<height>16</height>
 		<width>89</width>
@@ -620,7 +654,7 @@
 		<text>Pending Qty</text>
 		<border>6</border>
 		<color>33554432</color>
-		<x>1115</x>
+		<x>1215</x>
 		<y>2</y>
 		<height>16</height>
 		<width>83</width>
@@ -648,7 +682,7 @@
 		<text>Stock Qty</text>
 		<border>6</border>
 		<color>33554432</color>
-		<x>1200</x>
+		<x>1300</x>
 		<y>2</y>
 		<height>16</height>
 		<width>64</width>
@@ -676,7 +710,7 @@
 		<text>Hold Qty</text>
 		<border>6</border>
 		<color>33554432</color>
-		<x>1266</x>
+		<x>1366</x>
 		<y>2</y>
 		<height>16</height>
 		<width>66</width>
@@ -704,7 +738,7 @@
 		<text>Qty Alloc</text>
 		<border>6</border>
 		<color>33554432</color>
-		<x>1334</x>
+		<x>1434</x>
 		<y>2</y>
 		<height>16</height>
 		<width>65</width>
@@ -732,7 +766,7 @@
 		<text>Bal Qty</text>
 		<border>6</border>
 		<color>33554432</color>
-		<x>1401</x>
+		<x>1501</x>
 		<y>2</y>
 		<height>16</height>
 		<width>65</width>
@@ -760,7 +794,7 @@
 		<text>Alloc Flag</text>
 		<border>6</border>
 		<color>33554432</color>
-		<x>1570</x>
+		<x>1670</x>
 		<y>2</y>
 		<height>16</height>
 		<width>70</width>
@@ -788,7 +822,7 @@
 		<text>Transporter Code</text>
 		<border>6</border>
 		<color>33554432</color>
-		<x>1642</x>
+		<x>1742</x>
 		<y>2</y>
 		<height>16</height>
 		<width>112</width>
@@ -816,7 +850,7 @@
 		<text>Transporter Name</text>
 		<border>6</border>
 		<color>33554432</color>
-		<x>1756</x>
+		<x>1856</x>
 		<y>2</y>
 		<height>16</height>
 		<width>147</width>
@@ -844,7 +878,7 @@
 		<text>Packing Instruction</text>
 		<border>6</border>
 		<color>33554432</color>
-		<x>1991</x>
+		<x>2091</x>
 		<y>2</y>
 		<height>16</height>
 		<width>108</width>
@@ -868,18 +902,18 @@
 	</TextObject>
 	<TextObject>
 		<band>Header</band>
-		<alignment>2</alignment>
-		<text>Site Code</text>
+		<alignment>0</alignment>
+		<text>Manual Alloc Qty</text>
 		<border>6</border>
 		<color>33554432</color>
-		<x>2101</x>
+		<x>1568</x>
 		<y>2</y>
 		<height>16</height>
-		<width>67</width>
+		<width>100</width>
 		<html>
 			<valueishtml>0</valueishtml>
 		</html>
-		<name>site_code_t</name>
+		<name>manual_allocqty_t</name>
 		<visible>1</visible>
 		<font>
 			<face>Times New Roman</face>
@@ -896,18 +930,18 @@
 	</TextObject>
 	<TextObject>
 		<band>Header</band>
-		<alignment>0</alignment>
-		<text>Exp Lev</text>
+		<alignment>2</alignment>
+		<text>Site Code</text>
 		<border>6</border>
 		<color>33554432</color>
-		<x>2170</x>
+		<x>2201</x>
 		<y>2</y>
 		<height>16</height>
-		<width>62</width>
+		<width>67</width>
 		<html>
 			<valueishtml>0</valueishtml>
 		</html>
-		<name>exp_lev_t</name>
+		<name>site_code_t</name>
 		<visible>1</visible>
 		<font>
 			<face>Times New Roman</face>
@@ -925,17 +959,17 @@
 	<TextObject>
 		<band>Header</band>
 		<alignment>0</alignment>
-		<text>Manual Alloc Qty</text>
+		<text>Exp Lev</text>
 		<border>6</border>
 		<color>33554432</color>
-		<x>1468</x>
+		<x>2270</x>
 		<y>2</y>
 		<height>16</height>
-		<width>100</width>
+		<width>62</width>
 		<html>
 			<valueishtml>0</valueishtml>
 		</html>
-		<name>manual_allocqty_t</name>
+		<name>exp_lev_t</name>
 		<visible>1</visible>
 		<font>
 			<face>Times New Roman</face>
@@ -1362,20 +1396,20 @@
 	</ColumnObject>
 	<ColumnObject>
 		<band>Detail</band>
-		<id>23</id>
+		<id>12</id>
 		<alignment>0</alignment>
-		<tabsequence>32766</tabsequence>
+		<tabsequence>50</tabsequence>
 		<border>0</border>
 		<color>33554432</color>
-		<x>1905</x>
+		<x>953</x>
 		<y>2</y>
-		<height>16</height>
-		<width>84</width>
+		<height>15</height>
+		<width>98</width>
 		<format>[general]</format>
 		<html>
 			<valueishtml>0</valueishtml>
 		</html>
-		<name>lock_code__dock</name>
+		<name>parcelpack_allow</name>
 		<visible>1</visible>
 		<EditStyle style="edit">
 			<limit>0</limit>
@@ -1398,12 +1432,12 @@
 	</ColumnObject>
 	<ColumnObject>
 		<band>Detail</band>
-		<id>12</id>
+		<id>13</id>
 		<alignment>1</alignment>
 		<tabsequence>32766</tabsequence>
 		<border>0</border>
 		<color>33554432</color>
-		<x>953</x>
+		<x>1053</x>
 		<y>2</y>
 		<height>15</height>
 		<width>69</width>
@@ -1436,12 +1470,48 @@
 	</ColumnObject>
 	<ColumnObject>
 		<band>Detail</band>
-		<id>16</id>
+		<id>24</id>
+		<alignment>0</alignment>
+		<tabsequence>32766</tabsequence>
+		<border>0</border>
+		<color>33554432</color>
+		<x>2005</x>
+		<y>2</y>
+		<height>16</height>
+		<width>84</width>
+		<format>[general]</format>
+		<html>
+			<valueishtml>0</valueishtml>
+		</html>
+		<name>lock_code__dock</name>
+		<visible>1</visible>
+		<EditStyle style="edit">
+			<limit>0</limit>
+			<case>any</case>
+			<autoselect>yes</autoselect>
+			<imemode>0</imemode>
+		</EditStyle>
+		<font>
+			<face>Arial</face>
+			<height>-10</height>
+			<weight>400</weight>
+			<family>2</family>
+			<pitch>2</pitch>
+			<charset>0</charset>
+		</font>
+		<background>
+			<mode>2</mode>
+			<color>16777215</color>
+		</background>
+	</ColumnObject>
+	<ColumnObject>
+		<band>Detail</band>
+		<id>17</id>
 		<alignment>1</alignment>
-		<tabsequence>50</tabsequence>
+		<tabsequence>60</tabsequence>
 		<border>0</border>
 		<color>33554432</color>
-		<x>1334</x>
+		<x>1434</x>
 		<y>2</y>
 		<height>15</height>
 		<width>65</width>
@@ -1474,12 +1544,12 @@
 	</ColumnObject>
 	<ColumnObject>
 		<band>Detail</band>
-		<id>17</id>
+		<id>18</id>
 		<alignment>1</alignment>
 		<tabsequence>32766</tabsequence>
 		<border>0</border>
 		<color>33554432</color>
-		<x>1266</x>
+		<x>1366</x>
 		<y>2</y>
 		<height>16</height>
 		<width>66</width>
@@ -1510,12 +1580,12 @@
 	</ColumnObject>
 	<ColumnObject>
 		<band>Detail</band>
-		<id>13</id>
+		<id>14</id>
 		<alignment>0</alignment>
 		<tabsequence>32766</tabsequence>
 		<border>0</border>
 		<color>33554432</color>
-		<x>1024</x>
+		<x>1124</x>
 		<y>2</y>
 		<height>16</height>
 		<width>89</width>
@@ -1546,12 +1616,12 @@
 	</ColumnObject>
 	<ColumnObject>
 		<band>Detail</band>
-		<id>14</id>
+		<id>15</id>
 		<alignment>1</alignment>
 		<tabsequence>32766</tabsequence>
 		<border>0</border>
 		<color>33554432</color>
-		<x>1115</x>
+		<x>1215</x>
 		<y>2</y>
 		<height>15</height>
 		<width>83</width>
@@ -1584,12 +1654,12 @@
 	</ColumnObject>
 	<ColumnObject>
 		<band>Detail</band>
-		<id>15</id>
+		<id>16</id>
 		<alignment>1</alignment>
 		<tabsequence>32766</tabsequence>
 		<border>0</border>
 		<color>33554432</color>
-		<x>1200</x>
+		<x>1300</x>
 		<y>2</y>
 		<height>15</height>
 		<width>64</width>
@@ -1621,12 +1691,12 @@
 	</ColumnObject>
 	<ColumnObject>
 		<band>Detail</band>
-		<id>18</id>
+		<id>19</id>
 		<alignment>1</alignment>
 		<tabsequence>32766</tabsequence>
 		<border>0</border>
 		<color>33554432</color>
-		<x>1401</x>
+		<x>1501</x>
 		<y>2</y>
 		<height>16</height>
 		<width>65</width>
@@ -1657,12 +1727,12 @@
 	</ColumnObject>
 	<ColumnObject>
 		<band>Detail</band>
-		<id>20</id>
+		<id>21</id>
 		<alignment>0</alignment>
 		<tabsequence>32766</tabsequence>
 		<border>0</border>
 		<color>33554432</color>
-		<x>1570</x>
+		<x>1670</x>
 		<y>2</y>
 		<height>16</height>
 		<width>70</width>
@@ -1693,12 +1763,12 @@
 	</ColumnObject>
 	<ColumnObject>
 		<band>Detail</band>
-		<id>21</id>
+		<id>22</id>
 		<alignment>0</alignment>
 		<tabsequence>32766</tabsequence>
 		<border>0</border>
 		<color>33554432</color>
-		<x>1642</x>
+		<x>1742</x>
 		<y>2</y>
 		<height>16</height>
 		<width>112</width>
@@ -1729,12 +1799,12 @@
 	</ColumnObject>
 	<ColumnObject>
 		<band>Detail</band>
-		<id>22</id>
+		<id>23</id>
 		<alignment>0</alignment>
 		<tabsequence>32766</tabsequence>
 		<border>0</border>
 		<color>33554432</color>
-		<x>1756</x>
+		<x>1856</x>
 		<y>2</y>
 		<height>16</height>
 		<width>147</width>
@@ -1765,34 +1835,32 @@
 	</ColumnObject>
 	<ColumnObject>
 		<band>Detail</band>
-		<id>24</id>
+		<id>20</id>
 		<alignment>0</alignment>
 		<tabsequence>32766</tabsequence>
 		<border>0</border>
 		<color>33554432</color>
-		<x>1991</x>
-		<y>2</y>
-		<height>15</height>
-		<width>108</width>
+		<x>1568</x>
+		<y>1</y>
+		<height>16</height>
+		<width>100</width>
 		<format>[general]</format>
 		<html>
 			<valueishtml>0</valueishtml>
 		</html>
-		<name>pack_instr</name>
+		<name>manual_allocqty</name>
 		<visible>1</visible>
 		<EditStyle style="edit">
-			<limit>120</limit>
+			<limit>0</limit>
 			<case>any</case>
-			<focusrectangle>no</focusrectangle>
 			<autoselect>yes</autoselect>
-			<autohscroll>yes</autohscroll>
 			<imemode>0</imemode>
 		</EditStyle>
 		<font>
-			<face>Arial</face>
+			<face>Times New Roman</face>
 			<height>-10</height>
 			<weight>400</weight>
-			<family>2</family>
+			<family>1</family>
 			<pitch>2</pitch>
 			<charset>0</charset>
 		</font>
@@ -1808,18 +1876,18 @@
 		<tabsequence>32766</tabsequence>
 		<border>0</border>
 		<color>33554432</color>
-		<x>2101</x>
+		<x>2091</x>
 		<y>2</y>
 		<height>15</height>
-		<width>67</width>
+		<width>108</width>
 		<format>[general]</format>
 		<html>
 			<valueishtml>0</valueishtml>
 		</html>
-		<name>site_code</name>
+		<name>pack_instr</name>
 		<visible>1</visible>
 		<EditStyle style="edit">
-			<limit>5</limit>
+			<limit>120</limit>
 			<case>any</case>
 			<focusrectangle>no</focusrectangle>
 			<autoselect>yes</autoselect>
@@ -1846,25 +1914,26 @@
 		<tabsequence>32766</tabsequence>
 		<border>0</border>
 		<color>33554432</color>
-		<x>2170</x>
+		<x>2201</x>
 		<y>2</y>
 		<height>15</height>
-		<width>62</width>
+		<width>67</width>
 		<format>[general]</format>
 		<html>
 			<valueishtml>0</valueishtml>
 		</html>
-		<name>exp_lev</name>
+		<name>site_code</name>
 		<visible>1</visible>
 		<EditStyle style="edit">
-			<limit>0</limit>
+			<limit>5</limit>
 			<case>any</case>
 			<focusrectangle>no</focusrectangle>
-			<autoselect>no</autoselect>
+			<autoselect>yes</autoselect>
+			<autohscroll>yes</autohscroll>
 			<imemode>0</imemode>
 		</EditStyle>
 		<font>
-			<face>Times New Roman</face>
+			<face>Arial</face>
 			<height>-10</height>
 			<weight>400</weight>
 			<family>2</family>
@@ -1878,20 +1947,20 @@
 	</ColumnObject>
 	<ColumnObject>
 		<band>Detail</band>
-		<id>28</id>
+		<id>27</id>
 		<alignment>0</alignment>
 		<tabsequence>32766</tabsequence>
 		<border>0</border>
 		<color>33554432</color>
-		<x>2234</x>
+		<x>2270</x>
 		<y>2</y>
-		<height>18</height>
-		<width>1</width>
+		<height>15</height>
+		<width>62</width>
 		<format>[general]</format>
 		<html>
 			<valueishtml>0</valueishtml>
 		</html>
-		<name>last_col</name>
+		<name>exp_lev</name>
 		<visible>1</visible>
 		<EditStyle style="edit">
 			<limit>0</limit>
@@ -1915,25 +1984,26 @@
 	</ColumnObject>
 	<ColumnObject>
 		<band>Detail</band>
-		<id>27</id>
-		<alignment>1</alignment>
+		<id>29</id>
+		<alignment>0</alignment>
 		<tabsequence>32766</tabsequence>
 		<border>0</border>
 		<color>33554432</color>
-		<x>2237</x>
+		<x>2334</x>
 		<y>2</y>
-		<height>16</height>
+		<height>15</height>
 		<width>1</width>
 		<format>[general]</format>
 		<html>
 			<valueishtml>0</valueishtml>
 		</html>
-		<name>part_qty_real</name>
-		<visible>0</visible>
+		<name>last_col</name>
+		<visible>1</visible>
 		<EditStyle style="edit">
 			<limit>0</limit>
 			<case>any</case>
-			<autoselect>yes</autoselect>
+			<focusrectangle>no</focusrectangle>
+			<autoselect>no</autoselect>
 			<imemode>0</imemode>
 		</EditStyle>
 		<font>
@@ -1951,21 +2021,21 @@
 	</ColumnObject>
 	<ColumnObject>
 		<band>Detail</band>
-		<id>19</id>
-		<alignment>0</alignment>
+		<id>28</id>
+		<alignment>1</alignment>
 		<tabsequence>32766</tabsequence>
 		<border>0</border>
 		<color>33554432</color>
-		<x>1468</x>
-		<y>1</y>
-		<height>16</height>
-		<width>100</width>
+		<x>2337</x>
+		<y>2</y>
+		<height>15</height>
+		<width>1</width>
 		<format>[general]</format>
 		<html>
 			<valueishtml>0</valueishtml>
 		</html>
-		<name>manual_allocqty</name>
-		<visible>1</visible>
+		<name>part_qty_real</name>
+		<visible>0</visible>
 		<EditStyle style="edit">
 			<limit>0</limit>
 			<case>any</case>
@@ -1973,10 +2043,10 @@
 			<imemode>0</imemode>
 		</EditStyle>
 		<font>
-			<face>Times New Roman</face>
+			<face>Arial</face>
 			<height>-10</height>
 			<weight>400</weight>
-			<family>1</family>
+			<family>2</family>
 			<pitch>2</pitch>
 			<charset>0</charset>
 		</font>

webitm-wms/module-resource/sql/update.sql

@@ -36839,6 +36839,64 @@ D.TRAN_CODE  FROM WAVE_TASK_DET W, DESPATCH D , WAVE_TASK T WHERE REF_ID =
 D.DESP_ID AND D.CONFIRMED != 'Y' AND W.WAVE_ID = T.WAVE_ID AND T.CANCEL <> 
 'Y''
 WHERE MOD_NAME = 'W_SHIPMENT' and FIELD_NAME = 'PTCN';
+
+---added by Ashish Meheta On 03/12/13 not to deliver
+
+--Alter for PARCELPACK_ALLOW for wave_type table
+ALTER TABLE WAVE_TYPE
+ADD PARCELPACK_ALLOW CHAR(1);
+
+
+-- RENAMING ORIGNAL TABLE
+alter table DISTROUTEDET RENAME TO DISTROUTEDET_RENAMED ;
+
+-- ADDING MAX_CASE AND MIN_CASE TO DISTROUTEDET_RENAMED TABLE
+ALTER TABLE DISTROUTEDET_RENAMED ADD MIN_CASE NUMBER(6);
+ALTER TABLE DISTROUTEDET_RENAMED ADD MAX_CASE NUMBER(6);
+
+-- UPDATING ALL MIN_CASE AS O AND MAX_CASE 55555
+UPDATE DISTROUTEDET_RENAMED SET MIN_CASE = 0, MAX_CASE = 99999;
+
+COMMIT;
+
+-- CREATING TABLE
+CREATE TABLE DISTROUTEDET(
+DIST_ROUTE CHAR(5) NOT NULL, 
+LINE_NO NUMBER(3,0) NOT NULL, 
+STAN_CODE__FR CHAR(5) NOT NULL, 
+STAN_CODE__TO CHAR(5) NOT NULL, 
+TRAN_CODE CHAR(10) NOT NULL, 
+FRT_AMT NUMBER(12,3), 
+CURR_CODE CHAR(5), 
+TRAN_TIME NUMBER(12,3), 
+EXCH_RATE NUMBER(14,6), 
+TRANS_MODE CHAR(1), 
+MAX_WEIGHT NUMBER(14,6) NOT NULL, 
+MIN_WEIGHT NUMBER(14,6) NOT NULL,
+MIN_CASE NUMBER(6) NOT NULL,
+MAX_CASE NUMBER(6) NOT NULL,
+STATE_CODE__TO CHAR(5) NOT NULL, 
+STATE_CODE__FR CHAR(5) NOT NULL, 
+LOC_TYPE CHAR(3), 
+PIN__FR VARCHAR2(15) NOT NULL, 
+PIN__TO VARCHAR2(15) NOT NULL
+) ;
+ALTER TABLE DISTROUTEDET ADD ( CONSTRAINT DISROUTEDET_N_X PRIMARY KEY ( DIST_ROUTE, LINE_NO )) ;
+
+
+--COPPING RECORD FROM ORGNAL TABLE
+INSERT INTO DISTROUTEDET
+(
+DIST_ROUTE , LINE_NO , STAN_CODE__FR , STAN_CODE__TO , TRAN_CODE , FRT_AMT , CURR_CODE , TRAN_TIME , EXCH_RATE , 
+TRANS_MODE , MAX_WEIGHT , MIN_WEIGHT , MIN_CASE, MAX_CASE, STATE_CODE__TO , STATE_CODE__FR , LOC_TYPE , PIN__FR , PIN__TO 
+)
+SELECT DIST_ROUTE , LINE_NO , STAN_CODE__FR , STAN_CODE__TO , TRAN_CODE , FRT_AMT , CURR_CODE , TRAN_TIME , EXCH_RATE ,
+TRANS_MODE , MAX_WEIGHT , MIN_WEIGHT ,MIN_CASE, MAX_CASE, STATE_CODE__TO , STATE_CODE__FR , LOC_TYPE , PIN__FR , PIN__TO
+FROM DISTROUTEDET_RENAMED ; 
+
+COMMIT;
+
+ 
  
 COMMIT;
 	

webitm-wms/module-resource/srd/d_wavegen11.srd

@@ -3,7 +3,7 @@ release 9;
 datawindow(units=1 timer_interval=0 color=67108864 processing=0 HTMLDW=no print.printername="" print.documentname="" print.orientation = 0 print.margin.left = 24 print.margin.right = 24 print.margin.top = 24 print.margin.bottom = 24 print.paper.source = 0 print.paper.size = 0 print.canusedefaultprinter=yes print.prompt=no print.buttons=no print.preview.buttons=no print.cliptext=no print.overrideprintjob=no print.collate=yes hidegrayline=no )
 summary(height=0 color="536870912" )
 footer(height=0 color="536870912" )
-detail(height=392 color="536870912" )
+detail(height=372 color="536870912" )
 table(column=(type=char(10) updatewhereclause=no name=site_code dbname="site_code" )
  column=(type=char(1) updatewhereclause=no name=default_qty_flag dbname="name_1" values="Yes	Y/No	N/" )
  column=(type=char(10) updatewhereclause=no name=item_ser__from dbname="item_ser__from" )
@@ -25,21 +25,20 @@ table(column=(type=char(10) updatewhereclause=no name=site_code dbname="site_cod
  column=(type=char(1) updatewhereclause=no name=stock_to_dock_allow dbname="stock_to_dock_allow" values="YES	Y/NO	N/" )
  column=(type=char(200) updatewhereclause=no name=printer_name dbname="printer_name" )
  column=(type=char(1) updatewhereclause=no name=print_label dbname="print_label" initial="N" values="YES	Y/NO	N/" )
+ column=(type=char(1) updatewhereclause=no name=parcelpack_allow dbname="parcelpack_allow" values="YES	Y/NO	N/" )
+ column=(type=char(1) updatewhereclause=no name=master_override dbname="master_override" values="YES	Y/NO	N/" )
+ column=(type=char(1) updatewhereclause=no name=parcel_override dbname="parcel_override" values="YES	Y/NO	N/" )
  )
-groupbox(band=detail text="Basic"border="5" color="33554432" x="20" y="6" height="337" width="525"  name=gb_1 visible="1"  font.face="Times New Roman" font.height="-12" font.weight="700"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
+groupbox(band=detail text="Basic"border="5" color="33554432" x="20" y="6" height="353" width="525"  name=gb_1 visible="1"  font.face="Times New Roman" font.height="-12" font.weight="700"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
 text(band=detail alignment="1" text="Site Code:" border="0" color="33554432" x="75" y="30" height="16" width="94" html.valueishtml="0"  name=site_code_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
 column(band=detail id=1 alignment="0" tabsequence=10 border="5" color="33554432" x="174" y="30" height="16" width="95" format="[general]" html.valueishtml="0"  name=site_code visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
 text(band=detail alignment="1" text="Item Series From:" border="0" color="33554432" x="71" y="55" height="16" width="98" html.valueishtml="0"  name=item_ser__from_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
 column(band=detail id=3 alignment="0" tabsequence=20 border="5" color="33554432" x="174" y="55" height="16" width="95" format="[general]" html.valueishtml="0"  name=item_ser__from visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
 text(band=detail alignment="1" text="Item Series To:" border="0" color="33554432" x="352" y="55" height="16" width="84" html.valueishtml="0"  name=item_ser__to_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
 column(band=detail id=4 alignment="0" tabsequence=30 border="5" color="33554432" x="441" y="55" height="16" width="95" format="[general]" html.valueishtml="0"  name=item_ser__to visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
-text(band=detail alignment="1" text="Stock To Dock Allow:" border="0" color="33554432" x="317" y="255" height="16" width="120" html.valueishtml="0"  name=stock_to_dock_allow_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
-text(band=detail alignment="1" text="Master Pack Allow:" border="0" color="33554432" x="317" y="230" height="16" width="120" html.valueishtml="0"  name=master_pack_allow_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
-column(band=detail id=17 alignment="0" tabsequence=170 border="5" color="33554432" x="441" y="230" height="16" width="95" format="[general]" html.valueishtml="0"  name=master_pack_allow visible="1" ddlb.limit=0 ddlb.allowedit=no ddlb.case=any ddlb.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1073741824" )
 text(band=detail alignment="1" text="Default Quantity Automatic:" border="0" color="33554432" x="49" y="205" height="16" width="157" html.valueishtml="0"  name=default_qty_flag_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
 column(band=detail id=2 alignment="0" tabsequence=140 border="5" color="33554432" x="212" y="205" height="16" width="95" format="[general]" html.valueishtml="0"  name=default_qty_flag visible="1" ddlb.limit=0 ddlb.allowedit=no ddlb.case=any ddlb.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1073741824" )
 text(band=detail alignment="1" text="Wave Mode:" border="0" color="33554432" x="358" y="205" height="16" width="78" html.valueishtml="0"  name=wave_mode_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
-column(band=detail id=15 alignment="0" tabsequence=150 border="5" color="33554432" x="441" y="205" height="16" width="95" format="[general]" html.valueishtml="0"  name=wave_mode visible="1" ddlb.limit=2 ddlb.allowedit=no ddlb.case=upper ddlb.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1073741824" )
 text(band=detail alignment="1" text="Customer Code Dlv From :" border="0" color="33554432" x="22" y="180" height="16" width="147" html.valueishtml="0"  name=cust_code__dlv__from_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
 column(band=detail id=7 alignment="0" tabsequence=120 border="5" color="33554432" x="174" y="180" height="16" width="95" format="[general]" html.valueishtml="0"  name=cust_code__dlv__from visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
 text(band=detail alignment="1" text="Customer Code Dlv To :" border="0" color="33554432" x="297" y="180" height="16" width="139" html.valueishtml="0"  name=cust_code__dlv__to_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
@@ -61,14 +60,24 @@ column(band=detail id=5 alignment="0" tabsequence=40 border="5" color="33554432"
 text(band=detail alignment="1" text="Item Code To:" border="0" color="33554432" x="352" y="80" height="16" width="84" html.valueishtml="0"  name=item_code__to_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="536870912" )
 column(band=detail id=6 alignment="0" tabsequence=50 border="5" color="33554432" x="441" y="80" height="18" width="95" format="[general]" html.valueishtml="0"  name=item_code__to visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
 text(band=detail alignment="1" text="Single Lot:" border="0" color="33554432" x="65" y="230" height="16" width="104" html.valueishtml="0"  name=single_lot_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
-column(band=detail id=19 alignment="0" tabsequence=190 border="5" color="33554432" x="441" y="255" height="16" width="95" format="[general]" html.valueishtml="0"  name=stock_to_dock_allow visible="1" ddlb.limit=0 ddlb.allowedit=no ddlb.case=any ddlb.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1073741824" )
 column(band=detail id=16 alignment="0" tabsequence=160 border="5" color="33554432" x="174" y="230" height="16" width="95" format="[general]" html.valueishtml="0"  name=single_lot visible="1" ddlb.limit=0 ddlb.allowedit=no ddlb.case=any ddlb.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1073741824" )
-column(band=detail id=21 alignment="0" tabsequence=210 border="5" color="33554432" x="174" y="280" height="16" width="95" html.valueishtml="0"  name=print_label visible="1" ddlb.limit=0 ddlb.allowedit=no ddlb.case=upper ddlb.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1073741824" )
-text(band=detail alignment="1" text="Active Pack Allow:" border="0" color="33554432" x="65" y="255" height="16" width="104" html.valueishtml="0"  name=active_pick_allow_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
 column(band=detail id=18 alignment="0" tabsequence=180 border="5" color="33554432" x="174" y="255" height="16" width="95" format="[general]" html.valueishtml="0"  name=active_pick_allow visible="1" ddlb.limit=0 ddlb.allowedit=no ddlb.case=any ddlb.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1073741824" )
-column(band=detail id=20 alignment="0" tabsequence=200 border="5" color="33554432" x="174" y="305" height="16" width="362" html.valueishtml="0"  name=printer_name visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1073741824" )
-text(band=detail alignment="1" text="Printer For Label:" border="0" color="33554432" x="65" y="305" height="16" width="104" html.valueishtml="0"  name=printer_name_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
-text(band=detail alignment="1" text="Print Label:" border="0" color="33554432" x="65" y="280" height="16" width="104" html.valueishtml="0"  name=print_label_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
+column(band=detail id=22 alignment="0" tabsequence=210 border="5" color="33554432" x="174" y="280" height="16" width="95" format="[general]" html.valueishtml="0"  name=parcelpack_allow visible="1" ddlb.limit=0 ddlb.allowedit=no ddlb.case=upper ddlb.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1073741824" )
+text(band=detail alignment="1" text="Active Pack Allow:" border="0" color="33554432" x="65" y="255" height="16" width="104" html.valueishtml="0"  name=active_pick_allow_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
+text(band=detail alignment="1" text="Parcel Pack Allow:" border="0" color="33554432" x="65" y="279" height="16" width="104" html.valueishtml="0"  name=parcelpack_allow_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
+text(band=detail alignment="1" text="Print Label:" border="0" color="33554432" x="65" y="303" height="16" width="104" html.valueishtml="0"  name=print_label_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
+column(band=detail id=21 alignment="0" tabsequence=200 border="5" color="33554432" x="174" y="303" height="16" width="95" format="[general]" html.valueishtml="0"  name=print_label visible="1" ddlb.limit=0 ddlb.allowedit=no ddlb.case=upper ddlb.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1073741824" )
+text(band=detail alignment="1" text="Printer For Label:" border="0" color="33554432" x="65" y="327" height="16" width="104" html.valueishtml="0"  name=printer_name_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
+column(band=detail id=20 alignment="0" tabsequence=220 border="5" color="33554432" x="174" y="327" height="16" width="362" format="[general]" html.valueishtml="0"  name=printer_name visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1073741824" )
+column(band=detail id=15 alignment="0" tabsequence=150 border="5" color="33554432" x="441" y="205" height="16" width="95" format="[general]" html.valueishtml="0"  name=wave_mode visible="1" ddlb.limit=2 ddlb.allowedit=no ddlb.case=upper ddlb.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1073741824" )
+text(band=detail alignment="1" text="Master Pack Allow:" border="0" color="33554432" x="317" y="230" height="16" width="120" html.valueishtml="0"  name=master_pack_allow_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
+text(band=detail alignment="1" text="Stock To Dock Allow:" border="0" color="33554432" x="317" y="255" height="16" width="120" html.valueishtml="0"  name=stock_to_dock_allow_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
+text(band=detail alignment="1" text="Master Override:" border="0" color="33554432" x="317" y="280" height="16" width="120" html.valueishtml="0"  name=master_override_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
+text(band=detail alignment="1" text="Parcel Override:" border="0" color="33554432" x="317" y="305" height="16" width="120" html.valueishtml="0"  name=t_2 visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="1" background.color="553648127" )
+column(band=detail id=17 alignment="0" tabsequence=170 border="5" color="33554432" x="441" y="230" height="16" width="95" format="[general]" html.valueishtml="0"  name=master_pack_allow visible="1" ddlb.limit=0 ddlb.allowedit=no ddlb.case=any ddlb.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1073741824" )
+column(band=detail id=19 alignment="0" tabsequence=190 border="5" color="33554432" x="441" y="255" height="16" width="95" format="[general]" html.valueishtml="0"  name=stock_to_dock_allow visible="1" ddlb.limit=0 ddlb.allowedit=no ddlb.case=any ddlb.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1073741824" )
+column(band=detail id=23 alignment="0" tabsequence=230 border="5" color="33554432" x="441" y="280" height="16" width="95" html.valueishtml="0"  name=master_override visible="1" ddlb.limit=0 ddlb.allowedit=no ddlb.case=upper ddlb.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1073741824" )
+column(band=detail id=24 alignment="0" tabsequence=240 border="5" color="33554432" x="441" y="305" height="16" width="95" html.valueishtml="0"  name=parcel_override visible="1" ddlb.limit=0 ddlb.allowedit=no ddlb.case=upper ddlb.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="1073741824" )
 htmltable(border="1" )
 htmlgen(clientevents="1" clientvalidation="1" clientcomputedfields="1" clientformatting="0" clientscriptable="0" generatejavascript="1" encodeselflinkargs="1" netscapelayers="0" )
 export.xml(headgroups="1" includewhitespace="0" metadatatype=0 savemetadata=0  template=(comment="" encoding="UTF-8" name="d_wavegen11" xml="<?xml version=~"1.0~" encoding=~"UTF-8~" standalone=~"no~"?><d_wavegen><d_wavegen_row __pbband=~"detail~"><site_code/><default_qty_flag>default_qty_flag</default_qty_flag><item_ser__from>item_ser__from</item_ser__from><item_ser__to>item_ser__to</item_ser__to><item_code__from>item_code__from</item_code__from><item_code__to>item_code__to</item_code__to><cust_code__dlv__from>cust_code__dlv__from</cust_code__dlv__from><cust_code__dlv__to>cust_code__dlv__to</cust_code__dlv__to><cust_code__from>cust_code__from</cust_code__from><cust_code__to>cust_code__to</cust_code__to><sale_order__from>sale_order__from</sale_order__from><sale_order__to>sale_order__to</sale_order__to><due_date__from>due_date__from</due_date__from><due_date__to>due_date__to</due_date__to></d_wavegen_row></d_wavegen>"))

webitm-wms/module-resource/srd/d_wavegen12.srd

@@ -4,7 +4,7 @@ datawindow(units=1 timer_interval=0 color=67108864 processing=1 HTMLDW=no print.
 header(height=21 color="536870912" )
 summary(height=0 color="536870912" )
 footer(height=5 color="536870912" )
-detail(height=24 color="536870912" )
+detail(height=18 color="536870912" )
 table(column=(type=char(10) update=yes updatewhereclause=yes name=cust_code dbname="sorder.cust_code" )
  column=(type=char(40) updatewhereclause=yes name=cust_name dbname="customer.cust_name" )
  column=(type=char(3) updatewhereclause=yes name=line_no dbname="sorddet.line_no" )
@@ -16,6 +16,7 @@ table(column=(type=char(10) update=yes updatewhereclause=yes name=cust_code dbna
  column=(type=char(1) updatewhereclause=yes name=master_pack_allow dbname="wave_type.master_pack_allow" )
  column=(type=char(1) updatewhereclause=yes name=active_pick_allow dbname="wave_type.active_pick_allow" )
  column=(type=char(1) updatewhereclause=yes name=stock_to_dock_allow dbname="wave_type.stock_to_dock_allow" )
+ column=(type=char(1) updatewhereclause=yes name=parcelpack_allow dbname="wave_type.parcelpack_allow" )
  column=(type=decimal(3) updatewhereclause=yes name=quantity dbname="sorditem.quantity" )
  column=(type=char(1) updatewhereclause=yes name=part_qty dbname="sorder.part_qty" )
  column=(type=number updatewhereclause=yes name=pending_quantity dbname="pending_quantity" )
@@ -33,7 +34,7 @@ table(column=(type=char(10) update=yes updatewhereclause=yes name=cust_code dbna
  column=(type=char(20) updatewhereclause=yes name=exp_lev dbname="sorditem.exp_lev" )
  column=(type=char(0) updatewhereclause=yes name=part_qty_real dbname="part_qty_real" )
  column=(type=char(10) updatewhereclause=yes name=last_col dbname="last_col" )
- retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"sorddet~" )  TABLE(NAME=~"customer~" )  TABLE(NAME=~"item~" )  TABLE(NAME=~"sorder~" )  TABLE(NAME=~"sorditem~" )  TABLE(NAME=~"wave_type~" ) COLUMN(NAME=~"sorder.cust_code~") COLUMN(NAME=~"customer.cust_name~") COLUMN(NAME=~"sorddet.line_no~") COLUMN(NAME=~"sorder.sale_order~") COLUMN(NAME=~"sorder.due_date~") COLUMN(NAME=~"sorditem.item_code~") COLUMN(NAME=~"item.descr~") COLUMN(NAME=~"customer.single_lot~") COLUMN(NAME=~"wave_type.master_pack_allow~") COLUMN(NAME=~"wave_type.active_pick_allow~") COLUMN(NAME=~"wave_type.stock_to_dock_allow~") COLUMN(NAME=~"sorditem.quantity~") COLUMN(NAME=~"sorder.part_qty~") COMPUTE(NAME=~"SORDITEM.QUANTITY-SORDITEM.QTY_DESP  PENDING_QUANTITY~") COMPUTE(NAME=~"0 stock_quantity~") COLUMN(NAME=~"sorditem.qty_alloc~") COMPUTE(NAME=~"'' hold_qty~") COMPUTE(NAME=~"0 bal_qty~") COMPUTE(NAME=~"' ' manual_allocqty~") COLUMN(NAME=~"sorder.alloc_flag~") COMPUTE(NAME=~"' ' tran_code~") COMPUTE(NAME=~"' ' tran_name~") COMPUTE(NAME=~"' ' lock_code__dock~") COLUMN(NAME=~"sorddet.pack_instr~") COLUMN(NAME=~"sorddet.site_code~") COLUMN(NAME=~"sorditem.exp_lev~") COMPUTE(NAME=~"'' part_qty_real~") COMPUTE(NAME=~"'          '  LAST_COL~")    JOIN (LEFT=~"customer.wave_type~"    OP =~"=~"RIGHT=~"wave_type.wave_type~"    OUTER1 =~"customer.wave_type~" )    JOIN (LEFT=~"sorddet.sale_order~"    OP =~"=~"RIGHT=~"sorder.sale_order~" )    JOIN (LEFT=~"sorder.sale_order~"    OP =~"=~"RIGHT=~"sorditem.sale_order~" )    JOIN (LEFT=~"sorddet.line_no~"    OP =~"=~"RIGHT=~"sorditem.line_no~" )    JOIN (LEFT=~"sorditem.item_code__ord~"    OP =~"=~"RIGHT=~"item.item_code~" )    JOIN (LEFT=~"sorder.cust_code~"    OP =~"=~"RIGHT=~"customer.cust_code~" )    JOIN (LEFT=~"sorddet.site_code~"    OP =~"=~"RIGHT=~"sorditem.site_code~" )) " )
+ retrieve="PBSELECT( VERSION(400) TABLE(NAME=~"sorddet~" )  TABLE(NAME=~"customer~" )  TABLE(NAME=~"item~" )  TABLE(NAME=~"sorder~" )  TABLE(NAME=~"sorditem~" )  TABLE(NAME=~"wave_type~" ) COLUMN(NAME=~"sorder.cust_code~") COLUMN(NAME=~"customer.cust_name~") COLUMN(NAME=~"sorddet.line_no~") COLUMN(NAME=~"sorder.sale_order~") COLUMN(NAME=~"sorder.due_date~") COLUMN(NAME=~"sorditem.item_code~") COLUMN(NAME=~"item.descr~") COLUMN(NAME=~"customer.single_lot~") COLUMN(NAME=~"wave_type.master_pack_allow~") COLUMN(NAME=~"wave_type.active_pick_allow~") COLUMN(NAME=~"wave_type.stock_to_dock_allow~") COLUMN(NAME=~"wave_type.parcelpack_allow~") COLUMN(NAME=~"sorditem.quantity~") COLUMN(NAME=~"sorder.part_qty~") COMPUTE(NAME=~"SORDITEM.QUANTITY-SORDITEM.QTY_DESP  PENDING_QUANTITY~") COMPUTE(NAME=~"0 stock_quantity~") COLUMN(NAME=~"sorditem.qty_alloc~") COMPUTE(NAME=~"'' hold_qty~") COMPUTE(NAME=~"0 bal_qty~") COMPUTE(NAME=~"' ' manual_allocqty~") COLUMN(NAME=~"sorder.alloc_flag~") COMPUTE(NAME=~"' ' tran_code~") COMPUTE(NAME=~"' ' tran_name~") COMPUTE(NAME=~"' ' lock_code__dock~") COLUMN(NAME=~"sorddet.pack_instr~") COLUMN(NAME=~"sorddet.site_code~") COLUMN(NAME=~"sorditem.exp_lev~") COMPUTE(NAME=~"'' part_qty_real~") COMPUTE(NAME=~"'          '  LAST_COL~")    JOIN (LEFT=~"customer.wave_type~"    OP =~"=~"RIGHT=~"wave_type.wave_type~"    OUTER1 =~"customer.wave_type~" )    JOIN (LEFT=~"sorddet.sale_order~"    OP =~"=~"RIGHT=~"sorder.sale_order~" )    JOIN (LEFT=~"sorder.sale_order~"    OP =~"=~"RIGHT=~"sorditem.sale_order~" )    JOIN (LEFT=~"sorddet.line_no~"    OP =~"=~"RIGHT=~"sorditem.line_no~" )    JOIN (LEFT=~"sorditem.item_code__ord~"    OP =~"=~"RIGHT=~"item.item_code~" )    JOIN (LEFT=~"sorder.cust_code~"    OP =~"=~"RIGHT=~"customer.cust_code~" )    JOIN (LEFT=~"sorddet.site_code~"    OP =~"=~"RIGHT=~"sorditem.site_code~" )) " )
 text(band=header alignment="0" text="Customer Code" border="6" color="33554432" x="2" y="2" height="16" width="89" html.valueishtml="0"  name=cust_code_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
 text(band=header alignment="2" text="Line No" border="6" color="33554432" x="215" y="2" height="16" width="50" html.valueishtml="0"  name=line_no_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
 text(band=header alignment="2" text="Item Code" border="6" color="33554432" x="450" y="2" height="16" width="65" html.valueishtml="0"  name=item_code_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
@@ -45,21 +46,22 @@ text(band=header alignment="0" text="Single Lot" border="6" color="33554432" x="
 text(band=header alignment="0" text="Master Pack" border="6" color="33554432" x="715" y="2" height="16" width="76" html.valueishtml="0"  name=master_pack_allow_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
 text(band=header alignment="0" text="Active Pick" border="6" color="33554432" x="793" y="2" height="16" width="71" html.valueishtml="0"  name=active_pick_allow_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
 text(band=header alignment="0" text="Stock To Dock" border="6" color="33554432" x="866" y="2" height="16" width="85" html.valueishtml="0"  name=stock_to_dock_allow_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
-text(band=header alignment="0" text="Dock Location" border="6" color="33554432" x="1905" y="2" height="16" width="84" html.valueishtml="0"  name=lock_code__dock_t visible="1"  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
-text(band=header alignment="1" text="Quantity" border="6" color="33554432" x="953" y="2" height="16" width="69" html.valueishtml="0"  name=quantity_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
-text(band=header alignment="1" text="Part Quantity" border="6" color="33554432" x="1024" y="2" height="16" width="89" html.valueishtml="0"  name=part_qty_t visible="1"  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
-text(band=header alignment="1" text="Pending Qty" border="6" color="33554432" x="1115" y="2" height="16" width="83" html.valueishtml="0"  name=pending_quantity_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
-text(band=header alignment="1" text="Stock Qty" border="6" color="33554432" x="1200" y="2" height="16" width="64" html.valueishtml="0"  name=stock_quantity_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
-text(band=header alignment="1" text="Hold Qty" border="6" color="33554432" x="1266" y="2" height="16" width="66" html.valueishtml="0"  name=hold_qty_t visible="1"  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
-text(band=header alignment="1" text="Qty Alloc" border="6" color="33554432" x="1334" y="2" height="16" width="65" html.valueishtml="0"  name=qty_alloc_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
-text(band=header alignment="1" text="Bal Qty" border="6" color="33554432" x="1401" y="2" height="16" width="65" html.valueishtml="0"  name=bal_qty_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
-text(band=header alignment="0" text="Alloc Flag" border="6" color="33554432" x="1570" y="2" height="16" width="70" html.valueishtml="0"  name=alloc_flag_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
-text(band=header alignment="0" text="Transporter Code" border="6" color="33554432" x="1642" y="2" height="16" width="112" html.valueishtml="0"  name=tran_code_t visible="1"  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
-text(band=header alignment="0" text="Transporter Name" border="6" color="33554432" x="1756" y="2" height="16" width="147" html.valueishtml="0"  name=tran_name_t visible="1"  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
-text(band=header alignment="0" text="Packing Instruction" border="6" color="33554432" x="1991" y="2" height="16" width="108" html.valueishtml="0"  name=pack_instr_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
-text(band=header alignment="2" text="Site Code" border="6" color="33554432" x="2101" y="2" height="16" width="67" html.valueishtml="0"  name=site_code_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
-text(band=header alignment="0" text="Exp Lev" border="6" color="33554432" x="2170" y="2" height="16" width="62" html.valueishtml="0"  name=exp_lev_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
-text(band=header alignment="0" text="Manual Alloc Qty" border="6" color="33554432" x="1468" y="2" height="16" width="100" html.valueishtml="0"  name=manual_allocqty_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
+text(band=header alignment="0" text="Parce Pack Allow" border="6" color="33554432" x="953" y="2" height="16" width="98" html.valueishtml="0"  name=parcelpack_allow_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
+text(band=header alignment="1" text="Quantity" border="6" color="33554432" x="1053" y="2" height="16" width="69" html.valueishtml="0"  name=quantity_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
+text(band=header alignment="0" text="Dock Location" border="6" color="33554432" x="2005" y="2" height="16" width="84" html.valueishtml="0"  name=lock_code__dock_t visible="1"  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
+text(band=header alignment="1" text="Part Quantity" border="6" color="33554432" x="1124" y="2" height="16" width="89" html.valueishtml="0"  name=part_qty_t visible="1"  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
+text(band=header alignment="1" text="Pending Qty" border="6" color="33554432" x="1215" y="2" height="16" width="83" html.valueishtml="0"  name=pending_quantity_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
+text(band=header alignment="1" text="Stock Qty" border="6" color="33554432" x="1300" y="2" height="16" width="64" html.valueishtml="0"  name=stock_quantity_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
+text(band=header alignment="1" text="Hold Qty" border="6" color="33554432" x="1366" y="2" height="16" width="66" html.valueishtml="0"  name=hold_qty_t visible="1"  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
+text(band=header alignment="1" text="Qty Alloc" border="6" color="33554432" x="1434" y="2" height="16" width="65" html.valueishtml="0"  name=qty_alloc_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
+text(band=header alignment="1" text="Bal Qty" border="6" color="33554432" x="1501" y="2" height="16" width="65" html.valueishtml="0"  name=bal_qty_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
+text(band=header alignment="0" text="Alloc Flag" border="6" color="33554432" x="1670" y="2" height="16" width="70" html.valueishtml="0"  name=alloc_flag_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
+text(band=header alignment="0" text="Transporter Code" border="6" color="33554432" x="1742" y="2" height="16" width="112" html.valueishtml="0"  name=tran_code_t visible="1"  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
+text(band=header alignment="0" text="Transporter Name" border="6" color="33554432" x="1856" y="2" height="16" width="147" html.valueishtml="0"  name=tran_name_t visible="1"  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
+text(band=header alignment="0" text="Packing Instruction" border="6" color="33554432" x="2091" y="2" height="16" width="108" html.valueishtml="0"  name=pack_instr_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
+text(band=header alignment="0" text="Manual Alloc Qty" border="6" color="33554432" x="1568" y="2" height="16" width="100" html.valueishtml="0"  name=manual_allocqty_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
+text(band=header alignment="2" text="Site Code" border="6" color="33554432" x="2201" y="2" height="16" width="67" html.valueishtml="0"  name=site_code_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
+text(band=header alignment="0" text="Exp Lev" border="6" color="33554432" x="2270" y="2" height="16" width="62" html.valueishtml="0"  name=exp_lev_t visible="1"  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="67108864" )
 column(band=detail id=1 alignment="0" tabsequence=32766 border="0" color="33554432" x="2" y="2" height="15" width="89" format="[general]" html.valueishtml="0"  name=cust_code visible="1" edit.limit=10 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
 column(band=detail id=2 alignment="0" tabsequence=32766 border="0" color="33554432" x="93" y="2" height="15" width="120" format="[general]" html.valueishtml="0"  name=cust_name visible="1" edit.limit=40 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
 column(band=detail id=3 alignment="1" tabsequence=32766 border="0" color="33554432" x="215" y="2" height="15" width="50" format="[general]" html.valueishtml="0"  name=line_no visible="1" edit.limit=3 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
@@ -71,23 +73,24 @@ column(band=detail id=8 alignment="0" tabsequence=10 border="0" color="33554432"
 column(band=detail id=9 alignment="0" tabsequence=20 border="0" color="33554432" x="715" y="2" height="16" width="76" format="[general]" html.valueishtml="0"  name=master_pack_allow visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
 column(band=detail id=10 alignment="0" tabsequence=30 border="0" color="33554432" x="793" y="2" height="16" width="71" format="[general]" html.valueishtml="0"  name=active_pick_allow visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
 column(band=detail id=11 alignment="0" tabsequence=40 border="0" color="33554432" x="866" y="2" height="16" width="85" format="[general]" html.valueishtml="0"  name=stock_to_dock_allow visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
-column(band=detail id=23 alignment="0" tabsequence=32766 border="0" color="33554432" x="1905" y="2" height="16" width="84" format="[general]" html.valueishtml="0"  name=lock_code__dock visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
-column(band=detail id=12 alignment="1" tabsequence=32766 border="0" color="33554432" x="953" y="2" height="15" width="69" format="[general]" html.valueishtml="0"  name=quantity visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
-column(band=detail id=16 alignment="1" tabsequence=50 border="0" color="33554432" x="1334" y="2" height="15" width="65" format="[general]" html.valueishtml="0"  name=qty_alloc visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
-column(band=detail id=17 alignment="1" tabsequence=32766 border="0" color="33554432" x="1266" y="2" height="16" width="66" format="[general]" html.valueishtml="0"  name=hold_qty visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
-column(band=detail id=13 alignment="0" tabsequence=32766 border="0" color="33554432" x="1024" y="2" height="16" width="89" format="[general]" html.valueishtml="0"  name=part_qty visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
-column(band=detail id=14 alignment="1" tabsequence=32766 border="0" color="33554432" x="1115" y="2" height="15" width="83" format="[general]" html.valueishtml="0"  name=pending_quantity visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
-column(band=detail id=15 alignment="1" tabsequence=32766 border="0" color="33554432" x="1200" y="2" height="15" width="64" format="[general]" html.valueishtml="0"  name=stock_quantity visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=no edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
-column(band=detail id=18 alignment="1" tabsequence=32766 border="0" color="33554432" x="1401" y="2" height="16" width="65" format="[general]" html.valueishtml="0"  name=bal_qty visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
-column(band=detail id=20 alignment="0" tabsequence=32766 border="0" color="33554432" x="1570" y="2" height="16" width="70" format="[general]" html.valueishtml="0"  name=alloc_flag visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
-column(band=detail id=21 alignment="0" tabsequence=32766 border="0" color="33554432" x="1642" y="2" height="16" width="112" format="[general]" html.valueishtml="0"  name=tran_code visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
-column(band=detail id=22 alignment="0" tabsequence=32766 border="0" color="33554432" x="1756" y="2" height="16" width="147" format="[general]" html.valueishtml="0"  name=tran_name visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
-column(band=detail id=24 alignment="0" tabsequence=32766 border="0" color="33554432" x="1991" y="2" height="15" width="108" format="[general]" html.valueishtml="0"  name=pack_instr visible="1" edit.limit=120 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
-column(band=detail id=25 alignment="0" tabsequence=32766 border="0" color="33554432" x="2101" y="2" height="15" width="67" format="[general]" html.valueishtml="0"  name=site_code visible="1" edit.limit=5 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
-column(band=detail id=26 alignment="0" tabsequence=32766 border="0" color="33554432" x="2170" y="2" height="15" width="62" format="[general]" html.valueishtml="0"  name=exp_lev visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=no edit.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
-column(band=detail id=28 alignment="0" tabsequence=32766 border="0" color="33554432" x="2234" y="2" height="18" width="1" format="[general]" html.valueishtml="0"  name=last_col visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=no edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
-column(band=detail id=27 alignment="1" tabsequence=32766 border="0" color="33554432" x="2237" y="2" height="16" width="1" format="[general]" html.valueishtml="0"  name=part_qty_real visible="0" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
-column(band=detail id=19 alignment="0" tabsequence=32766 border="0" color="33554432" x="1468" y="1" height="16" width="100" format="[general]" html.valueishtml="0"  name=manual_allocqty visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
+column(band=detail id=12 alignment="0" tabsequence=50 border="0" color="33554432" x="953" y="2" height="15" width="98" format="[general]" html.valueishtml="0"  name=parcelpack_allow visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
+column(band=detail id=13 alignment="1" tabsequence=32766 border="0" color="33554432" x="1053" y="2" height="15" width="69" format="[general]" html.valueishtml="0"  name=quantity visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
+column(band=detail id=24 alignment="0" tabsequence=32766 border="0" color="33554432" x="2005" y="2" height="16" width="84" format="[general]" html.valueishtml="0"  name=lock_code__dock visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
+column(band=detail id=17 alignment="1" tabsequence=60 border="0" color="33554432" x="1434" y="2" height="15" width="65" format="[general]" html.valueishtml="0"  name=qty_alloc visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
+column(band=detail id=18 alignment="1" tabsequence=32766 border="0" color="33554432" x="1366" y="2" height="16" width="66" format="[general]" html.valueishtml="0"  name=hold_qty visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
+column(band=detail id=14 alignment="0" tabsequence=32766 border="0" color="33554432" x="1124" y="2" height="16" width="89" format="[general]" html.valueishtml="0"  name=part_qty visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
+column(band=detail id=15 alignment="1" tabsequence=32766 border="0" color="33554432" x="1215" y="2" height="15" width="83" format="[general]" html.valueishtml="0"  name=pending_quantity visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
+column(band=detail id=16 alignment="1" tabsequence=32766 border="0" color="33554432" x="1300" y="2" height="15" width="64" format="[general]" html.valueishtml="0"  name=stock_quantity visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=no edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
+column(band=detail id=19 alignment="1" tabsequence=32766 border="0" color="33554432" x="1501" y="2" height="16" width="65" format="[general]" html.valueishtml="0"  name=bal_qty visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
+column(band=detail id=21 alignment="0" tabsequence=32766 border="0" color="33554432" x="1670" y="2" height="16" width="70" format="[general]" html.valueishtml="0"  name=alloc_flag visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
+column(band=detail id=22 alignment="0" tabsequence=32766 border="0" color="33554432" x="1742" y="2" height="16" width="112" format="[general]" html.valueishtml="0"  name=tran_code visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
+column(band=detail id=23 alignment="0" tabsequence=32766 border="0" color="33554432" x="1856" y="2" height="16" width="147" format="[general]" html.valueishtml="0"  name=tran_name visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
+column(band=detail id=20 alignment="0" tabsequence=32766 border="0" color="33554432" x="1568" y="1" height="16" width="100" format="[general]" html.valueishtml="0"  name=manual_allocqty visible="1" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Times New Roman" font.height="-10" font.weight="400"  font.family="1" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
+column(band=detail id=25 alignment="0" tabsequence=32766 border="0" color="33554432" x="2091" y="2" height="15" width="108" format="[general]" html.valueishtml="0"  name=pack_instr visible="1" edit.limit=120 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
+column(band=detail id=26 alignment="0" tabsequence=32766 border="0" color="33554432" x="2201" y="2" height="15" width="67" format="[general]" html.valueishtml="0"  name=site_code visible="1" edit.limit=5 edit.case=any edit.focusrectangle=no edit.autoselect=yes edit.autohscroll=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
+column(band=detail id=27 alignment="0" tabsequence=32766 border="0" color="33554432" x="2270" y="2" height="15" width="62" format="[general]" html.valueishtml="0"  name=exp_lev visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=no edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
+column(band=detail id=29 alignment="0" tabsequence=32766 border="0" color="33554432" x="2334" y="2" height="15" width="1" format="[general]" html.valueishtml="0"  name=last_col visible="1" edit.limit=0 edit.case=any edit.focusrectangle=no edit.autoselect=no edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
+column(band=detail id=28 alignment="1" tabsequence=32766 border="0" color="33554432" x="2337" y="2" height="15" width="1" format="[general]" html.valueishtml="0"  name=part_qty_real visible="0" edit.limit=0 edit.case=any edit.autoselect=yes edit.imemode=0  font.face="Arial" font.height="-10" font.weight="400"  font.family="2" font.pitch="2" font.charset="0" background.mode="2" background.color="16777215" )
 htmltable(border="1" )
 htmlgen(clientevents="1" clientvalidation="1" clientcomputedfields="1" clientformatting="0" clientscriptable="0" generatejavascript="1" encodeselflinkargs="1" netscapelayers="0" )
 export.xml(usetemplate="" headgroups="1" includewhitespace="0" metadatatype=0 savemetadata=0  template=(comment="" encoding="UTF-8" name="xx" xml="<?xml version=~"1.0~" encoding=~"UTF-8~" standalone=~"no~"?><untitled><untitled_row __pbband=~"detail~"><sorder_cust_code>cust_code</sorder_cust_code><customer_cust_name>cust_name</customer_cust_name><sorddet_line_no>line_no</sorddet_line_no><sorder_sale_order>sale_order</sorder_sale_order><sorder_due_date>due_date</sorder_due_date><sorditem_item_code>item_code</sorditem_item_code><item_descr>item_descr</item_descr><sorditem_quantity>quantity</sorditem_quantity><stosc_quantity/><sorditem_qty_alloc>qty_alloc</sorditem_qty_alloc><sorddet_pack_instr>pack_instr</sorddet_pack_instr><sorddet_site_code>site_code</sorddet_site_code><pending_quantity>pending_quantity</pending_quantity></untitled_row></untitled>"))