Commit 3b5908f8 authored by manohar's avatar manohar

Bug fixing conversion factor assigned to std, quantity and rate instead of...

Bug fixing conversion factor assigned to std, quantity and rate instead of converted quantity or rate, corrected


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@24590 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a287343d
...@@ -3119,7 +3119,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde ...@@ -3119,7 +3119,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
quantity = pendqty; quantity = pendqty;
quantityList = disscommon.convQtyFactor(unitPur, unit, itemCode, quantity, conv_qty_stduom, conn); quantityList = disscommon.convQtyFactor(unitPur, unit, itemCode, quantity, conv_qty_stduom, conn);
quantity = Double.parseDouble( quantityList.get(0).toString() ); quantity = Double.parseDouble( quantityList.get(1).toString() );
valueXmlString.append("<conv__qty_stduom >").append("<![CDATA["+conv_qty_stduom+"]]>").append("</conv__qty_stduom>"); valueXmlString.append("<conv__qty_stduom >").append("<![CDATA["+conv_qty_stduom+"]]>").append("</conv__qty_stduom>");
if ( conv_qty_stduom == 0 ) if ( conv_qty_stduom == 0 )
{ {
...@@ -3127,7 +3127,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde ...@@ -3127,7 +3127,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
} }
valueXmlString.append("<conv__rtuom_stduom >").append("<![CDATA["+1/conv_qty_stduom+"]]>").append("</conv__rtuom_stduom>"); valueXmlString.append("<conv__rtuom_stduom >").append("<![CDATA["+1/conv_qty_stduom+"]]>").append("</conv__rtuom_stduom>");
quantityList = disscommon.convQtyFactor(unit,unitPur, itemCode, pendqty, conv_qty_stduom, conn); quantityList = disscommon.convQtyFactor(unit,unitPur, itemCode, pendqty, conv_qty_stduom, conn);
quantity = Double.parseDouble( quantityList.get(0).toString() ); quantity = Double.parseDouble( quantityList.get(1).toString() );
valueXmlString.append("<quantity__o >").append("<![CDATA["+quantity+"]]>").append("</quantity__o>"); valueXmlString.append("<quantity__o >").append("<![CDATA["+quantity+"]]>").append("</quantity__o>");
} }
valueXmlString.append("<item_descr >").append("<![CDATA["+itemDescr+"]]>").append("</item_descr>"); valueXmlString.append("<item_descr >").append("<![CDATA["+itemDescr+"]]>").append("</item_descr>");
...@@ -3240,7 +3240,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde ...@@ -3240,7 +3240,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
else else
{ {
quantityList = disscommon.convQtyFactor(unitPur,unit, itemCode, pendqty, conv_qty_stduom, conn); quantityList = disscommon.convQtyFactor(unitPur,unit, itemCode, pendqty, conv_qty_stduom, conn);
quantity = Double.parseDouble( quantityList.get(0).toString() ); quantity = Double.parseDouble( quantityList.get(1).toString() );
valueXmlString.append("<conv__rtuom_stduom >").append("1").append("</conv__rtuom_stduom>"); valueXmlString.append("<conv__rtuom_stduom >").append("1").append("</conv__rtuom_stduom>");
...@@ -3392,20 +3392,22 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde ...@@ -3392,20 +3392,22 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
itemCode = genericUtility.getColumnValue("item_code", dom); itemCode = genericUtility.getColumnValue("item_code", dom);
String conv_qty_stduomStr = genericUtility.getColumnValue("conv__qty_stduom", dom); String conv_qty_stduomStr = genericUtility.getColumnValue("conv__qty_stduom", dom);
System.out.println("1 Itemchanged of quantity [" + quantity + "] unit [" + unit + "] unitStd [" + unitStd + "] itemCode [" + itemCode + "] conv_qty_stduomStr [" + conv_qty_stduomStr + "]" );
conv_qty_stduom = conv_qty_stduomStr==null?0:Double.parseDouble(conv_qty_stduomStr); conv_qty_stduom = conv_qty_stduomStr==null?0:Double.parseDouble(conv_qty_stduomStr);
convtemp = conv_qty_stduom; convtemp = conv_qty_stduom;
if (( unitStd == null || unitStd.trim().length() == 0 ) && ( unit == null || unit.trim().length() == 0 )) //len(trim(mVal1)) = 0 then if (( unitStd == null || unitStd.trim().length() == 0 ) && ( unit == null || unit.trim().length() == 0 )) //len(trim(mVal1)) = 0 then
{ {
unitStd = setDescription("unit", "item", "item_code", itemCode, conn); unitStd = setDescription("unit", "item", "item_code", itemCode, conn);
System.out.println("2 Itemchanged of quantity [" + quantity + "] unit [" + unit + "] unitStd [" + unitStd + "] itemCode [" + itemCode + "] conv_qty_stduomStr [" + conv_qty_stduomStr + "]" );
quantityStduomList = disscommon.convQtyFactor(unit,unitStd, itemCode, quantity, conv_qty_stduom, conn); quantityStduomList = disscommon.convQtyFactor(unit,unitStd, itemCode, quantity, conv_qty_stduom, conn);
quantityStduom = Double.parseDouble( quantityStduomList.get(0).toString() ); quantityStduom = Double.parseDouble( quantityStduomList.get(1).toString() );
valueXmlString.append("<unit>").append("<![CDATA["+ unit +"]]>").append("</unit>"); valueXmlString.append("<unit>").append("<![CDATA["+ unit +"]]>").append("</unit>");
valueXmlString.append("<unit__std>").append("<![CDATA["+ unitStd +"]]>").append("</unit__std>"); valueXmlString.append("<unit__std>").append("<![CDATA["+ unitStd +"]]>").append("</unit__std>");
} }
else else
{ {
quantityStduomList = disscommon.convQtyFactor(unit,unitStd, itemCode, quantity, conv_qty_stduom, conn); quantityStduomList = disscommon.convQtyFactor(unit,unitStd, itemCode, quantity, conv_qty_stduom, conn);
quantityStduom = Double.parseDouble( quantityStduomList.get(0).toString() ); quantityStduom = Double.parseDouble( quantityStduomList.get(1).toString() );
} }
if ( convtemp == 0 ) if ( convtemp == 0 )
...@@ -3467,7 +3469,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde ...@@ -3467,7 +3469,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
valueXmlString.append("<unit__std>").append("<![CDATA["+ unitStd +"]]>").append("</unit__std>"); valueXmlString.append("<unit__std>").append("<![CDATA["+ unitStd +"]]>").append("</unit__std>");
} }
rate_stduomList = disscommon.convQtyFactor(unitStd,unitRate, itemCode, rate, conv_rtuom_stduom, conn); rate_stduomList = disscommon.convQtyFactor(unitStd,unitRate, itemCode, rate, conv_rtuom_stduom, conn);
rate_stduom = Double.parseDouble( rate_stduomList.get(0).toString() ); rate_stduom = Double.parseDouble( rate_stduomList.get(1).toString() );
valueXmlString.append("<rate__stduom>").append("<![CDATA["+ rate_stduom +"]]>").append("</rate__stduom>"); valueXmlString.append("<rate__stduom>").append("<![CDATA["+ rate_stduom +"]]>").append("</rate__stduom>");
} }
else if ( currentColumn.trim().equalsIgnoreCase("unit") ) else if ( currentColumn.trim().equalsIgnoreCase("unit") )
...@@ -3486,7 +3488,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde ...@@ -3486,7 +3488,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
//ld_qty_stduom = gf_conv_qty_fact(mcode, mVal1, itemcode, ld_qty, ld_conv_qty_stduom) //ld_qty_stduom = gf_conv_qty_fact(mcode, mVal1, itemcode, ld_qty, ld_conv_qty_stduom)
qty_stduomList = disscommon.convQtyFactor(unit,unitStd, itemCode, quantity, conv_qty_stduom, conn); qty_stduomList = disscommon.convQtyFactor(unit,unitStd, itemCode, quantity, conv_qty_stduom, conn);
qty_stduom = Double.parseDouble( qty_stduomList.get(0).toString() ); qty_stduom = Double.parseDouble( qty_stduomList.get(1).toString() );
valueXmlString.append("<conv__qty_stduom>").append("<![CDATA["+ conv_qty_stduom +"]]>").append("</conv__qty_stduom>"); valueXmlString.append("<conv__qty_stduom>").append("<![CDATA["+ conv_qty_stduom +"]]>").append("</conv__qty_stduom>");
valueXmlString.append("<quantity__stduom>").append("<![CDATA["+ qty_stduom +"]]>").append("</quantity__stduom>"); valueXmlString.append("<quantity__stduom>").append("<![CDATA["+ qty_stduom +"]]>").append("</quantity__stduom>");
} }
...@@ -3504,7 +3506,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde ...@@ -3504,7 +3506,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
} }
conv_qty_stduom = 0; conv_qty_stduom = 0;
rate_stduomList = disscommon.convQtyFactor(unitStd,unitRate, itemCode, rate, conv_qty_stduom, conn); rate_stduomList = disscommon.convQtyFactor(unitStd,unitRate, itemCode, rate, conv_qty_stduom, conn);
rate_stduom = Double.parseDouble( rate_stduomList.get(0).toString() ); rate_stduom = Double.parseDouble( rate_stduomList.get(1).toString() );
valueXmlString.append("<conv__rtuom_stduom>").append("<![CDATA["+ conv_qty_stduom +"]]>").append("</conv__rtuom_stduom>"); valueXmlString.append("<conv__rtuom_stduom>").append("<![CDATA["+ conv_qty_stduom +"]]>").append("</conv__rtuom_stduom>");
valueXmlString.append("<rate__stduom>").append("<![CDATA["+ rate_stduom +"]]>").append("</rate__stduom>"); valueXmlString.append("<rate__stduom>").append("<![CDATA["+ rate_stduom +"]]>").append("</rate__stduom>");
} }
......
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