Commit 39476579 authored by prane's avatar prane

added getRequiredDecimal() to handle exponential format and changed dom seq...

added getRequiredDecimal() to handle exponential format and changed dom seq for suggest adjment flag

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@189678 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9c4222c8
...@@ -497,9 +497,11 @@ Put a validation chq amount in filter and total of details matches in case heade ...@@ -497,9 +497,11 @@ Put a validation chq amount in filter and total of details matches in case heade
for (String sp : custGrpMap.keySet()) for (String sp : custGrpMap.keySet())
{ {
System.out.println("*******keyset [ "+sp+" ]******"); System.out.println("*******keyset [ "+sp+" ]******");
} }
int gCnt = 1;
for (ArrayList<ReceiptBean> templist : custGrpMap.values()) for (ArrayList<ReceiptBean> templist : custGrpMap.values())
{ {
System.out.println("Global dom count["+gCnt+"]");
selectedList = new ArrayList<ReceiptBean>(); selectedList = new ArrayList<ReceiptBean>();
Collections.sort(templist, ReceiptBean.receiptComparator); Collections.sort(templist, ReceiptBean.receiptComparator);
//Changes done on 26JUN2018 [To match and select partial amount when collections are treated as advance in system and entries are integrated after invoice entries.] //Changes done on 26JUN2018 [To match and select partial amount when collections are treated as advance in system and entries are integrated after invoice entries.]
...@@ -604,7 +606,7 @@ Put a validation chq amount in filter and total of details matches in case heade ...@@ -604,7 +606,7 @@ Put a validation chq amount in filter and total of details matches in case heade
} }
} }
System.out.println("@@@@@ POSListSize[" + posList.size()+ "]****NEGListSize[" + negList.size() + "]"); System.out.println("@@@@@ POSListSize[" + posList.size()+ "]****NEGListSize[" + negList.size() + "]");
int cnt = 1; //int cnt = 1;
for (int i = 0; i < negList.size(); i++) for (int i = 0; i < negList.size(); i++)
{ {
if( negList.size() > 0 && posList.size() == 0 ) if( negList.size() > 0 && posList.size() == 0 )
...@@ -617,8 +619,8 @@ Put a validation chq amount in filter and total of details matches in case heade ...@@ -617,8 +619,8 @@ Put a validation chq amount in filter and total of details matches in case heade
} }
} }
ReceiptBean rcpBean = negList.get(i); ReceiptBean rcpBean = negList.get(i);
xmlBuff.append(generateXmls(detailDom, cnt, rcpBean.getIsSelected(), rcpBean)); xmlBuff.append(generateXmls(detailDom, gCnt, rcpBean.getIsSelected(), rcpBean));
cnt++; gCnt++;
} }
for (int i = 0; i < posList.size(); i++) for (int i = 0; i < posList.size(); i++)
{ {
...@@ -632,8 +634,8 @@ Put a validation chq amount in filter and total of details matches in case heade ...@@ -632,8 +634,8 @@ Put a validation chq amount in filter and total of details matches in case heade
} }
} }
ReceiptBean rcpBean = posList.get(i); ReceiptBean rcpBean = posList.get(i);
xmlBuff.append(generateXmls(detailDom, cnt, rcpBean.getIsSelected(), rcpBean)); xmlBuff.append(generateXmls(detailDom, gCnt, rcpBean.getIsSelected(), rcpBean));
cnt++; gCnt++;
} }
//Changes done on 26JUN2018 End //Changes done on 26JUN2018 End
}//end of for (ArrayList templist : custGrpMap.values()) }//end of for (ArrayList templist : custGrpMap.values())
...@@ -1137,8 +1139,9 @@ conn = getConnection(); ...@@ -1137,8 +1139,9 @@ conn = getConnection();
{ {
adjAmt = Double.parseDouble(checkNull(childNode.getFirstChild().getNodeValue()).trim()); adjAmt = Double.parseDouble(checkNull(childNode.getFirstChild().getNodeValue()).trim());
System.out.println("adjAmt :::::["+ adjAmt+"]"); System.out.println("adjAmt :::::["+ adjAmt+"]");
totalAdjAmt = totalAdjAmt+adjAmt;// added by nandkumar gadkari on 03/04/18 totalAdjAmt = getRequiredDecimal(totalAdjAmt,3)+adjAmt;// added by nandkumar gadkari on 03/04/18
} }
System.out.println("TotalAdjAmt Inner Loop ["+totalAdjAmt+"]");
}//inner for }//inner for
sql = "SELECT GROUP_CODE FROM CUSTOMER WHERE CUST_CODE = ?"; sql = "SELECT GROUP_CODE FROM CUSTOMER WHERE CUST_CODE = ?";
//Commented by Manoj dtd 03/05/2014writeLog(filePtr,sql,true); //Commented by Manoj dtd 03/05/2014writeLog(filePtr,sql,true);
...@@ -1222,9 +1225,8 @@ conn = getConnection(); ...@@ -1222,9 +1225,8 @@ conn = getConnection();
receiptElements.setReceiptMap(receiptMap); receiptElements.setReceiptMap(receiptMap);
receiptElements.setInvoiceList(receiptDetail); receiptElements.setInvoiceList(receiptDetail);
receiptList.set(ele,receiptElements); receiptList.set(ele,receiptElements);
}//Outer For }//Outer For
System.out.println("@@@@ The size of receiptList is @@@@ ["+receiptList.size()+"]totalAdjAmt["+totalAdjAmt+"]");
System.out.println("@@@@ The size of receiptList is @@@@ ["+receiptList.size()+"]");
//Commented by Manoj dtd 03/05/2014writeLog(filePtr,"@@@@ The ReceiptGenerated is @@@@ "+receiptList.size(),true); //Commented by Manoj dtd 03/05/2014writeLog(filePtr,"@@@@ The ReceiptGenerated is @@@@ "+receiptList.size(),true);
// If Condittion ADDED BY NANDKUMAR GADKARI on 03/04/18 // If Condittion ADDED BY NANDKUMAR GADKARI on 03/04/18
......
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