Commit c6b50485 authored by cshah's avatar cshah

set discAmt value proper in stockTransform method


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91393 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c7c5fb93
...@@ -629,6 +629,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -629,6 +629,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
String cAllocQtyStr = ""; String cAllocQtyStr = "";
String icQtyOrdStr = ""; String icQtyOrdStr = "";
String applyPrice = ""; String applyPrice = "";
String rateStdUomStr = "";
double inputQty = 0d ; double inputQty = 0d ;
double qtyStk = 0d; double qtyStk = 0d;
...@@ -829,11 +830,13 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -829,11 +830,13 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
//stmtTemp = null; //stmtTemp = null;
rsTemp.close(); rsTemp.close();
rsTemp = null; rsTemp = null;
/* chandni shah - 02/02/11
if ( applyPrice == null ) if ( applyPrice == null )
{ {
discAmt = (discount/100) * ( quantityStduom * rateStduom ); discAmt = (discount/100) * ( quantityStduom * rateStduom );
} }
System.out.println("discAmt :"+discAmt); System.out.println("discAmt :"+discAmt);
*/
if ( packCode != null && packCode.trim().length() > 0 ) if ( packCode != null && packCode.trim().length() > 0 )
{ {
sqlTemp = "SELECT GROSS_WEIGHT, NETT_WEIGHT FROM PACKING WHERE PACK_CODE = '"+ packCode +"' "; sqlTemp = "SELECT GROSS_WEIGHT, NETT_WEIGHT FROM PACKING WHERE PACK_CODE = '"+ packCode +"' ";
...@@ -1090,6 +1093,13 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -1090,6 +1093,13 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
System.out.println("tareWeight [if ( qtyPerArt > 0 )] ::"+tareWeight); System.out.println("tareWeight [if ( qtyPerArt > 0 )] ::"+tareWeight);
System.out.println("netWeight [if ( qtyPerArt > 0 )] ::"+netWeight); System.out.println("netWeight [if ( qtyPerArt > 0 )] ::"+netWeight);
} }
/* chandni shah - 02/02/11
if ( applyPrice == null )
{
discAmt = (discount/100) * ( inputQty * rateStduom );
}
System.out.println("discAmt :"+discAmt);
*/
if (noArt == 0) if (noArt == 0)
{ {
noArt = 1; noArt = 1;
...@@ -1158,8 +1168,9 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -1158,8 +1168,9 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
valueXmlString.append("<qty_details isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyDetailStr).append("]]>").append("</qty_details>\r\n"); valueXmlString.append("<qty_details isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyDetailStr).append("]]>").append("</qty_details>\r\n");
valueXmlString.append("<discount isSrvCallOnChg='0'>").append("<![CDATA[").append(discount).append("]]>").append("</discount>\r\n"); valueXmlString.append("<discount isSrvCallOnChg='0'>").append("<![CDATA[").append(discount).append("]]>").append("</discount>\r\n");
/* commented on 03/02/11 - Chandni Shah
valueXmlString.append("<disc_amt isSrvCallOnChg='0'>").append("<![CDATA[").append(discAmt).append("]]>").append("</disc_amt>\r\n"); valueXmlString.append("<disc_amt isSrvCallOnChg='0'>").append("<![CDATA[").append(discAmt).append("]]>").append("</disc_amt>\r\n");
*/
valueXmlString.append("<pending_qty isSrvCallOnChg='0'>").append(icQtyOrd).append("</pending_qty>"); valueXmlString.append("<pending_qty isSrvCallOnChg='0'>").append(icQtyOrd).append("</pending_qty>");
//valueXmlString.append("<gross_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(grossWeight).append("]]>").append("</gross_weight>\r\n"); //valueXmlString.append("<gross_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(grossWeight).append("]]>").append("</gross_weight>\r\n");
//valueXmlString.append("<nett_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(netWeight).append("]]>").append("</nett_weight>\r\n"); //valueXmlString.append("<nett_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(netWeight).append("]]>").append("</nett_weight>\r\n");
...@@ -1213,6 +1224,24 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D ...@@ -1213,6 +1224,24 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
//valueXmlString.append(lineNoSord); /// 16-08 //valueXmlString.append(lineNoSord); /// 16-08
tempStr = getChangeSord(dom, dom1, "lot_no", xtraParams ,conn); tempStr = getChangeSord(dom, dom1, "lot_no", xtraParams ,conn);
valueXmlString.append(tempStr); ///// 16-08 valueXmlString.append(tempStr); ///// 16-08
// chandni shah - 02/02/11
rateStdUomStr = genericUtility.getColumnValue("rate__stduom", dom);
if (rateStdUomStr == null || "null".equals(rateStdUomStr) || rateStdUomStr.trim().length() == 0)
{
rateStdUomStr = "0";
}
rateStduom = Double.parseDouble(rateStdUomStr);
if ( applyPrice == null )
{
discAmt = (discount/100) * ( inputQty * rateStduom );
}
System.out.println("discAmt :"+discAmt);
valueXmlString.append("<disc_amt isSrvCallOnChg='0'>").append("<![CDATA[").append(discAmt).append("]]>").append("</disc_amt>\r\n");
setNodeValue( dom, "disc_amt", discAmt );
////////
//
// end 27/06/09 manoharan set the mfg_date and exp_date from stock // end 27/06/09 manoharan set the mfg_date and exp_date from stock
valueXmlString.append("<quantity isSrvCallOnChg='0'>").append(qtyStk).append("</quantity>"); valueXmlString.append("<quantity isSrvCallOnChg='0'>").append(qtyStk).append("</quantity>");
......
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