W16IBAS005 updated source to add while loop and take run mode from Extra params.

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

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

@@ -22,6 +22,7 @@ import java.text.*;
 import java.sql.*;
 
 import javax.ejb.*;
+
 import ibase.webitm.ejb.MasterStatefulLocal;
 import javax.naming.InitialContext;
 import javax.xml.rpc.ParameterMode;
@@ -29,8 +30,6 @@ import org.apache.axis.client.Call;
 import org.apache.axis.client.Service;
 import org.apache.axis.encoding.XMLType;
 import org.w3c.dom.Document;
-
-
 import javax.activation.DataHandler;
 import javax.activation.DataSource;
 import javax.activation.FileDataSource;
@@ -45,6 +44,7 @@ import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeBodyPart;
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeMultipart;
+
 import ibase.utility.E12GenericUtility;
 
 @Stateless
@@ -79,6 +79,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 		double lc_sret_amt = 0, lc_inv_amt = 0, lc_amt_drcr	= 0;	
 		boolean  lb_ask_pwd=false;
 		boolean isError = false;
+		Timestamp sysDate = null;//Added by wasim on 19-MAY-2017
 		try
 		{
 			conn = getConnection();
@@ -87,6 +88,11 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 
 			SimpleDateFormat sdfAppl = new SimpleDateFormat(genericUtility.getApplDateFormat());
 			String currDateStr = sdfAppl.format(currDate);
+			//Added by wasim on 19-MAY-2017 to get current Date without Timestamp
+			sysDate = Timestamp.valueOf(genericUtility.getValidDateString(currDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
+			
+			//Added by wasim on 19-MAY-2017 to get GS_MODE from Xtra Params as per manohar sir
+			gs_run_mode = checkNullAndTrim((genericUtility.getValueFromXTRA_PARAMS(xtraParams, "runMode"))); 
 			
 			sql = "select invoice_id, full_ret,status,confirmed,cust_code__trf from sreturn where tran_id = ? ";
 			pstmt = conn.prepareStatement(sql);
@@ -357,7 +363,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 					pstmt = conn.prepareStatement(sql);
 					//Changed by wasim on 15-may-2017 to set current date in Time stamp in prepared statement
 					//pstmt.setString(1,currDateStr );
-					pstmt.setTimestamp(1,currDate );
+					pstmt.setTimestamp(1,sysDate );
 					pstmt.setString(2,msalereturn );
 					int rowcnt = pstmt.executeUpdate();
 					if (pstmt != null)
@@ -513,7 +519,12 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 		UtilMethods utilMethods = UtilMethods.getInstance();
 		ArrayList tempList = new ArrayList();
 		InvHoldGen invHoldGen = new InvHoldGen();
+		//Added by wasim 
 		boolean isError = false;
+		Timestamp sysDate = null;
+		ResultSet rsDetail = null;
+		PreparedStatement pstmtDetail = null;
+		
 		try
 		{
 			System.out.println("------------------- Inside confirmSalesReturn --------------- ");
@@ -521,7 +532,12 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
 
 			SimpleDateFormat sdfAppl = new SimpleDateFormat(genericUtility.getApplDateFormat());
-			String currDateStr = sdfAppl.format(currDate);
+			String currDateStr = sdfAppl.format(currDate.getTime());
+			//Added by wasim on 19-MAY-2017 to get current without Timestamp
+			sysDate = Timestamp.valueOf(genericUtility.getValidDateString(currDateStr, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
+			
+			//Added by wasim on 19-MAY-2017 to get GS_MODE from Xtra Params as per manohar sir
+			gs_run_mode = checkNullAndTrim((genericUtility.getValueFromXTRA_PARAMS(xtraParams, "runMode"))); 
 			chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
 			chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId");
 
@@ -552,13 +568,15 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 			{
 				// No vale is initialized for gs_run_mode
 				System.out.println("---------- gs_run_mode  ---------------"+gs_run_mode);
-				if("B".equalsIgnoreCase(gs_run_mode))
+				//Changed by wasim on 19-MAY-2017 to check runMode as not equal to B
+				//if("B".equalsIgnoreCase(gs_run_mode))
+				if(!"B".equalsIgnoreCase(gs_run_mode))
 				{
 					sql = "update sreturn set tran_date = ? where tran_id = ?";
 					pstmt = conn.prepareStatement(sql);
 					//Changed by wasim on 15-may-2017 to set current date in Time stamp in prepared statement
 					//pstmt.setString(1,currDateStr );
-					pstmt.setTimestamp(1,currDate );
+					pstmt.setTimestamp(1,sysDate );
 					pstmt.setString(2,msalereturn );
 					int rowcnt = pstmt.executeUpdate();
 					if (pstmt != null)
@@ -567,29 +585,39 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 						pstmt = null;
 					}
 				}
+			}	
 				
-				sql = "select b.reas_code, b.quantity, b.rate, a.eff_date, b.invoice_id , b.item_code, a.cust_code	,b.line_no__inv, b.full_ret ,b.line_no__invtrace, b.line_no, a.ret_opt,	b.lot_no, b.lot_sl " +
+				//Changed by wasim on 19-MAY-2017 for changing prepared statement and result set variables because while loop used [START]
+				/*sql = "select b.reas_code, b.quantity, b.rate, a.eff_date, b.invoice_id , b.item_code, a.cust_code	,b.line_no__inv, b.full_ret ,b.line_no__invtrace, b.line_no, a.ret_opt,	b.lot_no, b.lot_sl " +
 				" from sreturn a,sreturndet b where a.tran_id = b.tran_id and a.tran_id = ? ";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1,msalereturn );
 				rs = pstmt.executeQuery();
 				if(rs.next())
-				{										
-					ls_reas_code = checkNullAndTrim(rs.getString(1));
-					lc_qty = rs.getDouble(2);
-					lc_rate = rs.getDouble(3);
-					ld_eff_date = rs.getDate(4);
-					ls_invoice_id = checkNullAndTrim(rs.getString(5));
-					ls_item_code = checkNullAndTrim(rs.getString(6));
-					ls_cust_code = checkNullAndTrim(rs.getString(7));
-					ll_line_no_inv = rs.getInt(8);
-					ls_full_ret = checkNullAndTrim(rs.getString(9));
-					ll_line_no__invtrace = rs.getInt(10);
-					ll_line_no = rs.getInt(11);
-					ls_ret_opt = checkNullAndTrim(rs.getString(12));
-					ls_lot_no = checkNull(rs.getString(13));
-					ls_lot_sl = checkNull(rs.getString(14));
-				}
+				 */
+				sql = "select b.reas_code, b.quantity, b.rate, a.eff_date, b.invoice_id , b.item_code, a.cust_code	,b.line_no__inv, b.full_ret ,b.line_no__invtrace, b.line_no, a.ret_opt,	b.lot_no, b.lot_sl " +
+					" from sreturn a,sreturndet b where a.tran_id = b.tran_id and a.tran_id = ? ";
+				pstmtDetail = conn.prepareStatement(sql);
+				pstmtDetail.setString(1,msalereturn );
+				rsDetail = pstmtDetail.executeQuery();
+				while(rsDetail.next())
+				{
+				//Changed by wasim on 19-MAY-2017 for changing prepared statement and result set variables becuasue while loop used [END]	
+					ls_reas_code = checkNullAndTrim(rsDetail.getString(1));
+					lc_qty = rsDetail.getDouble(2);
+					lc_rate = rsDetail.getDouble(3);
+					ld_eff_date = rsDetail.getDate(4);
+					ls_invoice_id = checkNullAndTrim(rsDetail.getString(5));
+					ls_item_code = checkNullAndTrim(rsDetail.getString(6));
+					ls_cust_code = checkNullAndTrim(rsDetail.getString(7));
+					ll_line_no_inv = rsDetail.getInt(8);
+					ls_full_ret = checkNullAndTrim(rsDetail.getString(9));
+					ll_line_no__invtrace = rsDetail.getInt(10);
+					ll_line_no = rsDetail.getInt(11);
+					ls_ret_opt = checkNullAndTrim(rsDetail.getString(12));
+					ls_lot_no = checkNull(rsDetail.getString(13));
+					ls_lot_sl = checkNull(rsDetail.getString(14));
+				/*}
 				if (rs != null)
 				{
 					rs.close();
@@ -600,7 +628,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 					pstmt.close();
 					pstmt = null;
 				}
-			}
+			}*/
 			
 					System.out.println("---------- ls_invoice_id  ---------------"+ls_invoice_id);
 					if(ls_invoice_id != null && ls_invoice_id.length() > 0)
@@ -910,6 +938,19 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 							}
 						}	
 					}
+		    //Added by wasim on 19-MAY-2017 for while loop instead of if loop [END]
+				}//While loop END for Sales return Detail
+				if (rsDetail != null)
+				{
+					rsDetail.close();
+					rsDetail = null;
+				}
+				if (pstmtDetail != null)
+				{
+					pstmtDetail.close();
+					pstmtDetail = null;
+				}
+			//Added by wasim on 19-MAY-2017 for while loop instead of if loop [END]
 			
 			sql = "Select site_code, item_ser, tran_date, invoice_id, eff_date , cust_code, ret_opt, tran_type, case when site_code__dlv is null then site_code else site_code__dlv end from sreturn where tran_id = ?";
 			pstmt = conn.prepareStatement(sql);
@@ -1157,43 +1198,51 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 			}
 			ls_sretinvqty = distCommon.getDisparams("999999","SRET_INV_QTY",conn) ;
 
-			sql = "Select line_no, item_code, quantity__stduom, ret_rep_flag, unit__std, loc_code, lot_no, lot_sl, mfg_date, exp_date, site_code__mfg, cost_rate, reas_code, pack_code, full_ret, physical_qty, no_art, line_no__inv,	line_no__invtrace ,	gross_weight, tare_weight, net_weight From sreturndet where tran_id	= ? Order by line_no";
+			//Changed by wasim on 19-MAY-2017 for changing prepared statements for while loop [START]
+			/*sql = "Select line_no, item_code, quantity__stduom, ret_rep_flag, unit__std, loc_code, lot_no, lot_sl, mfg_date, exp_date, site_code__mfg, cost_rate, reas_code, pack_code, full_ret, physical_qty, no_art, line_no__inv,	line_no__invtrace ,	gross_weight, tare_weight, net_weight From sreturndet where tran_id	= ? Order by line_no";
 			pstmt=conn.prepareStatement(sql);
 			pstmt.setString(1, msalereturn);
-			rs = pstmt.executeQuery();
-			if(rs.next())
-			{
-				mline_no = checkNullAndTrim(rs.getString(1));
-				mitem_code = checkNullAndTrim(rs.getString(2));
-				mquantity = rs.getDouble(3);
-				mflag = checkNullAndTrim(rs.getString(4));
-				munit = checkNullAndTrim(rs.getString(5));
-				mloc_code = checkNullAndTrim(rs.getString(6));
-				mlot_no = checkNull(rs.getString(7));
-				mlot_sl = checkNull(rs.getString(8));
+			rs = pstmt.executeQuery();*/
+			sql = "Select line_no, item_code, quantity__stduom, ret_rep_flag, unit__std, loc_code, lot_no, lot_sl, mfg_date, exp_date, site_code__mfg, cost_rate, reas_code, pack_code, full_ret, physical_qty, no_art, line_no__inv,	line_no__invtrace ,	gross_weight, tare_weight, net_weight From sreturndet where tran_id	= ? Order by line_no";
+			pstmtDetail=conn.prepareStatement(sql);
+			pstmtDetail.setString(1, msalereturn);
+			rsDetail = pstmtDetail.executeQuery();
+			//Changed by wasim on 19-MAY-2017 for changing prepared statements for while loop [END]
+			//Changed by wasim on 19-MAY-2017 to use while loop instead of if for multiple lines in sales return details
+			//if(rs.next())
+			while(rsDetail.next())
+			{
+				mline_no = checkNullAndTrim(rsDetail.getString(1));
+				mitem_code = checkNullAndTrim(rsDetail.getString(2));
+				mquantity = rsDetail.getDouble(3);
+				mflag = checkNullAndTrim(rsDetail.getString(4));
+				munit = checkNullAndTrim(rsDetail.getString(5));
+				mloc_code = checkNullAndTrim(rsDetail.getString(6));
+				mlot_no = checkNull(rsDetail.getString(7));
+				mlot_sl = checkNull(rsDetail.getString(8));
 				//Changed by wasim on 16-MAY-2017 to get date in Timestamp [START]
 				//mmfg_date = rs.getDate(9);
 				//mexp_date = rs.getDate(10);
-				mmfg_date = rs.getTimestamp(9);
-				mexp_date = rs.getTimestamp(10);
+				mmfg_date = rsDetail.getTimestamp(9);
+				mexp_date = rsDetail.getTimestamp(10);
 				//Changed by wasim on 16-MAY-2017 to get date in Timestamp [END]
-				msite_code_mfg = checkNullAndTrim(rs.getString(11));
-				lc_rate = rs.getDouble(12);
-				mreas_code = checkNullAndTrim(rs.getString(13));
-				mpack_code = checkNullAndTrim(rs.getString(14));
-				mfull_ret = checkNullAndTrim(rs.getString(15));
-				lc_physicalqty = rs.getDouble(16);
-				lc_no_art = checkNullAndTrim(rs.getString(17));
-				ll_line_no_inv = rs.getInt(18);
-				ll_line_no__invtrace = rs.getInt(19);
-				lc_gross_wt = rs.getDouble(20);
-				lc_tare_wt = rs.getDouble(21);
-				lc_net_wt = rs.getDouble(22);
-			}
+				msite_code_mfg = checkNullAndTrim(rsDetail.getString(11));
+				lc_rate = rsDetail.getDouble(12);
+				mreas_code = checkNullAndTrim(rsDetail.getString(13));
+				mpack_code = checkNullAndTrim(rsDetail.getString(14));
+				mfull_ret = checkNullAndTrim(rsDetail.getString(15));
+				lc_physicalqty = rsDetail.getDouble(16);
+				lc_no_art = checkNullAndTrim(rsDetail.getString(17));
+				ll_line_no_inv = rsDetail.getInt(18);
+				ll_line_no__invtrace = rsDetail.getInt(19);
+				lc_gross_wt = rsDetail.getDouble(20);
+				lc_tare_wt = rsDetail.getDouble(21);
+				lc_net_wt = rsDetail.getDouble(22);
+			/*}
 			rs.close();
 			rs = null;
 			pstmt.close();
-			pstmt = null;
+			pstmt = null;*/
 
 				if( "Y".equalsIgnoreCase(mfull_ret))
 				{
@@ -1223,6 +1272,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 	
 				if( "R".equalsIgnoreCase(mflag))
 				{
+					System.out.println("$$$$$$$$$$$Inside Sales Return------->["+mflag+"]$$$$$$$$$$$$$$");
+					
 					sql = "Select inv_stat From location Where loc_code	= ? ";
 					pstmt=conn.prepareStatement(sql);
 					pstmt.setString(1, mloc_code);
@@ -1235,7 +1286,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 					rs = null;
 					pstmt.close();
 					pstmt = null;
-			}
+					//Changed by wasim as this closing bracket will end at after compeleting stock update for Returned tran type (R) 	
+				//}
 				
 					minvoice_id = checkNull(minvoice_id);//Added by wasim as it is giving null pointer if minvoice_id is null
 					if(minvoice_id.trim().length() >0)
@@ -1462,6 +1514,11 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 							return merrcode;
 						}
 					}
