Updated ejb component for SRC

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

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

@@ -244,7 +244,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
 		prevScheme= "" ,itemStru = "" , sqlNew = "" , mitCode = "",mitFlg = "" ,sqlin = "" ,sqlinner = "" , mslabOn = "",packCode = "",plistDisc = "",
 		mpriceList= "",listType = "",mstanCode = "",typeTaxclass = "",mstanCodeSite = "",mtaxClass = "",mtaxChap = "",mtaxEnv = "",itemserProm = "" ,
 		mgenTrans = "",morderDtDtr = "",msetLine = "" ,oldInvoiceItemSer = "" , InvoiceItemSer= "" ,locType = "" , itemSerDesc = "",lineNoo = "",
-		remarks = "" ,termId = "" ,SplitCodeNew = "" ,crTerm = "" ,cctrcodeSal = "" , xmlString = "",tempSplitCode = "",splitCode = "",splitCodeIn="";
+		remarks = "" ,termId = "" ,SplitCodeNew = "" ,crTerm = "" ,cctrcodeSal = "" , xmlString = "",replPeriod="",tempSplitCode = "",splitCode = "",splitCodeIn="";
 		String[] acctcodeSal= null;
 		
 		HashMap tempMap = null;
@@ -282,7 +282,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
 			double mminQty = 0.0 ,msales = 0.0 ,mclStock = 0.0 ,integralQty = 0.0 ,mintQty = 0.0 ,mmodqty = 0.0,
 		perc = 0.0 , qtyPerc = 0.0 ,lcQty = 0.0 ,batchQty = 0.0 ,discMerge = 0.0 ,lcPlistDisc = 0.0 ,mrate = 0.0 ,sorate = 0.0 ,
 		exchRate = 0.0,mrateClg = 0.0,mtotOrdAmt = 0.0,mtotTaxAmt = 0.0,mtotNetAmt = 0.0,lcOrderStock = 0.0 ,minOrderQty = 0.0,demandQty= 0.0,
-		clStockOrg= 0.0 ,schpercTmp = 0.0 ,clStock = 0.0 ,freeQty = 0.0 ,mtaxAmt = 0.0 ,mordAmt =0.0 ,mnetAmt = 0.0 ,orderStock = 0.0  ;
+		clStockOrg= 0.0 ,schpercTmp = 0.0 ,clStock = 0.0 ,freeQty = 0.0 ,mtaxAmt = 0.0 ,mordAmt =0.0 ,mnetAmt = 0.0 ,orderStock = 0.0 ,replPrd = 0.0  ;
 		Timestamp date = null;
 		date = new java.sql.Timestamp(System.currentTimeMillis()) ;
 		SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
@@ -303,6 +303,8 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
 			//Picking DLV TERM from disparm 
 			
 			dlvTerm = distCommon.getDisparams("999999", "DLV_TERM", conn);
+			
+			
 	
 			sql = "select key_string from transetup where upper(tran_window) = 'W_SORDER'";
 			pstmt = conn.prepareStatement(sql);
@@ -346,6 +348,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
 	  		replRate             = (String) custStockMap.get("repl_rate");
 	  		System.out.println("replRate"+replRate+"morderDt"+morderDt +"msiteCd"+msiteCd +"invoiceItemSerHdr"+invoiceItemSerHdr);	
 	  		
+	  		
 	  		if("P".equalsIgnoreCase(asType))
 		  	{
 	  			if(replRate == null || replRate.trim().length() == 0) 
@@ -652,6 +655,10 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
 			System.out.println("schdtList >> "+schdtList);
 			System.out.println("astype >> "+asType);
 			
+			
+			
+			
+			
 				
 			sqlDet = " select  item_code , loc_type , line_no , item_ser , unit , sales ,  rate ," +
 				     " case when ? = 'P' then cl_stock else (cl_stock + transit_qty) end as mclStock,cust_item__ref " +
@@ -675,6 +682,98 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
 				
 				custStockSoGen = new HashMap();
 				
+				//Added by Poonam on 09-12-2016 for GET REPL_PERIOD FROM DATABASE :Start[D16HVHB005]
+				
+				
+				
+				System.out.println("custCode... :"+custCode+":itemCode...:"+mitemCd+":");
+				
+				System.out.println("In S astype....");
+				sql = "select repl_period from  customeritem where cust_code = ? and item_code = ? " ;
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString( 1, custCode );
+				pstmt.setString( 2, mitemCd );
+				rs = pstmt.executeQuery();	
+				if(rs.next())
+				{
+					replPeriod = rs.getString("repl_period");
+				}
+				rs.close();rs = null;
+				pstmt.close();pstmt = null;
+				
+				sql = "Select item_ser from item where item_code = ? " ;
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString( 1, mitemCd );
+				rs = pstmt.executeQuery();	
+				if(rs.next())
+				{
+					itemSer = checkNull(rs.getString("item_ser"));
+				}
+				rs.close();rs = null;
+				pstmt.close();pstmt = null;
+				System.out.println("mvarValue["+replPeriod+"][itemSer"+itemSer+"]");
+				
+				if(replPeriod == null  || replPeriod.trim().length() == 0)
+				{
+					sql = "select repl_period from  customer_series where cust_code = ? and item_ser = ? " ;
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString( 1, custCode );
+					pstmt.setString( 2, itemSer );
+					rs = pstmt.executeQuery();	
+					if(rs.next())
+					{
+						replPeriod = rs.getString("repl_period");
+					}
+					rs.close();rs = null;
+					pstmt.close();pstmt = null;
+					
+				}
+				
+				if(replPeriod == null  || replPeriod.trim().length() == 0)
+				{
+					sql = "select repl_period from  customer where cust_code = ?  " ;
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString( 1, custCode );
+					rs = pstmt.executeQuery();	
+					if(rs.next())
+					{
+						replPeriod = rs.getString("repl_period");
+					}
+					rs.close();rs = null;
+					pstmt.close();pstmt = null;
+					
+				}
+				if(replPeriod == null  || replPeriod.trim().length() == 0)
+				{
+					replPeriod = distCommon.getDisparams("999999", "REPL_PERIOD", conn);
+					
+					if(replPeriod == null  || replPeriod.trim().length() == 0)
+					{
+						replPeriod = "1";
+					}
+					if("NULLFOUND".equalsIgnoreCase(replPeriod))
+					{
+						replPeriod = "0";
+					}
+				}
+				System.out.println("replPeriod["+replPeriod +"]");
+				
+				if(replPeriod != null && replPeriod.trim().length() > 0)
+				{
+					 replPrd = Integer.parseInt(replPeriod);
+				}
+				System.out.println("replPrd["+replPrd +"]msales before["+msales+"]");
+				
+				if(msales != 0 && replPrd > 1)
+				{
+					msales = msales / replPrd ;
+					
+					msales= Math.round(msales);
+				}
+				System.out.println("replPrd["+replPrd +"]msales after["+msales+"]");
+				
+				//Added by Poonam on 09-12-2016 for GET REPL_PERIOD FROM DATABASE :Start[D16HVHB005]
+				
 				SplitCodeNew = invoiceItemSer  + "@"  + mlocType.trim();
 				System.out.println("SplitCodeNew First >>>"+SplitCodeNew);
 				
@@ -814,7 +913,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
 							mvarValue = "0";
 						}
 					}
