QC transfer commit changes.

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

webitm-mfg/ibase/webitm/ejb/mfg/QCTransferConf.java

@@ -27,6 +27,7 @@ public class QCTransferConf extends ActionHandlerEJB implements
 QCTransferConfLocal, QCTransferConfRemote
 {
 	
+
 	public String actionHandler() throws RemoteException, ITMException
 	{
 		return "";
@@ -44,28 +45,43 @@ QCTransferConfLocal, QCTransferConfRemote
 		System.out.println("xtraParams---" + xtraParams);
 		return str;
 			}
-
 	public String confirm(String tranId, String xtraParams, String forcedFlag)
 			throws RemoteException, ITMException
 			{
+		Connection conn=null;
+		String errString="";
+		errString=confirm(tranId,xtraParams,forcedFlag,conn);
+		System.out.println("errString----"+errString);
+		return errString;
+			}
+//	public String confirm(String tranId, String xtraParams, String forcedFlag)
+	public String confirm(String tranId, String xtraParams, String forcedFlag, Connection conn)
+			throws RemoteException, ITMException
+			{
 		System.out.println("QCTransferConf confirm called...230914...........");
 		String confirmed = "";
 		String sql = "";
-		Connection conn = null;
+//		Connection conn = null;
 		PreparedStatement pstmt = null;
 		ITMDBAccessEJB itmDBAccessEJB = null;
 		String errString = "",errCode="";
 		ResultSet rs = null;
 		//int recCnt = 0, cnt = 0;
 		ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
+		boolean isLocal=false;	
 
 		try 
 		{
+			
 			itmDBAccessEJB = new ITMDBAccessEJB();
+			
+			if(conn==null){
 			ConnDriver connDriver = null;
 			connDriver = new ConnDriver();
 			conn = connDriver.getConnectDB("DriverITM");
 			conn.setAutoCommit(false);
+			isLocal=true;
+			}
 
 			if (errString == null || errString.trim().length() == 0)
 			{
@@ -127,19 +143,25 @@ QCTransferConfLocal, QCTransferConfRemote
 		{
 			try 
 			{
-				if (errString != null && errString.trim().length() > 0	&& !("VTCONFIRM".equalsIgnoreCase(errCode))) 
+				if (errString != null && errString.trim().length() > 0	&& !("VTCONFIRM".equalsIgnoreCase(errCode)) ) 
 				{
+//					if(isLocal){
 					conn.rollback();
 					System.out.println("@@@@ Transaction rollback...["+errString+"]::errCode["+errCode+"]");
 					conn.close();
 					conn = null;
+//					}
 				}
 				else 
 				{
+					if(isLocal){
 					conn.commit(); // test
-					System.out.println("@@@@ Transaction commit....["+errString+"]::errCode["+errCode+"]");
+					System.out.println("c"+errString+"]::errCode["+errCode+"]");
 					conn.close();
 					conn = null;
+					}else{
+						System.out.println("DIDNT COMMIT ********8");
+					}
 				}
 			}
 			catch (Exception e) 
@@ -152,6 +174,7 @@ QCTransferConfLocal, QCTransferConfRemote
 			}
 	
 
+
 	private String confirmQcTransfer(String tranId, int i, String xtraParams, Connection conn)
 			throws RemoteException, ITMException
 

webitm-mfg/ibase/webitm/ejb/mfg/QcOdrProvisionalReleaseConf.java

@@ -237,9 +237,14 @@ QcOdrProvisionalReleaseConfLocal, QcOdrProvisionalReleaseConfRemote
 					locCodeTo=locCodeFrm+"Q";        //Generate Location To
 					System.out.println("Location code to &&&&&&&&&&&:- "+locCodeTo);
 					
+					System.out.println("TransQUANTITY before :-"+trnfQty);
+					System.out.println("QUANTITY before :-"+quantity);
 					trnfQty=trnfQty==null?"0":trnfQty;
 					quantity=quantity==null?"0":quantity;
 					
+					System.out.println("TransQUANTITY after :-"+trnfQty);
+					System.out.println("QUANTITY after :-"+quantity);
+					
 					System.out.println("Lot sl &&&&&&&&&&&&:-"+lotSl);
 					System.out.println("Lot No &&&&&&&&&&&&:-"+lotNo);
 					
@@ -313,11 +318,6 @@ QcOdrProvisionalReleaseConfLocal, QcOdrProvisionalReleaseConfRemote
 						String tranIdForDesp = arrayForTranId[1].substring(0,endIndex);
 						System.out.println("-tranIdForDesp &&&&&&&&&&& :- "+tranIdForDesp);
 						
-						// To confirm QC Transfer send tranIdForDesp, xtraParams, forcedFlag
-						
-						retString=qcTrnsCnf.confirm(tranIdForDesp, xtraParams, forcedFlag);
-						// END confirm QC Transfer
-						
 						System.out.println("In CASE 2 #######");	
 						sql="UPDATE qc_order set test_stat='R' where QORDER_NO=?";
 						pstmt = conn.prepareStatement(sql);
@@ -328,6 +328,13 @@ QcOdrProvisionalReleaseConfLocal, QcOdrProvisionalReleaseConfRemote
 						
 						System.out.println("Qc orser update count &&&&&&&:-"+cnt);
 						
+						// To confirm QC Transfer send tranIdForDesp, xtraParams, forcedFlag
+						
+						retString=qcTrnsCnf.confirm(tranIdForDesp, xtraParams, forcedFlag,conn);
+						// END confirm QC Transfer
+						
+						System.out.println("RET String after confirm :- ["+retString+"]");
+						if (retString.indexOf("VTCONFIRM") > -1){
 						errCode = "VTQCTRNSCC";// Message after successful Transfer
 						errString = itmDBAccessLocal.getErrorString("",errCode,"");
 						return errString;
@@ -340,6 +347,13 @@ QcOdrProvisionalReleaseConfLocal, QcOdrProvisionalReleaseConfRemote
 						}
 					}
 					else
+					{
+						errCode = "VTWOCFAIL";// Transaction fail.
+						errString = itmDBAccessLocal.getErrorString("",errCode,"");
+						return errString;
+					}
+				}					
+				else
 				{
 					System.out.println("In Else Found Validation error &&&&&&&");
 					return errString;