Skip to content

B
business-java
Commit c91fef98 authored by dsawant's avatar dsawant
Browse files
Options

updated for stock revaluation 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94536 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d84e4e73
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 251 additions and 307 deletions
webitm-fin/ibase/webitm/ejb/fin/InvAcct.java
View file @ c91fef98
...@@ -1918,11 +1918,13 @@ public class InvAcct ...@@ -1918,11 +1918,13 @@ public class InvAcct
public String stkAdjust(String tranId, Connection conn)throws ITMException public String stkAdjust(String tranId, Connection conn)throws ITMException
{ {
System.out.println(">>>>>>>>>>>>>>>>>><<<sdsd<<<<<<<<<<<<chk"); System.out.println(">>>>>>>>>>>>>>>>>><<<sdsd<<<<<<<<<<<<chk");
String siteCode="",itemCode ="",locCode="",lotNo="",lotSl="",itemSer="",acctCode="",cctrCode=""; String siteCode="",itemCode ="",locCode="",lotNo="",lotSl="",itemSer="",acctCode="",cctrCode="";
String getAcctCctr="",errString=""; String getAcctCctr="",errString="";
String[] values; String[] values;
double Rate,oldRate,amt,amt_old; double Rate,oldRate,amt,amt_old,diffAmt;
HashMap updateAcctMap =new HashMap(); HashMap updateAcctMap =new HashMap();
ResultSet rs=null,rs1=null; ResultSet rs=null,rs1=null;
String confirmed = ""; String confirmed = "";
...@@ -1936,11 +1938,12 @@ public class InvAcct ...@@ -1936,11 +1938,12 @@ public class InvAcct
String currCodeBase="",currCode="",finEntity=""; String currCodeBase="",currCode="",finEntity="";
SimpleDateFormat sdf = null; SimpleDateFormat sdf = null;
java.sql.Timestamp tranDate = null, effDate = null; java.sql.Timestamp tranDate = null, effDate = null;
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
try{ try{
sql="select h.site_code,d.rate,d.rate__old,d.amount,d.amount__old,d.item_code,d.loc_code,d.lot_no,d.lot_sl,h.item_ser,d.acct_code__inv,d.cctr_code__inv,d.acct_code__inrev,d.cctr_code__inrev,h.tran_type ,h.tran_date,h.eff_date " sql="select h.site_code,d.rate,d.rate__old,d.amount,d.amount__old,d.item_code,d.loc_code,d.lot_no,d.lot_sl,h.item_ser,d.acct_code__inv,d.cctr_code__inv,d.acct_code__inrev,d.cctr_code__inrev,h.tran_type ,h.tran_date,h.eff_date,d.amount__diff "
+ "from stock_val_adj h,stock_val_adj_det d where h.tran_id=d.tran_id and d.tran_id = ?"; + "from stock_val_adj h,stock_val_adj_det d where h.tran_id=d.tran_id and d.tran_id = ?";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1, tranId); pstmt.setString(1, tranId);
...@@ -1964,15 +1967,9 @@ public class InvAcct ...@@ -1964,15 +1967,9 @@ public class InvAcct
tranType = checkNull(rs.getString(15)); tranType = checkNull(rs.getString(15));
tranDate = rs.getTimestamp(16); tranDate = rs.getTimestamp(16);
effDate = rs.getTimestamp(17); effDate = rs.getTimestamp(17);
diffAmt = rs.getDouble(18);
/* getAcctCctr = finCommon.getFromAcctDetr(itemCode, itemSer,"STKRADJ", conn);
values = getAcctCctr.split(",");
acctCode = values[0].trim();
cctrCode = values[1].trim();*/
// SimpleDateFormat simpleDateFormatObj = new SimpleDateFormat(genericUtility.getApplDateFormat());
// utranDate = simpleDateFormatObj.parse(tranDate);
// ueffDate = simpleDateFormatObj.parse(effDate);
updateAcctMap.put("rate",Double.toString(Rate)); updateAcctMap.put("rate",Double.toString(Rate));
updateAcctMap.put("rate__old",Double.toString(oldRate)); updateAcctMap.put("rate__old",Double.toString(oldRate));
...@@ -1991,6 +1988,7 @@ public class InvAcct ...@@ -1991,6 +1988,7 @@ public class InvAcct
updateAcctMap.put("ref_type", ""); updateAcctMap.put("ref_type", "");
updateAcctMap.put("ref_id", tranId); updateAcctMap.put("ref_id", tranId);
updateAcctMap.put("ref_ser","STKVAT");
sql1 = "SELECT A.CURR_CODE AS CURR_CODE FROM FINENT A, SITE B WHERE B.FIN_ENTITY = A.FIN_ENTITY AND B.SITE_CODE = ?"; sql1 = "SELECT A.CURR_CODE AS CURR_CODE FROM FINENT A, SITE B WHERE B.FIN_ENTITY = A.FIN_ENTITY AND B.SITE_CODE = ?";
pstmt1 = conn.prepareStatement(sql1); pstmt1 = conn.prepareStatement(sql1);
pstmt1.setString(1,siteCode); pstmt1.setString(1,siteCode);
...@@ -2022,7 +2020,7 @@ public class InvAcct ...@@ -2022,7 +2020,7 @@ public class InvAcct
updateAcctMap.put("curr_code",currCode); updateAcctMap.put("curr_code",currCode);
updateAcctMap.put("fin_entity",finEntity); updateAcctMap.put("fin_entity",finEntity);
analysis = AcctAnalysisType( itemCode,"S-INV", tranType, "CR", conn); analysis = AcctAnalysisType( itemCode,"STKVAT", tranType, "CR", conn);
analysisStr = analysis.split("@"); analysisStr = analysis.split("@");
int len = analysisStr.length-1; int len = analysisStr.length-1;
...@@ -2052,7 +2050,7 @@ public class InvAcct ...@@ -2052,7 +2050,7 @@ public class InvAcct
analysis3__cr =""; analysis3__cr ="";
} }
analysis = AcctAnalysisType( itemCode, "S-INV", tranType, "DR", conn); analysis = AcctAnalysisType( itemCode, "STKVAT", tranType, "DR", conn);
System.out.println("@@@@DR return analysis["+analysis+"]"); System.out.println("@@@@DR return analysis["+analysis+"]");
//analysisStr = analysis.split("@@@@@@2 analysis::["+analysis+"]"); //analysisStr = analysis.split("@@@@@@2 analysis::["+analysis+"]");
...@@ -2090,18 +2088,18 @@ public class InvAcct ...@@ -2090,18 +2088,18 @@ public class InvAcct
{ {
/*updateAcctMap.put("acct_code__inv",acctCdInv); /*updateAcctMap.put("acct_code__inv",acctCdInv);
updateAcctMap.put("cctr_code__inv",cctrCdInv);*/ updateAcctMap.put("cctr_code__inv",cctrCdInv);*/
System.out.println("stk debit"+amt); System.out.println("stk debit"+diffAmt);
updateAcctMap.put("acct_code",acctCdInv); updateAcctMap.put("acct_code",acctCdInv);
updateAcctMap.put("cctr_code",cctrCdInv); updateAcctMap.put("cctr_code",cctrCdInv);
updateAcctMap.put("analysis1",analysis1__dr); updateAcctMap.put("analysis1",analysis1__dr);
updateAcctMap.put("analysis2",analysis2__dr); updateAcctMap.put("analysis2",analysis2__dr);
updateAcctMap.put("analysis3",analysis3__dr); updateAcctMap.put("analysis3",analysis3__dr);
updateAcctMap.put("dr_amt", amt); updateAcctMap.put("dr_amt", diffAmt);
updateAcctMap.put("cr_amt", 0); updateAcctMap.put("cr_amt", 0);
errString = finCommon.glTraceUpdate(updateAcctMap,conn); errString = finCommon.glTraceUpdate(updateAcctMap,conn);
updateAcctMap = null; updateAcctMap.clear();
if(errString != null && errString.trim().length() > 0 ) if(errString != null && errString.trim().length() > 0 )
{ {
break; break;
...@@ -2110,6 +2108,7 @@ public class InvAcct ...@@ -2110,6 +2108,7 @@ public class InvAcct
} }
else else
{ {
System.out.println("stk credit"+diffAmt);
/*updateAcctMap.put("acct_code__inrev",acctCdInvR); /*updateAcctMap.put("acct_code__inrev",acctCdInvR);
updateAcctMap.put("cctr_code__inrev",cctrCdInvR);*/ updateAcctMap.put("cctr_code__inrev",cctrCdInvR);*/
updateAcctMap.put("acct_code",acctCdInvR); updateAcctMap.put("acct_code",acctCdInvR);
...@@ -2119,10 +2118,10 @@ public class InvAcct ...@@ -2119,10 +2118,10 @@ public class InvAcct
updateAcctMap.put("analysis3",analysis3__cr); updateAcctMap.put("analysis3",analysis3__cr);
updateAcctMap.put("dr_amt", 0); updateAcctMap.put("dr_amt", 0);
updateAcctMap.put("cr_amt", amt); updateAcctMap.put("cr_amt", diffAmt);
errString = finCommon.glTraceUpdate(updateAcctMap,conn); errString = finCommon.glTraceUpdate(updateAcctMap,conn);
updateAcctMap = null; updateAcctMap.clear();
if(errString != null && errString.trim().length() > 0 ) if(errString != null && errString.trim().length() > 0 )
{ {
break; break;
...@@ -2130,6 +2129,66 @@ public class InvAcct ...@@ -2130,6 +2129,66 @@ public class InvAcct
//inrev cred //inrev cred
} }
if(amt_old > amt)
{
/*updateAcctMap.put("acct_code__inv",acctCdInv);
updateAcctMap.put("cctr_code__inv",cctrCdInv);*/
System.out.println("stk debit1"+diffAmt+"{"+acctCdInv+"}{"+cctrCdInv+"");
updateAcctMap.put("acct_code",acctCdInv);
updateAcctMap.put("cctr_code",cctrCdInv);
updateAcctMap.put("analysis1",analysis1__dr);
updateAcctMap.put("analysis2",analysis2__dr);
updateAcctMap.put("analysis3",analysis3__dr);
updateAcctMap.put("dr_amt", diffAmt);
updateAcctMap.put("cr_amt", 0);
errString = finCommon.glTraceUpdate(updateAcctMap,conn);
updateAcctMap.clear();
if(errString != null && errString.trim().length() > 0 )
{
break;
}
// stk acct debit
}
else
{
System.out.println("stk credit1"+diffAmt);
/*updateAcctMap.put("acct_code__inrev",acctCdInvR);
updateAcctMap.put("cctr_code__inrev",cctrCdInvR);*/
updateAcctMap.put("acct_code",acctCdInvR);
updateAcctMap.put("cctr_code",cctrCdInvR);
updateAcctMap.put("analysis1",analysis1__cr);
updateAcctMap.put("analysis2",analysis2__cr);
updateAcctMap.put("analysis3",analysis3__cr);
updateAcctMap.put("dr_amt", 0);
updateAcctMap.put("cr_amt", diffAmt);
errString = finCommon.glTraceUpdate(updateAcctMap,conn);
updateAcctMap.clear();
if(errString != null && errString.trim().length() > 0 )
{
break;
}
//inrev cred
}
System.out.println();
errString=finCommon.checkGlTranDrCr("STKVAT", tranId, conn);
if(errString != null && errString.trim().length() > 0)
{
errString=itmDBAccessEJB.getErrorString("","VCOINDIFF1","");
return errString;
}
System.out.println("all correct");
} }
...@@ -2139,9 +2198,7 @@ public class InvAcct ...@@ -2139,9 +2198,7 @@ public class InvAcct
} }
return errString; return errString;
} }
......
webitm-fin/ibase/webitm/ejb/fin/StockValAdjTranConf.java
View file @ c91fef98
...@@ -57,7 +57,7 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj ...@@ -57,7 +57,7 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj
{ {
ConnDriver connDriver = null; ConnDriver connDriver = null;
connDriver = new ConnDriver(); connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverValidator"); conn = connDriver.getConnectDB("DriverITM");
loginEmpCode=GenericUtility.getInstance().getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode"); loginEmpCode=GenericUtility.getInstance().getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode");
loginEmpCode=loginEmpCode==null ? "" :loginEmpCode.trim(); loginEmpCode=loginEmpCode==null ? "" :loginEmpCode.trim();
System.out.println("loginEmpCode---->>["+loginEmpCode+"]"); System.out.println("loginEmpCode---->>["+loginEmpCode+"]");
...@@ -115,16 +115,25 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj ...@@ -115,16 +115,25 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj
updateStockMap.put("lot_no",lotNo); updateStockMap.put("lot_no",lotNo);
updateStockMap.put("lot_sl",lotSl); updateStockMap.put("lot_sl",lotSl);
count=updateStockRateAsPerPriceListRate(conn, updateStockMap);
count=updateStockValAdj(conn, loginEmpCode, tranId);
System.out.println("updateStockRateAsPerPriceListRate count-->["+count+"]"); System.out.println("updateStockRateAsPerPriceListRate count-->["+count+"]");
if(count > 0){ if(count > 0){
System.out.println("654321"); System.out.println("654321");
System.out.println("123456"); System.out.println("123456");
String errCall = inv.stkAdjust(tranId, conn); String errCall = inv.stkAdjust(tranId, conn);
System.out.println(">>>>>>> errCall"+errCall); System.out.println(">>>>>>> errCall"+errCall);
count=updateStockValAdj(conn, loginEmpCode, tranId);
if(errCall.trim().length() > 0)
{
errCall = errString;
return errString;
}
count=updateStockRateAsPerPriceListRate(conn, updateStockMap);
System.out.println("updateStockValAdj-->>["+count+"]"); System.out.println("updateStockValAdj-->>["+count+"]");
if(count > 0){ if(count > 0){
//confirmed messages show............. //confirmed messages show.............
......
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