Commit 6a0a8983 authored by agaikwad's avatar agaikwad

Changes in Exceeded and Current Order Amd amount.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@100093 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c61d9178
......@@ -150,6 +150,8 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
String totAmtDetpordertempstr ="",quantitypoamd ="",ratepoamd ="",acctCodeCrporder ="";
String acctCodeCrbrow ="", taxpoamd ="";
String discountpoamd ="",varValueprojectType ="";
String rateOld="",qtyOld = "",sumqty ="",totAmtDetPoamdDetbrow1 ="";
double rateOldamd=0,qtyOldamd=0,sumQtyamd=0,sumQtyamdNew=0,excedAmt=0;
DistCommon distCommon = new DistCommon();
try {
......@@ -1508,17 +1510,19 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
System.out.println("detail2List" + detail2List);
noOfParent = detail2List.getLength();
System.out.println("NO OF PARENT@@@@"+ noOfParent);
int countqty=0;
a = 0;
projCode = checkNull(genericUtility.getColumnValue("proj_code", dom));
System.out.println("projCode>>>>" + projCode);
for (a = 0; a < noOfParent; a++)
{
System.out.println(" detail2List.item(a)"+ detail2List.item(a));
System.out.println(genericUtility.getColumnValueFromNode("proj_code",detail2List.item(a))+ "in genericutility");
String projcodeBrow = checkNull(genericUtility.getColumnValueFromNode("proj_code",detail2List.item(a)));
System.out.println("projcodebrow>>>"+ projcodeBrow);
System.out.println("a["+a+"]projcodebrow>>>"+ projcodeBrow);
System.out.println("projcode>>" + projCode);
if (projcodeBrow.equals(projCode))
if (projcodeBrow != null && projcodeBrow.trim().equalsIgnoreCase(projCode.trim()))
{
System.out.println("in condition!!!");
quantitypoamd = checkNull(genericUtility.getColumnValueFromNode("quantity__stduom",detail2List.item(a)));
......@@ -1543,6 +1547,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
System.out.println("<totAmtDetPoamdDetbrowtemp > @@@@@@@@@@@@@@@@@"+ totAmtDetPoamdDetbrowtemp);
pordNo = checkNull(genericUtility.getColumnValueFromNode("purc_order",detail2List.item(a)));
linenoOrdBrow = checkNull(genericUtility.getColumnValueFromNode("line_no__ord",detail2List.item(a)));
//line_no__ord
System.out.println("linenoOrdBrow>>>" +linenoOrdBrow );
if(linenoOrdBrow == null || linenoOrdBrow.trim().length() == 0)
{
......@@ -1551,11 +1556,60 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
System.out.println("totAmtDetPoamdDetbrowtemp @@@ "+ totAmtDetPoamdDetbrowtemp);
totAmtDetPoamdDetbrow = totAmtDetPoamdDetbrowtemp + totAmtDetPoamdDetbrow;
temparr = temparr + linenoOrdBrow +",";
rateOld = checkNull(genericUtility.getColumnValueFromNode("rate__o",detail2List.item(a)));
rateOld = rateOld != null&& rateOld.trim().length() > 0 ? rateOld.trim() : "0";
System.out.println("*********rateOLDpoamd*************"+ rateOld);
rateOldamd = rateOld == null ? 0: Double.parseDouble(rateOld);
qtyOld = checkNull(genericUtility.getColumnValueFromNode("quantity__o",detail2List.item(a)));
qtyOld = qtyOld != null&& qtyOld.trim().length() > 0 ? qtyOld.trim() : "0";
System.out.println("************QTY OLD poamd **********"+ qtyOld);
qtyOldamd = qtyOld == null ? 0: Double.parseDouble(qtyOld);
sumQtyamd=rateOldamd * qtyOldamd;
sumqty= String.valueOf(sumQtyamd);
System.out.println("Sum Quamtity String" + sumqty);
sumQtyamd = totAmtDetPoamdDetbrowtemp - sumQtyamd;
System.out.println("sumQtyamd" + sumQtyamd);
if(sumqty.contains("-"))
{
System.out.println("INNNNNN");
sumQtyamd = sumQtyamd * (-1);
System.out.println("IN MINUS " + sumQtyamd);
}
System.out.println("ABhi testing add old qty" + sumQtyamd);
countqty++;
System.out.println("linenoOrdBrow>>>["+linenoOrdBrow+"]a["+a+"]" );
if(linenoOrdBrow == null || "@".equalsIgnoreCase(linenoOrdBrow) || "".equalsIgnoreCase(linenoOrdBrow) || linenoOrdBrow.trim().length()==0)
{
System.out.println("@@@@@@@@@@ excedAmt["+excedAmt+"]sumQtyamd["+sumQtyamd+"]+totAmtDetpordertot["+totAmtDetpordertot+"]-approxCost["+approxCost+"]");
excedAmt += sumQtyamd + totAmtDetpordertot - approxCost;
}
else
{
System.out.println("@@@@@@@@@@ excedAmt["+excedAmt+"]sumQtyamd["+sumQtyamd+"]");
excedAmt += sumQtyamd;
}
System.out.println("@@@@@@@@@@ after excedAmt["+excedAmt+"]");
/* if(countqty > 1)
{
excedAmt = sumQtyamd + totAmtDetpordertot - approxCost;
System.out.println("totAmtDetpordertot");
System.out.println("approxCost" +approxCost);
System.out.println("sumQtyamd"+sumQtyamd);
System.out.println("excedAmt"+excedAmt);
sumQtyamd = excedAmt +sumQtyamd;
System.out.println("sumQtyamd" +sumQtyamd );
}*/
}
}
if(temparr.length() >0)
/* if(temparr.length() >0)
{
String tempArray[]=temparr.split(",");
System.out.println("tempArray[].length :-["+tempArray.length+"]");
......@@ -1590,7 +1644,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
rs = null;
pstmt.close();
pstmt = null;
}
}*/
/* sql2 ="select sum(a.tot_amt) from poamd_det a,poamd_hdr b " +
" where (a.purc_order = b.purc_order) and a.proj_code = ? " +
" and a.amd_no ! = ?";
......@@ -1620,7 +1674,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
System.out.println("totAmtDet for porder>>>>>>>> "+ totAmtDetporder);
//totAmtDetPoamdDetbrow = totAmtDetPoamdDetbrow *exchRatePoAmd;
totAmtProj = totAmtDetPoamdDetbrow + totAmtDetporder+ totAmtDetpordertot;
System.out.println("totAmtProj>>>>> "+ totAmtProj);
System.out.println("totA mtProj>>>>> "+ totAmtProj);
if (totAmtProj > approxCost)
{
errCode = "VTPROJCOST";
......@@ -3095,12 +3149,17 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
descrEnd = descrStr.substring(descrStr.indexOf("]"),descrStr.length());
System.out.println("<approxCost IN ERROR MESSAGE> @@@@@@@@@@@@@@@@@"+ approxCost);
System.out.println("<totAmtDetpordertot IN ERROR MESSAGE > @@@@@@@@@@@@@@@@@"+ totAmtDetpordertot);
System.out.println("<totAmtDetPoamdDetbrow + totAmtDetporder IN ERROR MESSAGE > @@@@@@@@@@@@@@@@@"+ totAmtDetPoamdDetbrow + totAmtDetporder);
System.out.println("<excedAmt @@@@@@@@@@@@@@@@@"+ excedAmt);
System.out.println("<totAmtDetporder @@@@@@@@@@@@@@@@@"+ totAmtDetporder);
System.out.println("<sumQtyamd + totAmtDetporder - approxCost IN ERROR MESSAGE > @@@@@@@@@@@@@@@@@"+ sumQtyamd + totAmtDetporder);
System.out.println("<sumQtyamd + totAmtDetpordertot IN ERROR MESSAGE > @@@@@@@@@@@@@@@@@"+ totAmtDetPoamdDetbrow + totAmtDetporder);
value = " ; Project Aprroved Amount : "+ BigDecimal.valueOf(approxCost).toPlainString()
+" ; Consumed Amount : "+ BigDecimal.valueOf(totAmtDetpordertot).toPlainString()
+" ; Current Purchase Amendment Amount : "+ BigDecimal.valueOf(totAmtDetPoamdDetbrow + totAmtDetporder ).toPlainString()
//+" ; Exceeded Amount : "+ BigDecimal.valueOf(totAmtProj - approxCost).toPlainString();
+" ; Exceeded Amount : "+ BigDecimal.valueOf(totAmtDetpordertot - approxCost).toPlainString();
//+" ; Current Purchase Amendment Amount : "+ BigDecimal.valueOf(totAmtDetPoamdDetbrow + totAmtDetporder ).toPlainString()
+" ; Current Purchase Amendment Amount : "+ BigDecimal.valueOf(totAmtDetPoamdDetbrow).toPlainString()
//+" ; Exceeded Amount : "+ BigDecimal.valueOf( sumQtyamd + totAmtDetpordertot - approxCost).toPlainString();
// +" ; Exceeded Amount : "+ BigDecimal.valueOf(totAmtDetpordertot - approxCost).toPlainString();
+" ; Exceeded Amount : "+ BigDecimal.valueOf(excedAmt).toPlainString();
System.out.println("Value ::: "+ value);
descrStart = descrStart.concat(value).concat(descrEnd);
......
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