Skip to content

B
business-java
Commit f5026811 authored by asikarwar's avatar asikarwar
Browse files
Options

change for bill discount amount 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93361 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 449a5ece
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 20 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/ReceiptAdvConf.java
View file @ f5026811
...@@ -229,6 +229,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -229,6 +229,8 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
double chq = 0.0; double chq = 0.0;
int i = 0; int i = 0;
int cnt = 0 ; int cnt = 0 ;
int cnt1 = 0 ;
Date tranDate = null; Date tranDate = null;
HashMap RcpHdrMap = null; HashMap RcpHdrMap = null;
HashMap DetMap = null; HashMap DetMap = null;
...@@ -559,14 +561,14 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -559,14 +561,14 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if(cnt==0) if(cnt == 0)
{ {
//CLOSE INSERT //CLOSE INSERT
sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,EXCH_RATE,AMOUNT,EMP_CODE,ANAL_CODE,EFFECT_PARTY,SUNDRY_TYPE,SUNDRY_CODE) values (?,?,?,?,?,?,?,?,?,?,?)"; sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,EXCH_RATE,AMOUNT,EMP_CODE,ANAL_CODE,EFFECT_PARTY,SUNDRY_TYPE,SUNDRY_CODE) values (?,?,?,?,?,?,?,?,?,?,?)";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);//issue pstmt.setString(1,tranId);//issue
pstmt.setString(2,String.valueOf(cnt+1)); pstmt.setString(2,String.valueOf(cnt++));
pstmt.setString(3,(String)RcpDetMap.get("acct_code__ar")); pstmt.setString(3,(String)RcpDetMap.get("acct_code__ar"));
pstmt.setString(4,(String)RcpDetMap.get("cctr_code__ar")==null?"":(String)RcpDetMap.get("cctr_code__ar")); pstmt.setString(4,(String)RcpDetMap.get("cctr_code__ar")==null?"":(String)RcpDetMap.get("cctr_code__ar"));
pstmt.setDouble(5,(Double)RcpDetMap.get("exch_rate__rcv")); pstmt.setDouble(5,(Double)RcpDetMap.get("exch_rate__rcv"));
...@@ -576,7 +578,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -576,7 +578,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.setString(9,"Y"); pstmt.setString(9,"Y");
pstmt.setString(10,"C"); pstmt.setString(10,"C");
pstmt.setString(11,(String)RcpDetMap.get("cust_code")); pstmt.setString(11,(String)RcpDetMap.get("cust_code"));
cnt = pstmt.executeUpdate(); pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
...@@ -679,20 +681,20 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -679,20 +681,20 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
cnt = rs.getInt(1); cnt1 = rs.getInt(1);
} }
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if(cnt==0) if(cnt1 == 0)
{ {
sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,EXCH_RATE,AMOUNT,EMP_CODE,ANAL_CODE,EFFECT_PARTY,SUNDRY_TYPE,SUNDRY_CODE) values (?,?,?,?,?,?,?,?,?,?,?)"; sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,EXCH_RATE,AMOUNT,EMP_CODE,ANAL_CODE,EFFECT_PARTY,SUNDRY_TYPE,SUNDRY_CODE) values (?,?,?,?,?,?,?,?,?,?,?)";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId); pstmt.setString(1,tranId);
pstmt.setString(2,String.valueOf(cnt+1)); pstmt.setString(2,String.valueOf(cnt++));
pstmt.setString(3,acct); pstmt.setString(3,acct);
pstmt.setString(4,cctr==null?"":cctr); pstmt.setString(4,cctr==null?"":cctr);
pstmt.setDouble(5,exch); pstmt.setDouble(5,exch);
...@@ -702,7 +704,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -702,7 +704,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.setString(9,"N"); pstmt.setString(9,"N");
pstmt.setString(10,stype); pstmt.setString(10,stype);
pstmt.setString(11,scode); pstmt.setString(11,scode);
cnt = pstmt.executeUpdate(); pstmt.executeUpdate();
pstmt.close(); pstmt.close();
...@@ -713,7 +715,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -713,7 +715,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
sql = "update rcpacct set amount =? where tran_id = ?"; sql = "update rcpacct set amount =? where tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, (rcpAmt+(Double)(DetMap.get("amount")==null?0:DetMap.get("amount")))); pstmt.setDouble(1, (rcpAmt+(Double)(DetMap.get("amount")==null?0.0:DetMap.get("amount"))));
pstmt.setString(2, tranId); pstmt.setString(2, tranId);
int updateCoount = pstmt.executeUpdate(); int updateCoount = pstmt.executeUpdate();
...@@ -761,7 +763,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -761,7 +763,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
} }
if(cnt==0) if(cnt == 0)
{ {
sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,EXCH_RATE,AMOUNT,EMP_CODE,ANAL_CODE,EFFECT_PARTY,SUNDRY_TYPE,SUNDRY_CODE) values (?,?,?,?,?,?,?,?,?,?,?)"; sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,EXCH_RATE,AMOUNT,EMP_CODE,ANAL_CODE,EFFECT_PARTY,SUNDRY_TYPE,SUNDRY_CODE) values (?,?,?,?,?,?,?,?,?,?,?)";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -776,7 +778,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -776,7 +778,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.setString(9,"Y"); pstmt.setString(9,"Y");
pstmt.setString(10,"C"); pstmt.setString(10,"C");
pstmt.setString(11,(String)RcpHdrMap.get("cust_code")); pstmt.setString(11,(String)RcpHdrMap.get("cust_code"));
cnt = pstmt.executeUpdate(); pstmt.executeUpdate();
pstmt.close(); pstmt.close();
...@@ -787,7 +789,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -787,7 +789,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
sql = "update rcpacct set amount =? where tran_id = ?"; sql = "update rcpacct set amount =? where tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, (amount+(Double)(DetMap.get("amount")==null?0:DetMap.get("amount")))); pstmt.setDouble(1, (amount+(Double)(DetMap.get("amount")==null?0.0:DetMap.get("amount"))));
pstmt.setString(2, tranId); pstmt.setString(2, tranId);
int updateCoount = pstmt.executeUpdate(); int updateCoount = pstmt.executeUpdate();
...@@ -827,7 +829,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -827,7 +829,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.setString(9,"N"); pstmt.setString(9,"N");
pstmt.setString(10,"C"); pstmt.setString(10,"C");
pstmt.setString(11,(String)RcpHdrMap.get("cust_code")); pstmt.setString(11,(String)RcpHdrMap.get("cust_code"));
cnt = pstmt.executeUpdate(); pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
...@@ -844,7 +846,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -844,7 +846,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.setString(9,"Y"); pstmt.setString(9,"Y");
pstmt.setString(10,"C"); pstmt.setString(10,"C");
pstmt.setString(11,(String)RcpHdrMap.get("cust_code")); pstmt.setString(11,(String)RcpHdrMap.get("cust_code"));
cnt = pstmt.executeUpdate(); pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
...@@ -861,7 +863,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -861,7 +863,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.setString(9,"Y"); pstmt.setString(9,"Y");
pstmt.setString(10,"C"); pstmt.setString(10,"C");
pstmt.setString(11,(String)RcpHdrMap.get("cust_code")); pstmt.setString(11,(String)RcpHdrMap.get("cust_code"));
cnt = pstmt.executeUpdate(); pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
...@@ -898,7 +900,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -898,7 +900,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if(cnt==0) if(cnt == 0)
{ {
sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,EXCH_RATE,AMOUNT,EMP_CODE,ANAL_CODE,EFFECT_PARTY,SUNDRY_TYPE,SUNDRY_CODE) values (?,?,?,?,?,?,?,?,?,?,?)"; sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,EXCH_RATE,AMOUNT,EMP_CODE,ANAL_CODE,EFFECT_PARTY,SUNDRY_TYPE,SUNDRY_CODE) values (?,?,?,?,?,?,?,?,?,?,?)";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -913,7 +915,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -913,7 +915,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.setString(9,"Y"); pstmt.setString(9,"Y");
pstmt.setString(10,"C"); pstmt.setString(10,"C");
pstmt.setString(11,((String)RcpHdrMap.get("cust_code")).trim()); pstmt.setString(11,((String)RcpHdrMap.get("cust_code")).trim());
cnt = pstmt.executeUpdate(); pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
...@@ -978,7 +980,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -978,7 +980,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if(cnt==0) if(cnt == 0)
{ {
sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,EXCH_RATE,AMOUNT,EMP_CODE,ANAL_CODE,EFFECT_PARTY,SUNDRY_TYPE,SUNDRY_CODE) values (?,?,?,?,?,?,?,?,?,?,?)"; sql = "Insert into rcpacct (TRAN_ID,LINE_NO,ACCT_CODE,CCTR_CODE,EXCH_RATE,AMOUNT,EMP_CODE,ANAL_CODE,EFFECT_PARTY,SUNDRY_TYPE,SUNDRY_CODE) values (?,?,?,?,?,?,?,?,?,?,?)";
...@@ -994,7 +996,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -994,7 +996,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt.setString(9,"Y"); pstmt.setString(9,"Y");
pstmt.setString(10,"C"); pstmt.setString(10,"C");
pstmt.setString(11,(String)RcpHdrMap.get("cust_code")); pstmt.setString(11,(String)RcpHdrMap.get("cust_code"));
cnt = pstmt.executeUpdate(); pstmt.executeUpdate();
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
...@@ -2492,13 +2494,13 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -2492,13 +2494,13 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
pstmt = null; pstmt = null;
if(Math.abs(amount - adjAmt) < Math.abs(amount)) if(Math.abs(totAmt - adjAmt) < Math.abs(amount))
{ {
errString = itmDBAccessEJB.getErrorString("","VTBAL1","","",conn); errString = itmDBAccessEJB.getErrorString("","VTBAL1","","",conn);
} }
adjAmt = adjAmt + totAmt; adjAmt = adjAmt + amount;
if(totAmt == adjAmt) if(totAmt == adjAmt)
{ {
status = "A"; status = "A";
......
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