Changed by Manish on 30/04/16

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

webitm-dis/ibase/webitm/ejb/dis/DespatchConfirm.java

@@ -168,7 +168,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 		PreparedStatement pstmt = null, pstmt1 = null ,pstmt3 = null ;
 		ResultSet rs = null, rs1 = null,rs3 = null;
 		String sql = "",sql1 = "",sql3 = "";
-		String confirm = "";
+		String confirm = "", ledgPostConf = "";
 		String errString = "",holdFlag = "",holdFlagNew = "",invStat = "",grade = "",tranSer = "",gpSer = "",gpNo = "",siteCodeExc = ""; 
 		String statusDesp = "",channelPartner = "",lockLevel = "",isAllocated = "",varValue = "",disLink = "";
 		String availableYN = "",tranid = "",siteCode = "",disparmVal = "",sordNo = "",lineNo = "",lineNoSord = "",expLev = "",itemCodeOrd = "",itemCode = "",lotNo = "",lotSl = "",locCode = "",unitStd = "";
@@ -184,10 +184,11 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 		E12GenericUtility genericUtility = new E12GenericUtility();
 		//ConnDriver connDriver = null;
 		ITMDBAccessEJB itmDBAccessEJB = null;
-		Timestamp despDate = null,gpDate = null;
+		Timestamp despDate = null,gpDate = null,lrDate = null;
 		int cnt = 0,editOption = 0,detCount = 0;
 		boolean isLocal=false;
 		String autoInvOnDesp="";
+		boolean lockSuccess = false;
 		try
 		{
 			itmDBAccessEJB = new ITMDBAccessEJB();
@@ -202,18 +203,85 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
          isLocal=true;
        	}*/
 
-			sql = "select confirmed from despatch where desp_id = ?";
+			// Changed by Manish on 28/04/16 for update nowait [start]
+			//	sql = "select confirmed from despatch where desp_id = ?";
+			if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
+			{
+				sql = "select confirmed, lr_date from despatch where desp_id = ? for update ";
+			}
+
+			else if ( "mssql".equalsIgnoreCase(CommonConstants.DB_NAME ))
+			{
+				sql = "select confirmed, lr_date from despatch (updlock) where desp_id = ? " ;
+			}
+			
+			else
+			{
+				sql = "select confirmed, lr_date from despatch where desp_id = ? for update nowait" ;
+			}
+
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1,tranId);
 			rs = pstmt.executeQuery();
 			if(rs.next())
 			{
+				lockSuccess = true;
 				confirm = rs.getString("confirmed");
+				lrDate = rs.getTimestamp("lr_date");
+			}
+			else
+			{
+				lockSuccess = false;
+				throw new Exception("Transaction is locked, Please try after some time");
 			}
 			rs.close();
 			rs = null;
 			pstmt.close();
 			pstmt = null;
+
+			sql = "select ledg_post_conf from transetup where tran_window = 'w_despatch' ";
+			pstmt = conn.prepareStatement(sql);
+			rs = pstmt.executeQuery();
+			if(rs.next())
+			{
+				ledgPostConf = rs.getString("ledg_post_conf");
+			}
+			rs.close();
+			rs = null;
+			pstmt.close();
+			pstmt = null;
+
+			if("Y".equalsIgnoreCase(ledgPostConf))
+			{
+				System.out.println("lrDate is["+lrDate+"]");
+				if(lrDate != null)
+				{
+					despDate = lrDate;
+				}
+				else
+				{
+					despDate = new Timestamp(System.currentTimeMillis());
+				}
+				
+				System.out.println("despDate is["+despDate+"]");
+				
+				sql =  "update despatch set desp_date = ? "
+					+" where desp_id = ? ";
+
+				pstmt1 = conn.prepareStatement(sql);
+				pstmt1.setTimestamp(1,despDate);
+				pstmt1.setString(2,tranId);
+				int count = pstmt1.executeUpdate();
+
+				System.out.println("Count value after updating despatch...."+count);
+
+				pstmt1.close();
+				pstmt1 = null;		
+			}
+			
+			
+			// Changed by Manish on 28/04/16 for update nowait [end]
+
 			if(confirm != null  && "Y".equalsIgnoreCase(confirm))
 			{
 				System.out.println("The Selected transaction is already confirmed");
@@ -222,8 +290,6 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 			}
 			else
 			{
-
-
 				sql = "select status,desp_date,available_yn,desp_id,site_code,sord_no,cust_code__dlv,cust_code,gp_date,gp_ser,gp_no "
 					+ " from despatch where desp_id = ? ";// QUERY OF SRD TO BE COPIED...........
 				pstmt = conn.prepareStatement(sql);
@@ -1385,19 +1451,19 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 							advAdjMode = checkNull(distCommon.getDisparams("999999","ADJ_ADV_CUST_SALE",conn));
 
 							System.out.println("@@@@@adjDrcr["+adjDrcr+"]adjCustAdv["+adjCustAdv+"]adjNewProdInv["+adjNewProdInv+"]advAdjMode["+advAdjMode+"]");
-							
+
 							PostOrderProcess postOrderProcess = new PostOrderProcess();
 							// fromSaleOrder,   toSaleOrder, fromCustCode,   toCustCode, tranIdDespatch,  orderType, fromDate, clubOrder, clubPendingOrd, adjDrcr, adjCustAdv, advAdjMode, adjNewProdInv, siteCodeShip, conn
 							long startTime = System.currentTimeMillis();
 							System.out.println("START TIME FOR POST ORDER PROCESS IN SECONDS:::["+startTime/1000+"]");
-							
+
 							errString= postOrderProcess.invPosting( fromSaleOrder, fromSaleOrder, fromCustCode, fromCustCode, tranId ,  orderType, fromDate, clubOrder, clubPendingOrd, adjDrcr, adjCustAdv, advAdjMode, adjNewProdInv, siteCodeShip, conn);
 
 							long endTime = System.currentTimeMillis();
 							System.out.println("END TIME FOR POST ORDER PROCESS IN SECONDS:::["+endTime/1000+"]");
 							System.out.println("DIFFERANCE IN TIME FOR POST ORDER PROCESS IN SECONDS:::["+(endTime-startTime)/1000+"]for SALE_ORDER["+fromSaleOrder+"]");
 
-							
+
 							System.out.println("@@@@@@@@@689 invPosting() errString::::::["+errString+"]");
 							if(errString.indexOf("Success") > -1)
 							{