Commit a0c954fd authored by prane's avatar prane

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@175093 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 2a6f2ec2
......@@ -5404,7 +5404,10 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
String ls_empfname = "", ls_empmname = "", ls_emplname = "", ls_supp_code__mnfr = "", ls_item_code = "", ls_taxclasshdr = "", ls_taxchaphdr = "";
String ldt_orddateStr = "", ls_pricelist = "", ls_unitstd = "";
ArrayList lc_qtystduom = null;
ArrayList<String> lc_ratestduomArrayList = new ArrayList<String>();
//Change by Pavan R 1/DEC/17 Start
//ArrayList<String> lc_ratestduomArrayList = new ArrayList<String>();
ArrayList lc_ratestduomArrayList = new ArrayList();
//Change by Pavan R 1/DEC/17 End
double mNum = 0, mNum1 = 0, mNum2 = 0, mNum3 = 0, lc_stdrate = 0;
double lc_disc = 0, lc_rate__clg = 0;
double lc_qty = 0, lc_sale_qty = 0, lc_temp = 0, lc_qtystd = 0, ld_std_code = 0, lc_actual_cost = 0;
......@@ -8569,6 +8572,12 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
// (ls_pricelist,ldt_orddate,mcode,' ','L');
lc_stdrate = distComm.pickRate(ls_pricelist,
ldt_orddateStr, mcode, " ", "L", conn);
//Added by Pavan R 1/DEC/17 Start
System.out.println("ls_pricelist ["+ls_pricelist+"]");
System.out.println("ldt_orddateStr ["+ldt_orddateStr+"]");
System.out.println("mcode ["+mcode+"]");
System.out.println("lc_stdrate ["+lc_stdrate+"]");
//Added by Pavan R 1/DEC/17 End
} // end if
......@@ -8617,6 +8626,9 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
valueXmlString.append("<unit__std>")
.append("<![CDATA[" + uom + "]]>")
.append("</unit__std>");
//Added by Pavan R 1/DEC/17 Start
setNodeValue(dom, "unit__std", uom);
//Added by Pavan R 1/DEC/17 End
// dw_detedit[ii_currformno].SetItem(1,"unit", ls_unitpur)
valueXmlString.append("<unit>")
.append("<![CDATA[" + ls_unitpur + "]]>")
......@@ -8626,7 +8638,9 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
valueXmlString.append("<unit__rate>")
.append("<![CDATA[" + ls_rate_unit + "]]>")
.append("</unit__rate>");
//Added by Pavan R 1/DEC/17 Start
setNodeValue(dom, "unit__rate", ls_rate_unit);
//Added by Pavan R 1/DEC/17 End
if (!uom.trim().equalsIgnoreCase(ls_unitpur.trim())) {
// lc_qty = dw_detedit[ii_currformno].GetItemNumber(1,
// "quantity")
......@@ -9018,15 +9032,17 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
// dw_detedit[ii_currformno].getitemstring(1,"unit__rate")
ls_unitpur = genericUtility.getColumnValue(
"unit__rate", dom);
System.out.println("Unit::["+ls_unitpur+"]");
if (ls_pricelist != null
&& ls_pricelist.trim().length() > 0) {
// lc_rate = nvo_dis_obj.gbf_pick_rate(ls_pricelist,
// ldt_orddate, mcode, ' ','L',lc_qty,ls_unitpur)
System.out.println("POrderIc pickRate() called....");
lc_rate = distComm.pickRate(ls_pricelist,
ldt_orddateStr, mcode, " ", "L", lc_qty,
ls_unitpur, conn);
System.out.println("@@@@@@@7452 lc_rate[" + lc_rate
+ "] ");
System.out.println("@9035 ls_pricelist ["+ls_pricelist+"]ldt_orddateStr ["+ldt_orddateStr+"]mcode ["+mcode+"]lc_rate ["+lc_rate+"]");
System.out.println("@@@@@@@7452 lc_rate[" + lc_rate+ "] ");
if (lc_rate > 0) {
// dw_detedit[ii_currformno].setitem(1,"rate",lc_rate)
valueXmlString.append("<rate>")
......@@ -9049,6 +9065,9 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
.getColumnValue(
"conv__rtuom_stduom",
dom));
System.out.println("mVal1:-["+mVal1+"]");
System.out.println("lsValue:-["+lsValue+"]");
if(convRtuomStduom != null && convRtuomStduom.trim().length() >0)
{
lc_conv = Double.parseDouble(convRtuomStduom);
......@@ -9063,7 +9082,10 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
} else {
// lc_ratestduom = gf_conv_qty_fact1(mVal1,
// ls_unitpur, mcode, lc_rate, lc_conv,'N')
System.out.println("lsValue != R OR B then convQtyFactor called at 9075.........");
System.out.println("mVal1:-"+mVal1+"|ls_unitpur:-"+ls_unitpur+"|lc_rate:-"+lc_rate+"|lc_conv:-"+lc_conv);
lc_ratestduomArrayList = distComm.convQtyFactor(mVal1, ls_unitpur,mcode, lc_rate, lc_conv,conn);
System.out.println("lc_ratestduomArrayList....:-"+lc_ratestduomArrayList);
}
// End If
// End Sharon
......@@ -9072,23 +9094,27 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
// If Conversion factor is not entered change
// it.
System.out.println("lc_convtemp:--"+lc_convtemp);
if (lc_convtemp == 0) {
// dw_detedit[ii_currformno].SetItem(1,"conv__rtuom_stduom",
// lc_conv)
System.out.println("inside if in ls_convtemp...");
valueXmlString
.append("<conv__rtuom_stduom>")
.append("<![CDATA[" + lc_conv
+ "]]>")
.append("<![CDATA[" + lc_conv + "]]>")
.append("</conv__rtuom_stduom>");
}
// end if
// dw_detedit[ii_currformno].SetItem(1,"rate__stduom",
// lc_ratestduom)
System.out.println("lc_ratestduomArra--"+lc_ratestduomArrayList.get(1));
System.out.println("lc_ratestduomArrayList.get(0)----:[1");
System.out.println("lc_ratestduomArrayList.get(0)----:["+lc_ratestduomArrayList.get(0)+"]");
System.out.println("lc_ratestduomArrayList.get(0)----:[2");
valueXmlString
.append("<rate__stduom>")
.append("<![CDATA["
+ lc_ratestduomArrayList.get(0)
+ "]]>")
.append("<![CDATA[" + Double.parseDouble(lc_ratestduomArrayList.get(1).toString()) + "]]>")
.append("</rate__stduom>");
} else {
lc_rate = -1;
......@@ -9745,6 +9771,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
// (ls_price_list__clg,ldt_orddate,mcode,' ','L')
lc_rate__clg = distComm.pickRate(ls_price_list__clg,
ldt_orddateStr, mcode, " ", "L", conn);
System.out.println("@@9755 lc_rate__clg ["+lc_rate__clg+"]");
// added by prajakta 06/05/06
if (lc_rate__clg == -1) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment