Commit 3490f91e authored by manohar's avatar manohar

bug fixing conversion factor wrongly set in packlist button


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91370 ce508802-f39f-4f6c-b175-0d175dae99d5
parent fde914e6
...@@ -2045,19 +2045,20 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -2045,19 +2045,20 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
//valueXmlString.append("<item_code isSrvCallOnChg='0'>").append("<![CDATA[").append(itemCode).append("]]>").append("</item_code>\r\n"); //valueXmlString.append("<item_code isSrvCallOnChg='0'>").append("<![CDATA[").append(itemCode).append("]]>").append("</item_code>\r\n");
//setNodeValue( dom, "item_code", (itemCode == null) ? "":itemCode ); //setNodeValue( dom, "item_code", (itemCode == null) ? "":itemCode );
quantity = Double.parseDouble(genericUtility.getColumnValueFromNode("quantity",currDetail)); quantity = Double.parseDouble(genericUtility.getColumnValueFromNode("quantity",currDetail));
qtyStd = quantity; qtyStd = 0;
conv = 0; conv = 0;
System.out.println("manohar 14/10/10 qtyStd 1 ["+qtyStd + "]"); System.out.println("manohar 14/10/10 qtyStd 1 ["+qtyStd + "]");
if (!unit.trim().equals(unitStd.trim())) //REMOVED NOT SYMBOL if (!unit.trim().equals(unitStd.trim())) //REMOVED NOT SYMBOL
{ {
qty = distCommon.getConvQuantityFact(unitStd, unit, itemCode, qtyStd, conv, conn); qty = distCommon.getConvQuantityFact(unit,unitStd, itemCode, quantity, conv, conn);
} }
else else
{ {
qty.add(0, new Double(1)); qty.add(0, new Double(1));
qty.add(1,new Double(qtyStd)); qty.add(1,new Double(quantity));
} }
detQty = ((Double)qty.get(1)).doubleValue(); detQty = ((Double)qty.get(1)).doubleValue();
qtyStd = ((Double)qty.get(1)).doubleValue();
conv = ((Double)qty.get(0)).doubleValue(); conv = ((Double)qty.get(0)).doubleValue();
System.out.println("conv :"+conv); System.out.println("conv :"+conv);
...@@ -2108,11 +2109,11 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -2108,11 +2109,11 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
dimension = (dimension == null ? " ": dimension ); dimension = (dimension == null ? " ": dimension );
System.out.println("Double.parseDouble(qty.get(1).toString())"+Double.parseDouble(qty.get(1).toString())); System.out.println("Double.parseDouble(qty.get(1).toString())"+Double.parseDouble(qty.get(1).toString()));
//valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(qty.get(1)).append("]]>").append("</quantity>\r\n"); //valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(qty.get(1)).append("]]>").append("</quantity>\r\n");
setNodeValue( dom, "quantity",Double.parseDouble(qty.get(1).toString())); setNodeValue( dom, "quantity",quantity);
//valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyStd).append("]]>").append("</quantity__stduom>\r\n"); //valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyStd).append("]]>").append("</quantity__stduom>\r\n");
setNodeValue( dom, "quantity__stduom", qtyStd ); setNodeValue( dom, "quantity__stduom", qtyStd );
//valueXmlString.append("<conv__qty_stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(1 / Double.parseDouble(qty.get(1).toString())).append("]]>").append("</conv__qty_stduom>\r\n"); //valueXmlString.append("<conv__qty_stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(1 / Double.parseDouble(qty.get(1).toString())).append("]]>").append("</conv__qty_stduom>\r\n");
setNodeValue( dom, "conv__qty_stduom", (1 / Double.parseDouble(qty.get(1).toString()))); setNodeValue( dom, "conv__qty_stduom", (conv));
//setNodeValue( dom, "quantity", (qty.get(0))); //setNodeValue( dom, "quantity", (qty.get(0)));
//valueXmlString.append("<quantity_real isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyStd).append("]]>").append("</quantity_real>\r\n"); //valueXmlString.append("<quantity_real isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyStd).append("]]>").append("</quantity_real>\r\n");
//setNodeValue( dom, "quantity_real",qtyStd ); //setNodeValue( dom, "quantity_real",qtyStd );
...@@ -2152,20 +2153,20 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -2152,20 +2153,20 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
valueXmlString.append("<tax_env isSrvCallOnChg='0'>").append("<![CDATA[").append((taxEnv == null) ? "":taxEnv).append("]]>").append("</tax_env>\r\n"); valueXmlString.append("<tax_env isSrvCallOnChg='0'>").append("<![CDATA[").append((taxEnv == null) ? "":taxEnv).append("]]>").append("</tax_env>\r\n");
setNodeValue( dom, "tax_env", (taxEnv == null) ? "":taxEnv ); setNodeValue( dom, "tax_env", (taxEnv == null) ? "":taxEnv );
valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(qty.get(1)).append("]]>").append("</quantity>\r\n"); valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(quantity).append("]]>").append("</quantity>\r\n");
setNodeValue( dom, "quantity",Double.parseDouble(qty.get(1).toString())); setNodeValue( dom, "quantity",quantity);
valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyStd).append("]]>").append("</quantity__stduom>\r\n"); valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyStd).append("]]>").append("</quantity__stduom>\r\n");
setNodeValue( dom, "quantity__stduom", qtyStd ); setNodeValue( dom, "quantity__stduom", qtyStd );
valueXmlString.append("<conv__qty_stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(1 / Double.parseDouble(qty.get(1).toString())).append("]]>").append("</conv__qty_stduom>\r\n"); valueXmlString.append("<conv__qty_stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(conv).append("]]>").append("</conv__qty_stduom>\r\n");
setNodeValue( dom, "conv__qty_stduom", (1 / Double.parseDouble(qty.get(1).toString()))); setNodeValue( dom, "conv__qty_stduom", (conv));
valueXmlString.append("<quantity_real isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyStd).append("]]>").append("</quantity_real>\r\n"); valueXmlString.append("<quantity_real isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyStd).append("]]>").append("</quantity_real>\r\n");
valueXmlString.append(getChangeSord(dom , dom1 , "lot_sl", xtraParams , conn)); valueXmlString.append(getChangeSord(dom , dom1 , "lot_sl", xtraParams , conn));
valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(qty.get(1)).append("]]>").append("</quantity>\r\n"); valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(quantity).append("]]>").append("</quantity>\r\n");
setNodeValue( dom, "quantity",Double.parseDouble(qty.get(1).toString())); setNodeValue( dom, "quantity",quantity);
valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyStd).append("]]>").append("</quantity__stduom>\r\n"); valueXmlString.append("<quantity__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyStd).append("]]>").append("</quantity__stduom>\r\n");
setNodeValue( dom, "quantity__stduom", qtyStd ); setNodeValue( dom, "quantity__stduom", qtyStd );
valueXmlString.append("<conv__qty_stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(1 / Double.parseDouble(qty.get(1).toString())).append("]]>").append("</conv__qty_stduom>\r\n"); valueXmlString.append("<conv__qty_stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(conv).append("]]>").append("</conv__qty_stduom>\r\n");
setNodeValue( dom, "conv__qty_stduom", (1 / Double.parseDouble(qty.get(1).toString()))); setNodeValue( dom, "conv__qty_stduom", (conv) );
valueXmlString.append("<quantity_real isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyStd).append("]]>").append("</quantity_real>\r\n"); valueXmlString.append("<quantity_real isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyStd).append("]]>").append("</quantity_real>\r\n");
// Change 07-09-10 // Change 07-09-10
...@@ -2249,7 +2250,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -2249,7 +2250,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
conn.close(); conn.close();
}catch(Exception e){} }catch(Exception e){}
} }
System.out.println("valueXmlString.toString() "+valueXmlString.toString()); System.out.println("10/12/10 manohar valueXmlString.toString() "+valueXmlString.toString());
return valueXmlString.toString(); return valueXmlString.toString();
} }
//End Changes Gulzar 23-04-07 //End Changes Gulzar 23-04-07
......
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