+				}//END tran type R (Sales return) by wasim on 19-MAY-2017
+				else //Added by wasim on 19-05-2017 else part for Replace (ID) 
+				{
+					System.out.println("$$$$$$$$$$$Inside Sales Replacement------->["+mflag+"]$$$$$$$$$$$$$$");
+					
 					sql = "Select (case when var_value is null then 'N' else var_value end) From finparm Where prd_code = '999999' And var_name = 'INV_ACCT_SRET'";
 					pstmt=conn.prepareStatement(sql);
 					rs = pstmt.executeQuery();
@@ -1474,7 +1531,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 					pstmt.close();
 					pstmt = null;
 		
-			if(minvoice_id.length() > 0)
+					if(minvoice_id != null && minvoice_id.length() > 0)
 					{
 						sql = "Select inv_type From invoice Where invoice_id = ? ";
 						pstmt=conn.prepareStatement(sql);
@@ -1728,6 +1785,19 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 							return errorString;
 						}
 					}
+				} //End else part for Replaced (ID) by wasim on 19-MAY-2017
+			
+			}//End while loop for sales return Details
+			//Added by wasim on 19-MAY-2017 to use while loop instead of if for multiple lines in sales return details [END]
+			if(rsDetail!=null)
+			{
+				rsDetail.close();rsDetail = null;
+			}
+			if(pstmtDetail!=null)
+			{
+				pstmtDetail.close();pstmtDetail = null;
+			}
+			//Added by wasim on 19-MAY-2017 to use while loop instead of if for multiple lines in sales return details [END]
 
 			ls_quar_lockcode = distCommon.getDisparams("999999","QUARNTINE_LOCKCODE",conn) ;
 			if("NULLFOUND".equalsIgnoreCase(ls_quar_lockcode))
@@ -2202,6 +2272,14 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 					rs.close();
 					rs = null;
 				}
+				if(rsDetail!=null)
+				{
+					rsDetail.close();rsDetail = null;
+				}
+				if(pstmtDetail!=null)
+				{
+					pstmtDetail.close();pstmtDetail = null;
+				}
 			}
 			catch(Exception e)
 			{