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

webitm-dis/ibase/webitm/ejb/dis/adv/StockTransferConf.java

@@ -129,7 +129,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 		String invStatLocCodeTo =""; //added by Ashish Sonawane on 05/SEP/12 for partial GRL location Inventory Status.
 		PreparedStatement pstmtInvStat =null;
 		ResultSet rsInvStat =null;
-
+	 String ledgPostConf= ""; // Added By PRiyankaC 
 
 		int lineNo = 0, updCnt = 0;
 
@@ -165,7 +165,8 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 		double qtyPerArt=0,stknoArt=0,partnoArt=0;//Added by manoj dtd 24/06/2014
 		PreparedStatement pstmt2=null;
 		ResultSet rs2=null;
-		
+		java.sql.Timestamp stockDate = null;
+		int cnt = 0;
 		try
 		{
 			if ( conn == null )
@@ -213,7 +214,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 			stockMap = new HashMap();
 			stkUpdate = new StockUpdate();
 
-			sql = "SELECT CONFIRMED, SITE_CODE FROM STOCK_TRANSFER WHERE TRAN_ID = ?";
+			sql = "SELECT CONFIRMED, SITE_CODE ,TRAN_DATE FROM STOCK_TRANSFER WHERE TRAN_ID = ?";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, tranId);
 			rs = pstmt.executeQuery();
@@ -221,6 +222,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 			{
 				confirmed = rs.getString( "CONFIRMED" );
 				siteCode = rs.getString( "SITE_CODE" );
+				stockDate = rs.getTimestamp( "TRAN_DATE" );
 			}
 			rs.close();rs = null;
 			pstmt.close();pstmt = null;
@@ -233,9 +235,53 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 			else
 			{
 				// 24/06/12 manoharan if transfer to near expiry not to transfer the hold quantity
-				//nearExpLoc = dComm.getDisparams("999999","NEAREXP_LOC",conn);
+				//nearExpLoc = dComm.getDisparaSTOCK_TRANSFERms("999999","NEAREXP_LOC",conn);
 				//partialGrlLoc = dComm.getDisparams("999999","PGRL_INVSTAT",conn);
+                
+				//Added by PriyankaC on 10June2019 [start]
+				sql = "select (case when LEDG_POST_CONF is null then 'N' else LEDG_POST_CONF end ) as ledgpostconf from transetup where lower(tran_window) = ?";
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1, "w_stock_transfer");
+				rs = pstmt.executeQuery();
+				if (rs.next()) 
+				{
+					ledgPostConf = rs.getString("ledgpostconf");
+				}
+				if (ledgPostConf == null && ledgPostConf.trim().length() < 0)
+				{
+					ledgPostConf = "N";
+				}
+				
+				if (ledgPostConf != null && "Y".equalsIgnoreCase(ledgPostConf.trim()))
+				{
+					System.out.println("Inside ledgPostConf staus :");
 
+					sql =   "UPDATE STOCK_TRANSFER  CONF_DATE = ? " +
+							"WHERE TRAN_ID = ? ";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setTimestamp(1, tranDate);
+					pstmt.setString(2, tranId);	
+					cnt = pstmt.executeUpdate();
+					if (cnt < 0)
+					{
+						retString = itmDBAccess.getErrorString("","DS000","","",conn);
+						return retString;
+					}
+					pstmt.close();
+					pstmt = null;
+				}
+				else
+				{
+					System.out.println("Inside ledgPostConf  : " +stockDate +" todays date" +tranDate);
+					tranDate = stockDate;
+				}
+				rs.close();
+				rs = null;
+				pstmt.close();
+				pstmt = null;
+				
+				//Added by PriyankaC on 10Jul2019 [END]
+				
 				sql = "SELECT LINE_NO, ITEM_CODE, QUANTITY, LOC_CODE__FR, LOC_CODE__TO, LOT_NO__FR, LOT_SL__FR, LOT_SL__TO, ACCT_CODE__CR, CCTR_CODE__CR, NO_ART ,LOT_NO__TO " +
 					  ",acct_code__dr,cctr_code__dr  " +             // added by cpatil on 20/11/13 compare with pb code and adding missing field
 					  "FROM STOCK_TRANSFER_DET WHERE TRAN_ID = ? ";
@@ -746,7 +792,10 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 						updateRowMap.put("no_art", noArt);
 					}
 					*/
-					updateRowMap.put("no_art", calcnoArt+partnoArt);
+					//Changed By PriyankaC to set noof article from stock transfer detail on 09june2019..[Start]
+					//updateRowMap.put("no_art", calcnoArt+partnoArt);
+					updateRowMap.put("no_art", noArt);
+				//	Changed By PriyankaC to set noof article from stock transfer detail on 09june2019. [END]
 					//Chnaged by Rohan on 29-07-13 for setting no art as quantity  in case of location code to is PGRL.end
 					/* Added by Ashish Sonawane on 07-sep-12 as per Manoharan Sir in case of partial GRL no_art to be set as quantity at the time of receipt [END] */
 					//Chnaged by Rohan on 19-08-13 for updating atual rate in transfered stock.
@@ -803,18 +852,20 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 				rs.close();rs = null;
 				pstmt.close();pstmt = null;
 				pstmtStock.close();pstmtStock = null;
-
+				
 				if ( retString == null || retString.trim().length() == 0 )
 				{
-					updateSql = "UPDATE STOCK_TRANSFER SET CONFIRMED = 'Y', CONF_DATE = ?, EMP_CODE__APRV = ? " +
-							"WHERE TRAN_ID = ? ";
+
+					updateSql = "UPDATE STOCK_TRANSFER SET CONFIRMED = 'Y', EMP_CODE__APRV = ? " +
+							    "WHERE TRAN_ID = ? ";
 					pstmt = conn.prepareStatement(updateSql);
-					pstmt.setTimestamp(1, currDate);
-					pstmt.setString(2, empCode);
-					pstmt.setString(3, tranId);				
+					pstmt.setString(1, empCode);
+					pstmt.setString(2, tranId);				
 
 					updCnt = pstmt.executeUpdate();
-					pstmt.close();pstmt = null;
+					pstmt.close();
+					pstmt = null;
+
 
 					if( updCnt > 0 )
 					{