Skip to content

B
business-java
Commit 4eb89590 authored by cshah's avatar cshah
Browse files
Options

changes in sundryBalMap 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91537 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5e388946
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 21 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/JvConfirm.java
View file @ 4eb89590
...@@ -125,14 +125,14 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -125,14 +125,14 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
double amountDetDr = 0 , amountDetCr = 0 ; double amountDetDr = 0 , amountDetCr = 0 ;
String tranType = "",siteCode= "",finEntity = "",refSer="",refNo="",reversible=""; String tranType = "",siteCode= "",finEntity = "",refSer="",refNo="",reversible="";
String autoRev="",drAmt="",crAmt="",currCode= "",status = "",remarks = "",confirmed = ""; String autoRev="",drAmt="",crAmt="",currCode= "",status = "",remarks = "",confirmed = "";
String empCodeAprv="",exchRate="",siteCodeRev="",projCode="",refLineNo=""; String empCodeAprv="",siteCodeRev="",projCode="",refLineNo="";
String linkType ="",siteCodeFor="",loginEmpCode = ""; String linkType ="",siteCodeFor="",loginEmpCode = "";
java.sql.Timestamp tranDate = null; java.sql.Timestamp tranDate = null;
java.sql.Timestamp effDate = null; java.sql.Timestamp effDate = null;
java.sql.Timestamp revDate = null; java.sql.Timestamp revDate = null;
java.sql.Timestamp revDateAct = null; java.sql.Timestamp revDateAct = null;
java.sql.Timestamp confDate = null; java.sql.Timestamp confDate = null;
double amt = 0; double amt = 0,exchRate=0;
String lineNo = "" ,acctCode = "",cctrCode ="",drcrFlag ="",remarksDet = ""; String lineNo = "" ,acctCode = "",cctrCode ="",drcrFlag ="",remarksDet = "";
String amount = "" ,empCode="" , analCode = "",sundryType = "",sundryCode = "",projCodeDet = ""; String amount = "" ,empCode="" , analCode = "",sundryType = "",sundryCode = "",projCodeDet = "";
int cnt = 0; int cnt = 0;
...@@ -181,7 +181,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -181,7 +181,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
confirmed = rs.getString("confirmed"); confirmed = rs.getString("confirmed");
confDate = rs.getTimestamp("conf_date"); confDate = rs.getTimestamp("conf_date");
empCodeAprv = rs.getString("emp_code__aprv"); empCodeAprv = rs.getString("emp_code__aprv");
exchRate = rs.getString("exch_rate"); //exchRate = rs.getString("exch_rate");
exchRate = rs.getDouble("exch_rate");
siteCodeRev = rs.getString("site_code__rev"); siteCodeRev = rs.getString("site_code__rev");
projCode = rs.getString("proj_code"); projCode = rs.getString("proj_code");
refLineNo = rs.getString("ref_line_no"); refLineNo = rs.getString("ref_line_no");
...@@ -410,7 +411,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -410,7 +411,7 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
String detSundryType = "", detSundryCode = "",detAcctCode="",detCctrCode = "",detEmpCode = ""; String detSundryType = "", detSundryCode = "",detAcctCode="",detCctrCode = "",detEmpCode = "";
String detAnalCode = "",detAmount = "",detDrcrFlag= "",detRemarks= "",detProjCode = ""; String detAnalCode = "",detAmount = "",detDrcrFlag= "",detRemarks= "",detProjCode = "";
int ctr = 0 ,ctrLine = 0, ediOption = 0; int ctr = 0 ,ctrLine = 0, ediOption = 0;
double amt = 0; double amt = 0,amtDbl=0;
java.sql.Timestamp toDay = null; java.sql.Timestamp toDay = null;
java.sql.Timestamp revDt = null; java.sql.Timestamp revDt = null;
StringBuffer xmlBuff = null; StringBuffer xmlBuff = null;
...@@ -436,7 +437,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -436,7 +437,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
detDrcrFlag = (String) detListMap.get("drcr_flag"); detDrcrFlag = (String) detListMap.get("drcr_flag");
detRemarks = (String) detListMap.get("remarks"); detRemarks = (String) detListMap.get("remarks");
detProjCode = (String) detListMap.get("proj_code"); detProjCode = (String) detListMap.get("proj_code");
amtDbl = Double.parseDouble(detAmount);
glTraceMap.put("tran_date",(journalMap.get("tran_date") == null ? "":journalMap.get("tran_date"))); glTraceMap.put("tran_date",(journalMap.get("tran_date") == null ? "":journalMap.get("tran_date")));
glTraceMap.put("eff_date",(journalMap.get("eff_date") == null ? "":journalMap.get("eff_date"))); glTraceMap.put("eff_date",(journalMap.get("eff_date") == null ? "":journalMap.get("eff_date")));
glTraceMap.put("fin_entity",(journalMap.get("fin_entity") == null ? "":journalMap.get("fin_entity"))); glTraceMap.put("fin_entity",(journalMap.get("fin_entity") == null ? "":journalMap.get("fin_entity")));
...@@ -478,9 +480,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -478,9 +480,10 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
{ {
return errString; return errString;
} }
System.out.println("sundry type = "+"["+detSundryType+"]");
if(!("O".equalsIgnoreCase (detSundryType)) && (detSundryCode == null)) System.out.println("sundry code = "+"["+detSundryCode+"]");
{glTraceMap.put("remarks",journalMap.get("remarks")); if(!(("O".equalsIgnoreCase (detSundryType)) && (detSundryCode.trim().length() == 0 )))
{
sundryBalMap = new HashMap(); sundryBalMap = new HashMap();
sundryBalMap.put("tran_date",journalMap.get("tran_date")); sundryBalMap.put("tran_date",journalMap.get("tran_date"));
sundryBalMap.put("eff_date",journalMap.get("eff_date")); sundryBalMap.put("eff_date",journalMap.get("eff_date"));
...@@ -494,15 +497,15 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -494,15 +497,15 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
sundryBalMap.put("exch_rate",journalMap.get("exch_rate")); sundryBalMap.put("exch_rate",journalMap.get("exch_rate"));
if ("D".equalsIgnoreCase(detDrcrFlag)) if ("D".equalsIgnoreCase(detDrcrFlag))
{ {
sundryBalMap.put("dr_amt",detAmount); sundryBalMap.put("dr_amt",amtDbl);
sundryBalMap.put("cr_amt","0"); sundryBalMap.put("cr_amt",0.0);
} }
else else
{ {
sundryBalMap.put("cr_amt",detAmount); sundryBalMap.put("cr_amt",amtDbl);
sundryBalMap.put("dr_amt","0"); sundryBalMap.put("dr_amt",0.0);
} }
sundryBalMap.put("adv_amt", "0"); sundryBalMap.put("adv_amt",0.0);
sundryBalMap.put("contact_code",Fcommon.getContactCode(detSundryType,detSundryCode,conn)); sundryBalMap.put("contact_code",Fcommon.getContactCode(detSundryType,detSundryCode,conn));
errString = Fcommon.gbf_sundrybal_upd(sundryBalMap,conn); errString = Fcommon.gbf_sundrybal_upd(sundryBalMap,conn);
...@@ -689,7 +692,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -689,7 +692,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
pstmt.setString(13,revRefId); pstmt.setString(13,revRefId);
pstmt.setString(14,(String)journalMap.get("curr_code")); pstmt.setString(14,(String)journalMap.get("curr_code"));
pstmt.setString(15,tranType); pstmt.setString(15,tranType);
pstmt.setString(16,(String)journalMap.get("exch_rate")); //pstmt.setString(16,(String)journalMap.get("exch_rate"));
pstmt.setDouble(16,Double.parseDouble(journalMap.get("exch_rate").toString()));
pstmt.setTimestamp(17,toDay); pstmt.setTimestamp(17,toDay);
pstmt.setString(18,empCodeAprv); pstmt.setString(18,empCodeAprv);
pstmt.setString(19,(String)journalMap.get("proj_code")); pstmt.setString(19,(String)journalMap.get("proj_code"));
...@@ -1159,14 +1163,14 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1159,14 +1163,14 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
if ("D".equalsIgnoreCase(detDrcrFlag)) if ("D".equalsIgnoreCase(detDrcrFlag))
{ {
sundryBalMap.put("dr_amt",amount); sundryBalMap.put("dr_amt",amount);
sundryBalMap.put("cr_amt","0"); sundryBalMap.put("cr_amt",0.0);
} }
else else
{ {
sundryBalMap.put("cr_amt",amount); sundryBalMap.put("cr_amt",amount);
sundryBalMap.put("dr_amt","0"); sundryBalMap.put("dr_amt",0.0);
} }
sundryBalMap.put("adv_amt","0"); sundryBalMap.put("adv_amt",0.0);
sundryBalMap.put("contact_code",Fcommon.getContactCode(detSundryType,detSundryCode,conn)); sundryBalMap.put("contact_code",Fcommon.getContactCode(detSundryType,detSundryCode,conn));
...@@ -1378,7 +1382,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1378,7 +1382,8 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
pstmt.setString(13,tranId); // ref_no as a original tran_id pstmt.setString(13,tranId); // ref_no as a original tran_id
pstmt.setString(14,(String)journalMap.get("curr_code")); pstmt.setString(14,(String)journalMap.get("curr_code"));
pstmt.setString(15,tranType); pstmt.setString(15,tranType);
pstmt.setString(16,(String)journalMap.get("exch_rate")); //pstmt.setString(16,(String)journalMap.get("exch_rate"));
pstmt.setDouble(16,Double.parseDouble(journalMap.get("exch_rate").toString()));
pstmt.setTimestamp(17,toDay); pstmt.setTimestamp(17,toDay);
pstmt.setString(18,empCodeAprv); pstmt.setString(18,empCodeAprv);
pstmt.setString(19,detProjCode); pstmt.setString(19,detProjCode);
...@@ -1576,15 +1581,15 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon ...@@ -1576,15 +1581,15 @@ public class JvConfirm extends ActionHandlerEJB implements JvConfirmLocal,JvCon
sundryBalMap.put("exch_rate",journalMap.get("exch_rate")); sundryBalMap.put("exch_rate",journalMap.get("exch_rate"));
if ("D".equalsIgnoreCase(detDrcrFlag)) if ("D".equalsIgnoreCase(detDrcrFlag))
{ {
sundryBalMap.put("dr_amt","0"); sundryBalMap.put("dr_amt",0.0);
sundryBalMap.put("cr_amt",totAmount); sundryBalMap.put("cr_amt",totAmount);
} }
else else
{ {
sundryBalMap.put("cr_amt","0"); sundryBalMap.put("cr_amt",0.0);
sundryBalMap.put("dr_amt",totAmount); sundryBalMap.put("dr_amt",totAmount);
} }
sundryBalMap.put("adv_amt","0"); sundryBalMap.put("adv_amt",0.0);
sundryBalMap.put("contact_code",Fcommon.getContactCode(detSundryType,detSundryCode,conn)); sundryBalMap.put("contact_code",Fcommon.getContactCode(detSundryType,detSundryCode,conn));
errString = Fcommon.gbf_sundrybal_upd(sundryBalMap,conn); errString = Fcommon.gbf_sundrybal_upd(sundryBalMap,conn);
......
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