Skip to content

B
business-java
Commit 4d587eed authored by mmhatre's avatar mmhatre
Browse files
Options

issue fixed for coin diiference error when sales return confirm 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@216231 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 848b2e96
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 11 deletions
webitm-fin/src/ibase/webitm/ejb/fin/adv/DrCrRcpConf.java
View file @ 4d587eed
......@@ -1088,7 +1088,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
roundAdj = (Double) hdrMap.get("round_adj");
//System.out.println("@@roundAdj["+roundAdj+"]@@amount["+hdrMap.get("amount")+"]@@amountbc--"+hdrMap.get("amount__bc"));
// System.out.println("@@roundAdj["+roundAdj+"]@@amount["+hdrMap.get("amount")+"]@@amountbc--"+hdrMap.get("amount__bc"));
if(roundAdj != 0)
{
......@@ -1103,9 +1103,11 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
}
//System.out.println("@@cctrRnd["+cctrRnd+"]");
// System.out.println("detailList1213 ["+detailList+"]=="+ detailList.size());
if(cctrRnd == null || cctrRnd.length() == 0 || " ".equals(cctrRnd))
{
cctrRnd=" ";
}
lineNo = String.valueOf(findLineNofromDetail(acctRnd, cctrRnd ,detailList));//Need to verify this code
if(Integer.valueOf(lineNo) == 0)
......@@ -1113,7 +1115,9 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
//li_lineno = lds_det.insertrow(0);//NVO code
lineNo = String.valueOf((detailList.size() + 1)); //Need to verify this code
}
//System.out.println("roundAdj ["+roundAdj+"]");
detMap = new HashMap();
detMap.put("tran_id", tranId);
detMap.put("line_no", lineNo);
detMap.put("acct_code", acctRnd);
......@@ -1121,11 +1125,11 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
detMap.put("amount", roundAdj);
detMap.put("emp_code", "");
detMap.put("anal_code", "");
//System.out.println("detailListdetMap ["+detMap+"]");
//detailList.set(Integer.valueOf(lineNo), detMap); //commented by manish mhatre
detailList.add(detMap); //added by manish mhatre on 31-jan-2020 [For coin diff issue in salesreturn confirm]
}
//System.out.println("inside while loop ["+amount+"]");
//System.out.println("detailList ["+detailList+"]=="+ detailList.size());
}
//}
......@@ -1146,7 +1150,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
detMap = (HashMap) detailList.get(x);
amountDet = (Double) detMap.get("amount");
//System.out.println("amountDet from detail["+detMap.get("amount")+"]"+"amountDet["+amountDet+"]");
// System.out.println("amountDet from detail["+detMap.get("amount")+"]"+"amountDet["+amountDet+"]");
total = total + amountDet;
......@@ -1154,7 +1158,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
amountHdr = (Double) hdrMap.get("amount");
//System.out.println("@@----total["+total+"] amountHdr["+amountHdr+"] and Math.abs["+ Math.abs(total - amountHdr)+"]");
// System.out.println("@@----total["+total+"] amountHdr["+amountHdr+"] and Math.abs["+ Math.abs(total - amountHdr)+"]");
if(total != amountHdr && Math.abs(total - amountHdr) > 1 )
{
......@@ -1207,7 +1211,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
adjAmount = (Double) adjMap.get("adj_amt");
total = total + adjAmount;
//System.out.println("drcr_ADJAMOUNT--"+adjAmount+"TOTAL--"+total);
// System.out.println("drcr_ADJAMOUNT--"+adjAmount+"TOTAL--"+total);
sql = " select count(*) from receivables where cust_code = ? and tran_ser = ? and ref_no = ? " ;
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,custCode);
......@@ -1311,7 +1315,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
amountHdr = (Double)hdrMap.get("amount");
//System.out.println("@@-total ["+total+"] amountHdr["+amountHdr+"] and Math.abs(total - amountHdr) ["+Math.abs(total - amountHdr)+"]");
// System.out.println("@@-total ["+total+"] amountHdr["+amountHdr+"] and Math.abs(total - amountHdr) ["+Math.abs(total - amountHdr)+"]");
if(total != amountHdr && Math.abs(total - amountHdr) > 1 )
{
......@@ -1354,7 +1358,7 @@ public class DrCrRcpConf extends ActionHandlerEJB implements DrCrInvConfLocal,Dr
empCode = (String) detMap.get("emp_code");
analCode = (String) detMap.get("anal_code");
System.out.println("Inside DRCR_RACCT insert ==>"+detMap);
pstmt.setString(1,tranId);
pstmt.setInt(2,maxline);
pstmt.setString(3,acctCode);
......
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