-					System.out.println("mvarValue["+mvarValue +"]");
+					System.out.println("mvarValue["+mvarValue +"]msales["+msales+"]");
 					
 					
 					if(mvarValue != null && mvarValue.trim().length() > 0)
@@ -1318,6 +1417,8 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
 									rs.close();rs = null;
 									pstmt.close();pstmt = null;
 									
+									System.out.println("lcQty::::["+lcQty+"]");
+									
 									if(mmodqty < lcQty)
 									{
 										perc = (mclStock/mintQty) ;
@@ -2282,6 +2383,10 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
 							
 							System.out.println("LINE NO PLAN["+lineNo+"][LINE NO SET["+msetLine +"]");
 							
+							mclStock = Math.round(mclStock) ;
+							
+							System.out.println("mclStock IN TEMPMAP*****>>>>>"+mclStock);
+							
 							System.out.println("lineNo["+lineNo+"]");							
 							tempMap.put("item_code", mitemCd);
 							tempMap.put("item_ser", itemserProm);
@@ -2352,7 +2457,7 @@ public class CustStockOrder extends ActionHandlerEJB implements CustStockOrderLo
 				tempList = null;
 				Iterator itrItem = setItem.iterator();
 				int cnt2 = 0 ;
-				System.out.println("tempList before while >>>["+tempList +"]        "+itrItem.toString());
+				System.out.println("tempList before while >>>["+tempList +"]"+itrItem.toString());
 					
 				int w = 0 ;
 				String ordType = "";

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

@@ -43,6 +43,7 @@ public class CustStockSubmit extends ActionHandlerEJB implements CustStockSubmit
 		String errString = null;
 		ResultSet rs = null;
 		String confirm = "", custCode = "",emailId = "",name = "",msgText= "",subText = "", mailRetStr = "";
+		Date tranDate = null;
 		try
 		{
 
@@ -50,8 +51,12 @@ public class CustStockSubmit extends ActionHandlerEJB implements CustStockSubmit
 			//conn = connDriver.getConnectDB("DriverITM");
 			conn = getConnection();
 			conn.setAutoCommit(false);
+			
+			System.out.println("xtraParams"+xtraParams);
+			String userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
+			System.out.println("--login code--"+userId);
 
-			sql = " select confirmed,cust_code from cust_stock where tran_id = ?";
+			sql = " select confirmed,cust_code,tran_date from cust_stock where tran_id = ?";
 			pstmt = conn.prepareStatement( sql );
 			pstmt.setString( 1, tranId.trim());
 			rs = pstmt.executeQuery();
@@ -59,6 +64,7 @@ public class CustStockSubmit extends ActionHandlerEJB implements CustStockSubmit
 			{
 				confirm = rs.getString("confirmed");
 				custCode = rs.getString("cust_code");
+				tranDate = rs.getDate("tran_date");
 			}
 			pstmt.close();
 			pstmt = null;				
@@ -95,9 +101,9 @@ public class CustStockSubmit extends ActionHandlerEJB implements CustStockSubmit
 
 				subText = "Auto stock Replenishment generation["+tranId+"]" ;
 				
-				msgText = "Dear " + name +",\n\n "+ "\t\t Please be inform that Auto stock Replenishment is generated for tran_id : "+tranId +".\n"+
-						"You can check and verify/edit the respected transation."+
-						"\n\n"+ "Thanks and Regards,\n"+ "Development Department.";
+				msgText = "Dear " + name +",\n\n "+ 
+						"\t\t Kindly check , verify and approve the Auto stock Replenishment for tran_id : "+tranId +" generated on "+tranDate +".\n"+
+						"\n\n"+ "Thanks and Regards,\n"+ userId +" .";
 				
 				System.out.println("msgText loop" + msgText);