Skip to content

B
business-java
Commit 95dc6ad3 authored by msalla's avatar msalla
Browse files
Options

At gimatex, remark given in detail screen of misc voucher is not getting... 

At gimatex, remark given in detail screen of misc voucher is not getting updated in gltrace and gltran.
find the attached detail record and gltrace record

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@203310 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 0f858018
Show whitespace changes
Inline Side-by-side
Showing with 620 additions and 589 deletions
webitm-fin/ibase/webitm/ejb/fin/adv/MiscValConf.java
View file @ 95dc6ad3
......@@ -2,7 +2,7 @@
* @author : Chandni Shah
* @Version : 1.0
* Date : 08/08/11
*/
*/
package ibase.webitm.ejb.fin.adv;
......@@ -36,7 +36,7 @@ import java.util.*;
public class MiscValConf extends ActionHandlerEJB implements MiscValConfLocal,MiscValConfRemote //SessionBean
{
E12GenericUtility genericUtility = new E12GenericUtility();
public String confirm(String tranId,String xtraParams,String forcedFlag) throws RemoteException,ITMException{
public String confirm(String tranId,String xtraParams,String forcedFlag) throws RemoteException,ITMException{
String errString ="";
Connection conn = null;
......@@ -65,21 +65,21 @@ public String confirm(String tranId,String xtraParams,String forcedFlag) throws
String errString = "" ;
FinCommon finCommon = null;
// GenericUtility genericUtility = null;
// GenericUtility genericUtility = null;
ITMDBAccessEJB itmDBAccessEJB = null;
boolean isLocalConn = false;
try
{
finCommon = new FinCommon();
// genericUtility = new GenericUtility();
// genericUtility = new GenericUtility();
itmDBAccessEJB = new ITMDBAccessEJB();
if(conn == null){
connDriver = new ConnDriver();
//Changes and Commented By Bhushan on 06-06-2016 :START
//conn = connDriver.getConnectDB("DriverITM");
conn = getConnection();
//Changes and Commented By Bhushan on 06-06-2016 :END
conn = getConnection();
//Changes and Commented By Bhushan on 06-06-2016 :END
connDriver = null;
conn.setAutoCommit(false);
isLocalConn = true;
......@@ -181,11 +181,11 @@ conn = getConnection();
String sql = "",sqlInsert = "",sqlInner="";
ConnDriver connDriver = null;
String loginEmpCode = "" ;
// GenericUtility genericUtility = null;
// GenericUtility genericUtility = null;
ITMDBAccessEJB itmDBAccessEJB = null;
FinCommon Fcommon = new FinCommon();
DistCommon Dcommon = new DistCommon();
// genericUtility = new GenericUtility();
// genericUtility = new GenericUtility();
String vouchType ="",tranType= "",sundryType = "",sundryCode="",acctCodeAp="",cctrCodeAp="",billNo="",orderRef="";
String siteCode="",finEntity="",currCode="",projCode = "",crTerm="",acctCodeAdv="",cctrCodeAdv="",autoPay="";
......@@ -221,7 +221,7 @@ conn = getConnection();
String winName="",cctrcodeRnd="";
String ledgPostConf="",errString="",lineNoTax="",acctCodeTax="",cctrCodeTax="",taxRecoCctr="";
String lineNoReco="",acctCodeReco="",cctrCodeReco="",siteCodeFor ="";
String lineNoReco="",acctCodeReco="",cctrCodeReco="",siteCodeFor ="",remarksdet="";
double totTaxAmt=0,totRecoAmt=0,amt=0,recoAmt=0,netWr=0,rndAmtTot=0;
double totAmtPayables=0,adjAmtPayables=0,holdAmtPayables=0;
int lineInt =0,cnt = 0,lineNoDet = 0;
......@@ -388,15 +388,28 @@ conn = getConnection();
//Added By PriyankaC on 22-MAY-2019[Start].
mischdrMap.put("site_code__pay",sitePayment);
//Added By PriyankaC on 22-MAY-2019. [END]
//lds_det ---> d_misc_vouchdet_brow
System.out.println("added data map miscdetList.........111");
sql = " SELECT line_no,acct_code,cctr_code,amount,anal_code,emp_code,apply_tax,tax_amt, "
//commented by-Monika-on-12-july-2019 to add remarks
/*sql = " SELECT line_no,acct_code,cctr_code,amount,anal_code,emp_code,apply_tax,tax_amt, "
+" sundry_type__for,sundry_code__for,acct_code__dr, cctr_code__dr,acct_code__cr,cctr_code__cr, "
+" prcp_id, line_no__rcp,item_code, "
+" dept_code,quantity,rate, rate__clg, bill_no, bill_date,bill_amt, tax_class, tax_chap,tax_env, taxed_adj_amt, "
+" contract_id,line_no__con,proj_code,anal_code__1,anal_code__2 "
+" FROM misc_vouchdet "
+" WHERE TRAN_ID = ? " ;*/
//changes made by -Monika-on-12-july-2019
sql = " SELECT line_no,acct_code,cctr_code,amount,anal_code,emp_code,apply_tax,tax_amt, "
+" sundry_type__for,sundry_code__for,acct_code__dr, cctr_code__dr,acct_code__cr,cctr_code__cr, "
+" prcp_id, line_no__rcp,item_code, "
+" dept_code,quantity,rate, rate__clg, bill_no, bill_date,bill_amt, tax_class, tax_chap,tax_env, taxed_adj_amt, "
+" contract_id,line_no__con,proj_code,anal_code__1,anal_code__2 ,remarks"
+" FROM misc_vouchdet "
+" WHERE TRAN_ID = ? " ;
//end
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
......@@ -434,6 +447,9 @@ conn = getConnection();
projCodeDet = rs.getString("proj_code");
analCode1 = rs.getString("anal_code__1");
analCode2 = rs.getString("anal_code__2");
//changes made by -Monika-on-12-july-2019
remarksdet=rs.getString("remarks");
//end
System.out.println("Line no is:-"+lineNo);
miscdetMap = new HashMap();
miscdetMap.put("line_no",lineNo);
......@@ -469,6 +485,9 @@ conn = getConnection();
miscdetMap.put("rate__clg",rateClg);
miscdetMap.put("anal_code__1",analCode1);
miscdetMap.put("anal_code__2",analCode2);
//changes made by -Monika-on-12-july-2019
miscdetMap.put("remarks",remarksdet);
//end
miscdetList.add(miscdetMap);
}
rs.close();
......@@ -714,7 +733,7 @@ conn = getConnection();
// miscdetListMap = new HashMap();
// miscdetListMap = (HashMap) miscdetList.get(ctr);
// lineNo = (String) miscdetListMap.get("line_no");
// lineNo = (String) miscdetListMap.get("line_no");
System.out.println("line no ::"+lineNo);
System.out.println("lineNoTax ::"+lineNoTax);
......@@ -734,9 +753,9 @@ conn = getConnection();
pstmtInner = null;
// acctCode = (String) miscdetListMap.get("acct_code");
// cctrCode =(String) miscdetListMap.get("cctr_code");
// amount = Double.parseDouble(miscdetListMap.get("amount").toString());
// acctCode = (String) miscdetListMap.get("acct_code");
// cctrCode =(String) miscdetListMap.get("cctr_code");
// amount = Double.parseDouble(miscdetListMap.get("amount").toString());
//amtTax = amount+amt;
if(cnt > 0 )
{
......@@ -845,8 +864,8 @@ conn = getConnection();
}
//for (int ctr =0; ctr< miscdetList.size(); ctr++)
//{
// miscdetListMap = new HashMap();
// miscdetListMap = (HashMap) miscdetList.get(ctr);
// miscdetListMap = new HashMap();
// miscdetListMap = (HashMap) miscdetList.get(ctr);
// lineNo = (String) miscdetListMap.get("line_no");
// acctCode = (String) miscdetListMap.get("acct_code");
......@@ -869,9 +888,9 @@ conn = getConnection();
pstmtInner = null;
// acctCode = (String) miscdetListMap.get("acct_code");
// cctrCode =(String) miscdetListMap.get("cctr_code");
// amount = Double.parseDouble(miscdetListMap.get("amount").toString());
// acctCode = (String) miscdetListMap.get("acct_code");
// cctrCode =(String) miscdetListMap.get("cctr_code");
// amount = Double.parseDouble(miscdetListMap.get("amount").toString());
//amtTax = amount+amt;
if(cnt > 0 )
{
......@@ -947,7 +966,7 @@ conn = getConnection();
if(rndAmtTot != 0)
{
cctrcodeRnd = Fcommon.getFinparams("999999","RND_ACCT",conn);
/* if(cctrcodeRnd != null)
/* if(cctrcodeRnd != null)
{
String[] arry =this.string2StringArray(cctrcodeRnd , ";");
acctRnd = arry[0].toString();
......@@ -1006,16 +1025,24 @@ conn = getConnection();
miscdetList.clear();
}
// misc_vouchdet inserted and updated many time...so create new list for passing it into next method, below code is done
System.out.println("added data in map miscdetList------------------222");
sql =" SELECT line_no,acct_code,cctr_code,amount,anal_code,emp_code,apply_tax,tax_amt, "
//commented by monika-12-july-2019
/*sql =" SELECT line_no,acct_code,cctr_code,amount,anal_code,emp_code,apply_tax,tax_amt, "
+" sundry_type__for,sundry_code__for,acct_code__dr, cctr_code__dr,acct_code__cr,cctr_code__cr, "
+" prcp_id, line_no__rcp,item_code, "
+" dept_code,quantity,rate, rate__clg, bill_no, bill_date,bill_amt, tax_class, tax_chap,tax_env, taxed_adj_amt, "
+" contract_id,line_no__con,proj_code,anal_code__1,anal_code__2 "
+" FROM misc_vouchdet "
+" WHERE TRAN_ID = ? " ;*/
//changes made by monika-on-12-july-2019-to add remark
sql =" SELECT line_no,acct_code,cctr_code,amount,anal_code,emp_code,apply_tax,tax_amt, "
+" sundry_type__for,sundry_code__for,acct_code__dr, cctr_code__dr,acct_code__cr,cctr_code__cr, "
+" prcp_id, line_no__rcp,item_code, "
+" dept_code,quantity,rate, rate__clg, bill_no, bill_date,bill_amt, tax_class, tax_chap,tax_env, taxed_adj_amt, "
+" contract_id,line_no__con,proj_code,anal_code__1,anal_code__2,remarks "
+" FROM misc_vouchdet "
+" WHERE TRAN_ID = ? " ;
//end
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
......@@ -1053,7 +1080,9 @@ conn = getConnection();
projCodeDet = rs.getString("proj_code");
analCode1 = rs.getString("anal_code__1");
analCode2 = rs.getString("anal_code__2");
//changes made by monika-on-12-july-2019-to add remark
remarksdet=rs.getString("remarks");
//end
miscdetMap = new HashMap();
miscdetMap.put("line_no",lineNo);
miscdetMap.put("acct_code",acctCode);
......@@ -1088,6 +1117,7 @@ conn = getConnection();
miscdetMap.put("rate__clg",rateClg);
miscdetMap.put("anal_code__1",analCode1);
miscdetMap.put("anal_code__2",analCode2);
miscdetMap.put("remarks",remarksdet);
miscdetList.add(miscdetMap);
}
rs.close();
......@@ -1256,10 +1286,10 @@ conn = getConnection();
String sql = "",sqlInner="";
ConnDriver connDriver = null;
String errString = "" ;
// GenericUtility genericUtility = null;
// GenericUtility genericUtility = null;
ITMDBAccessEJB itmDBAccessEJB = null;
FinCommon Fcommon = new FinCommon();
// genericUtility = new GenericUtility();
// genericUtility = new GenericUtility();
E12GenericUtility genericUtility = new E12GenericUtility();
String runMode="I",chgUser="",chgTerm="",tranType="",refType="",siteCodeFor="";
String sundryType="",supp="",siteCode="",sitePayment="",winName="",finEntFr="",keyString="";
......@@ -1746,7 +1776,7 @@ conn = getConnection();
pstmt =null;
}
}//End by Abhijit Gaikwad
*/
*/
System.out.println("sitePayment"+sitePayment+" !=siteCode"+siteCode);
System.out.println("sundryTypePay"+sundryTypePay+" !=suppPay"+suppPay);
if(sitePayment== null || sitePayment.trim().length() == 0 ) // Condition added by Nandkumar Gadkari on 26/07/18
......@@ -2129,10 +2159,10 @@ conn = getConnection();
String sql = "",sqlInner="";
ConnDriver connDriver = null;
String errString = "" ;
// GenericUtility genericUtility = null;
// GenericUtility genericUtility = null;
ITMDBAccessEJB itmDBAccessEJB = null;
FinCommon Fcommon = new FinCommon();
// genericUtility = new GenericUtility();
// genericUtility = new GenericUtility();
E12GenericUtility genericUtility = new E12GenericUtility();
HashMap glTraceMap = null,acctMap = null,sundryBalMap = null,miscPayMap = null,detListMap = null;
......@@ -3104,17 +3134,17 @@ conn = getConnection();
String sql = "",sqlInner="";
ConnDriver connDriver = null;
String errString = "" ;
// GenericUtility genericUtility = null;
// GenericUtility genericUtility = null;
ITMDBAccessEJB itmDBAccessEJB = null;
FinCommon Fcommon = new FinCommon();
// genericUtility = new GenericUtility();
// genericUtility = new GenericUtility();
E12GenericUtility genericUtility = new E12GenericUtility();
HashMap glTraceMap = null,acctMap = null,sundryBalMap = null,detListMap = null;
double advAmt=0,taxTranAmt=0,amount=0,drAmt=0,glDrAmt=0,crAmt=0,glCrAmt=0,acctAmt=0,acctDrAmt=0;
double acctCrAmt=0,tCrAmt=0,taxCrAmt=0,tDrAmt=0,taxDrAmt=0,taxAmt=0,totAmount =0;
String lineNo="",acctCode="",vouchType="",acctCodeAdv="",cctrCode="",deptCode="",empCode="";
String analCode="",remarks="",projCode="",sType="",sCode="",rSer="",rId="";
String siteCode="",siteCodeFor="",acctCodePay="",cctrCodePay="",taxAcctCode="",taxCctrCode="";
String siteCode="",siteCodeFor="",acctCodePay="",cctrCodePay="",taxAcctCode="",taxCctrCode="",remarksdet="";
try
{
......@@ -3373,6 +3403,7 @@ conn = getConnection();
{
glTraceMap.put("remarks",remarks);
}
glTraceMap.put("proj_code",projCode);
rSer = (String)glTraceMap.get("ref_ser");
rId = (String)glTraceMap.get("ref_id");
......@@ -3456,7 +3487,7 @@ conn = getConnection();
glTraceMap.put("ref_type","F");
glTraceMap.put("ref_ser","M-VOUC");
glTraceMap.put("ref_id",tranId);
glTraceMap.put("remarks",remarks);
glTraceMap.put("remarks",remarksdet);
rSer = (String)glTraceMap.get("ref_ser");
rId = (String)glTraceMap.get("ref_id");
glTraceMap.put("party_doc_ref",Fcommon.gfGetPartyDocRef(rSer,rId,conn));
......@@ -3605,7 +3636,7 @@ conn = getConnection();
String sql ="",sqlInner="";
ConnDriver connDriver = null;
// GenericUtility genericUtility = null;
// GenericUtility genericUtility = null;
ITMDBAccessEJB itmDBAccessEJB = null;
FinCommon Fcommon = new FinCommon();
JvConfirm JvConf = new JvConfirm();
......@@ -3630,7 +3661,7 @@ conn = getConnection();
try
{
E12GenericUtility genericUtility = new E12GenericUtility();
// genericUtility = new GenericUtility();
// genericUtility = new GenericUtility();
empCodeAprv = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode");
sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
itmDBAccessEJB = new ITMDBAccessEJB();
......@@ -4038,7 +4069,7 @@ conn = getConnection();
String sql = "";
ConnDriver connDriver = null;
String errString = "" ;
// GenericUtility genericUtility = null;
// GenericUtility genericUtility = null;
ITMDBAccessEJB itmDBAccessEJB = null;
String errCode="",tranId = "";
......
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