WMS -source merge for issues tracker -401 and 403(pragyan sir) by Dhanraj

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

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

@@ -641,6 +641,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 					else
 					{
 						updateWaveStatusDespatch(tempPTCN,conn);
+						updateCartonMasterstatus(tempPTCN, conn);
 					}
 					//Changed By Pragyan 02-JUL-14 (Issue tracker No 396)To get proper count from pick order and pick line no.
 				}				
@@ -655,12 +656,12 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 			//Changed by sumit on 04/06/13 closing prepared statement end
 			System.out.println("ret string :"+errString);
 			//changed by sankara on 04/02/14 update carton_master status from pick deallocation start.
-			int updatecount =  updateCartonMasterstatus(ptcn, conn);
+			/*//int updatecount =  updateCartonMasterstatus(ptcn, conn);
 			System.out.println("updatecount::::"+updatecount);
 			if( updatecount > 0 )
 			{
 				System.out.println("update status in carton_master sucessfully");
-			}
+			}*/
 			//changed by sankara on 04/02/14 update carton_master status from pick deallocation end.
 			//changed by sankara on 21/06/14 update sale order ship status from pick deallocation start.
 			int shipstatuscount = updatesaleOrdershipStatus(saleOrder,ptcn,conn);
@@ -3919,7 +3920,9 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 		{
 			
 			sql = " SELECT DISTINCT A.MASTER_CARTON FROM CARTON_MASTER A, PACK_HDR P WHERE P.PTCN = A.PTCN AND A.PTCN = ? " +
-				  "	AND A.CARTON_TYPE = 'M' AND P.CONFIRMED = 'Y' AND A.STATUS = 'U' ";
+					//Changed By Pragyan 03-JUL-14 to update satus Rejected for unused master cartons
+				  //"	AND A.CARTON_TYPE = 'M' AND P.CONFIRMED = 'Y' AND A.STATUS = 'U' ";
+				  "	AND A.CARTON_TYPE = 'M' AND P.CONFIRMED = 'Y' AND A.STATUS IN ('U','A') ";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, ptcn);
 			rs = pstmt.executeQuery();

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

@@ -4199,7 +4199,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 										// caseCount = qtyAllocate /packSize;
 										 caseCount = qtyAllocate /itemPackSize;
 										 
-										if(invSt != null && invSt.trim().equalsIgnoreCase(resvInvStat.trim()))
+										 //Changed By Pragyan 03-JUL-14 Issue Tracker No(401) not to create Stock To Dock from Mannual allocation.start
+										/*if(invSt != null && invSt.trim().equalsIgnoreCase(resvInvStat.trim()))
 										{
 											
 											double palletVolume  = Double.parseDouble(discommon.getDisparams("999999","PER_PALLET__VOLUME",conn));
@@ -4211,8 +4212,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 											 {
 												 isStockToDock = true;
 											 }
-										}
-										
+										}*/
+										 //Changed By Pragyan 03-JUL-14 Issue Tracker No(401) not to create Stock To Dock from Mannual allocation.end
+										 
 										if(tempList != null)
 										{
 											 System.out.println("Before Manual tempList["+tempList.size()+"]data["+tempList.toString()+"]");
@@ -5449,19 +5451,22 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					
 					if((invStat.equalsIgnoreCase(resrvLoc) || invStat.equalsIgnoreCase(deepStoreLoc)) && (lotQtyToBeAllocated > packSizeActive) && "Y".equalsIgnoreCase(isStockToDockChecked))
 					{
+						
+						//Changed By Pragyan 03-JUL-14 Issue Tracker No(401) not to create Stock To Dock if allocation is present in stock.start
 						////Changed By Pragyan 06-DEC-13 to get Stock alloc quantity exist then stock to dock should not be considered as per KB sir.start
 						//changed by sankara on 03/01/14 as suggested by pragyan start.
-						isStockToDock = true;
-						/*if(stkAllocQty > 0)
+						//isStockToDock = true;
+						if(stkAllocQty > 0)
 						{
 							isStockToDock = false;
 						}
 						else
 						{
 							isStockToDock = true;
-						}*/
+						}
 						//changed by sankara on 03/01/14 as suggested by pragyan end.
 						//Changed By Pragyan 06-DEC-13 to get Stock alloc quantity then stock to dock should not be considered as per KB sir.start
+						//Changed By Pragyan 03-JUL-14 Issue Tracker No(401) not to create Stock To Dock if allocation is present in stock.end
 					}
 					//Changed By Pragyan 09/11/12 To make the stock to dock if avilable quantity less then or equal to required quantity(only reserve locatio).end
 				}
@@ -22426,6 +22431,7 @@ public void updateBackOrderStatus (String salesOrder, Connection conn) throws IT
 			allocQuantity = rs.getInt(4);
 			System.out.println("pendingOrder"+pendingOrder);
 			System.out.println("LineNo:"+LineNo);
+			
 			if( pendingOrder.trim().equalsIgnoreCase("H") && ( allocQuantity < orderQuantity ) )
 			{
 				//Changed by Dhanraj on 27JUN14  to over come open cursor issue
@@ -22440,6 +22446,7 @@ public void updateBackOrderStatus (String salesOrder, Connection conn) throws IT
 				}
 				pstmtupdate.clearParameters();
 			}
+			
 		}
 	}
 	catch(Exception ex)