Changed by sankara on 09/05/14 updated...

Changed by sankara on 09/05/14 updated DeallocArtConf,DockTranPos,PoRcpPos,ReplIssIc,WaveCancelEJB for wms bugs


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

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

@@ -13,6 +13,7 @@ import ibase.webitm.ejb.fin.*;
 
 import java.rmi.RemoteException;
 import java.util.*;
+import java.util.Date;
 import java.text.*;
 import java.sql.*;
 

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

@@ -34,7 +34,9 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 	{
 		return "";
 	}
-	public String postSave(String domString, String tranId,String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException
+	//Changed By Pragyan 09-MAY-14 to Take Local connection 
+	//public String postSave(String domString, String tranId,String editFlag, String xtraParams, Connection conn ) throws RemoteException,ITMException
+	public String postSave(String domString, String tranId,String editFlag, String xtraParams, Connection conn1 ) throws RemoteException,ITMException
 	{
 		
 		System.out.println( "Calling DockTranPos.........................................." );
@@ -70,7 +72,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 		InvAllocTraceBean invAllocTrace = null;
 		HashMap strAllocate = null;
 		DistCommon distCommon = new DistCommon();
-		stagingLoc = distCommon.getDisparams( "999999", "STAGING_LOC", conn );
+		//stagingLoc = distCommon.getDisparams( "999999", "STAGING_LOC", conn );
 		stkUpdate = new StockUpdate();
 		invAllocTrace = new InvAllocTraceBean();		
 		double stkRate = 0.0,stkGrossRate = 0.0,convQtyStduom = 0.0,batchSize = 0.0;
@@ -93,8 +95,23 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 		ITMDBAccessEJB itmDBAccess = new ITMDBAccessEJB();
 		//Changed By 02/05/13 Pragyan To check the sordalloc allocated quantity > quantity  then insert new record deducte quantity from old location.end
 		
+		//Changed By Pragyan 09-MAY-14 to Take Local connection.Start
+		ConnDriver connDriver = null;
+		Connection conn=null;
+		
 		try
 		{
+			//Changed By Pragyan 09-MAY-14 to Take Local connection.Start
+			connDriver = new ConnDriver();
+			conn = connDriver.getConnectDB("DriverValidator");
+			if(conn==null)
+			{
+				System.out.println("Connection is null");
+				return "";
+			}
+			stagingLoc = distCommon.getDisparams( "999999", "STAGING_LOC", conn );
+			//Changed By Pragyan 09-MAY-14 to Take Local connection.end
+			
 			updateRowMap = new HashMap() ;
 			String applDateFormat = genericUtility.getApplDateFormat();
 			String dbDateFormat = genericUtility.getDBDateFormat();
@@ -862,7 +879,18 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 		}
 		catch(Exception e)
 		{
-			System.out.println("Exception "+e.getMessage());
+			System.out.println("Exception before rollback "+e.getMessage());
+			try
+			{
+				
+				conn.rollback();
+			}
+			catch (SQLException e1) 
+			{
+				
+				e1.printStackTrace();
+			}
+						
 			e.printStackTrace();
 			throw new ITMException(e);
 		}

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

@@ -665,7 +665,12 @@ public class PoRcpPos extends ValidatorEJB implements PoRcpPosLocal, PoRcpPosRem
 					pstmt1 = null;
 				}
 			}
-			
+			//Changed By Pragyan 09-MAY-14 To return previous message for quantity mismatch.start
+			else
+			{
+				return errString = itmDBAccessEJB.getErrorString("","VTNTCNF","");
+			}
+			//Changed By Pragyan 09-MAY-14 To return previous message for quantity mismatch.end
 		}
 		catch(Exception e)
 		{

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

@@ -509,8 +509,12 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
 								
 								pickOrder = checkNull(genericUtility.getColumnValue( "REPL_ORDER", currFormDataDom  ));
 								
+								//Changed By Pragyan 08-May-14 to check the cancel mode for hold stocks
+								/*sql = " select count (*) from stock where (item_code, site_code, loc_code, lot_no, lot_sl ) in  " +
+									  " ( select item_code, site_code, loc_code, lot_no, lot_sl from repl_ord_det where repl_order = ? ) and ( hold_qty > 0 ) ";*/
 								sql = " select count (*) from stock where (item_code, site_code, loc_code, lot_no, lot_sl ) in  " +
-									  " ( select item_code, site_code, loc_code, lot_no, lot_sl from repl_ord_det where repl_order = ? ) and ( hold_qty > 0 ) ";
+										  " ( select item_code, site_code, loc_code, lot_no, lot_sl from repl_ord_det where repl_order = ? " +
+										  " and case when cancel_mode is null then 'N' else  cancel_mode end <> 'Y') and ( hold_qty > 0 )";
 								pstmt =  conn.prepareStatement(sql);
 								pstmt.setString(1,replOrder);
 								rs = pstmt.executeQuery();