Bug fix- changes in gbf_calc_detdisc_amt(set wrong value in sql)

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

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

@@ -5707,7 +5707,8 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
 								else	//list_type = 'I'
 								{
 									//lc_pick_rate = nvo_dis.gbf_pick_rate(ls_price_list,ld_desp_date,ls_item_code,ls_site_code+"~t"+ls_loc_code+"~t"+ls_lot_no,"I",lc_sord_quantity);
-									lc_pick_rate = distCommon.pickRate(ls_price_list, despDateStr, ls_item_code, ls_site_code+"~t"+ls_loc_code+"~t"+ls_lot_no, "I", lc_sord_quantity, conn);
+									//lc_pick_rate = distCommon.pickRate(ls_price_list, despDateStr, ls_item_code, ls_site_code+"~t"+ls_loc_code+"~t"+ls_lot_no, "I", lc_sord_quantity, conn);
+									lc_pick_rate = distCommon.pickRate(ls_price_list, despDateStr, ls_item_code,ls_lot_no, "I", lc_sord_quantity, conn);
 								}//	end if
 
 							}//	end if 
@@ -5773,7 +5774,7 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
 									else // if ll_count > 0 then
 									{
 										//lc_pick_rate = nvo_dis.gbf_pick_rate(ls_price_list,ld_desp_date,ls_item_code,ls_site_code+"~t"+ls_loc_code+"~t"+ls_lot_no,"I",lc_sord_quantity);
-										lc_pick_rate = distCommon.pickRate(ls_price_list, despDateStr, ls_item_code, ls_site_code+"~t"+ls_loc_code+"~t"+ls_lot_no, "I", lc_sord_quantity, conn);
+										lc_pick_rate = distCommon.pickRate(ls_price_list, despDateStr, ls_item_code,ls_lot_no, "I", lc_sord_quantity, conn);
 									}
 									//		end if
 									//added by prajakta as insisted by manoharji on 31/07/06 as it was not setting std rate
@@ -5793,7 +5794,8 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
 					if( lenTrim(ls_price_list__clg) > 0 )
 					{
 						//lc_pick_rate__clg = nvo_dis.gbf_pick_rate(ls_price_list__clg ,ld_desp_date,ls_item_code,ls_site_code+"~t"+ls_loc_code+"~t"+ls_lot_no,"B",lc_sord_quantity);
-						lc_pick_rate__clg = distCommon.pickRate(ls_price_list__clg, despDateStr, ls_item_code, ls_site_code+"~t"+ls_loc_code+"~t"+ls_lot_no, "B", lc_sord_quantity, conn);
+						//lc_pick_rate__clg = distCommon.pickRate(ls_price_list__clg, despDateStr, ls_item_code, ls_site_code,ls_loc_code,ls_lot_no, "B", lc_sord_quantity, conn);
+						lc_pick_rate__clg = distCommon.pickRate(ls_price_list__clg, despDateStr, ls_item_code,ls_lot_no, "B", lc_sord_quantity, conn);
 						valueXmlString.append("<rate__clg>").append("<![CDATA["+lc_pick_rate__clg+"]]>").append("</rate__clg>");
 					}
 					else
@@ -5988,7 +5990,7 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
 			{
 
 				sql1 = " select promo_term,price_var,rnd_off,rnd_to " +
-						" from bom 	where bom_code = :ls_schemedet " ; 
+						" from bom 	where bom_code = ? " ; 
 				pstmt1 = conn.prepareStatement(sql1);
 				pstmt1.setString(1, ls_schemedet);
 				rs1 = pstmt1.executeQuery();
@@ -6006,7 +6008,7 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
 
 
 				sql1 = " select disc_perc ,disc_type " +
-						" from bom where  bom_code = :ls_schemedet ";
+						" from bom where  bom_code = ? ";
 				pstmt1 = conn.prepareStatement(sql1);
 				pstmt1.setString(1, ls_schemedet);
 				rs1 = pstmt1.executeQuery();