all changes for sun merged

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

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

@@ -2,7 +2,7 @@
 	Developed by : Niraja
 	Company : Base Information Management Pvt. Ltd
 	Version : 1.0
-	Date :01/12/2005
+	Date :01/12/2005 
 */
 
 package ibase.webitm.ejb.dis.adv;
@@ -252,7 +252,7 @@ public class AssociateAct extends ActionHandlerEJB implements AssociateActLocal,
 						sql = sql + " case when c.loc_type__parent is null then c.loc_type else c.loc_type__parent end loc_type, ";
 						if((replRate != null && replRate.trim().length() > 0) && replRate.equals("1"))
 						{
-							sql = sql + "(d.rate) ac_rate";
+							sql = sql + "(fn_get_sord_rate (b.sale_order, b.line_no)) ac_rate";
 						}
 						else
 						{
@@ -261,13 +261,13 @@ public class AssociateAct extends ActionHandlerEJB implements AssociateActLocal,
 						//sql = sql + "(case when '" + ls_repl_rate + "' = '1' then d.rate else 0 end) ac_rate ";
 						// 20/03/09 manoharan seperate connection instead of synonym
 						//sql = sql + " from sorditem_cp b, item c, sorder_cp a,	sorddet_cp d where ";
-						sql = sql + " from sorditem b, item c, sorder a,	sorddet d where ";
+  						// 27/03/09 manoharan sorddet removed and function used
+						//sql = sql + " from sorditem b, item c, sorder a,	sorddet d where ";
+						sql = sql + " from sorditem b, item c, sorder a where ";
 					  	sql = sql + " a.sale_order  = b.sale_order ";
 						sql = sql + " and 	b.item_code   = c.item_code ";
-						sql = sql + " and  b.sale_order  = d.sale_order ";
-						sql = sql + " and  b.line_no	  = d.line_no ";
-						sql = sql + " and 	b.site_code   = ? ";
-						sql = sql + " and   b.nature like ? ";
+						//sql = sql + " and  b.sale_order  = d.sale_order ";
+						//sql = sql + " and  b.line_no	  = d.line_no ";
 						if((dateFlag != null && dateFlag.trim().length() > 0) && dateFlag.equalsIgnoreCase("O") )
 						{
 							sql = sql + " and 	a.order_date >= ?"; 
@@ -275,14 +275,16 @@ public class AssociateAct extends ActionHandlerEJB implements AssociateActLocal,
 						}
 						else if((dateFlag != null && dateFlag.trim().length() > 0) && dateFlag.equalsIgnoreCase("D") )
 						{
-							sql = sql + " and 	d.dsp_date >= ?"; 
-							sql = sql + " and 	d.dsp_date <= ?"; 
+							sql = sql + " and 	fn_get_dsp_date(b.sale_order, b.line_no) >= ?"; 
+							sql = sql + " and 	fn_get_dsp_date(b.sale_order, b.line_no) <= ?"; 
 						}
+						sql = sql + " and 	b.site_code   = ? ";
+						sql = sql + " and  (case when a.order_type is null then ' ' else a.order_type end ) like '" + orderType + "'"; 
 						sql = sql + " and  (a.status is null or a.status = 'P') ";
+						sql = sql + " and   b.nature like ? ";
 						sql = sql + " and 	b.line_type  <> 'B' ";
 						sql = sql + " and  (b.quantity - qty_desp) > 0 ";
-						sql = sql + " and  (case when a.order_type is null then ' ' else a.order_type end ) like '" + orderType; 
-						sql = sql + "' ) ";
+						sql = sql + " ) ";
 						sql = sql + " group by item_code, descr, unit, loc_type , ac_rate ";
 						sql = sql + " order by descr" ;
 					}
@@ -309,8 +311,15 @@ public class AssociateAct extends ActionHandlerEJB implements AssociateActLocal,
 					pstmtCP.setString(2,mnature);
 					if((dateFlag != null && dateFlag.trim().length() > 0) && (dateFlag.equalsIgnoreCase("D") || dateFlag.equalsIgnoreCase("O") ) )
 					{
-						pstmtCP.setTimestamp(3,java.sql.Timestamp.valueOf(genericUtility.getValidDateTimeString(fromDate,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat())));
-						pstmtCP.setTimestamp(4,java.sql.Timestamp.valueOf(genericUtility.getValidDateTimeString(toDate,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat())));
+						pstmtCP.setTimestamp(1,java.sql.Timestamp.valueOf(genericUtility.getValidDateTimeString(fromDate,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat())));
+						pstmtCP.setTimestamp(2,java.sql.Timestamp.valueOf(genericUtility.getValidDateTimeString(toDate,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat())));
+						pstmtCP.setString(3,siteCode);
+						pstmtCP.setString(4,mnature);
+					}
+					else
+					{
+						pstmtCP.setString(1,siteCode);
+						pstmtCP.setString(2,mnature);
 					}
 					// end 20/03/09 manoharan seperate connection instead of synonym
 					//pstmt.setString(4,siteCode);//Added by Jiten 09/10/06 as sql changed in PB

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

@@ -25,7 +25,7 @@ import javax.ejb.Stateless; // added for ejb3
 
 @Stateless // added for ejb3
 
-public class CustStockTransitConf extends ActionHandlerEJB //implements SessionBean
+public class CustStockTransitConf extends ActionHandlerEJB implements CustStockTransitConfLocal, CustStockTransitConfRemote //implements SessionBean
 {
    /* public void ejbCreate() throws RemoteException,CreateException{
     }