Skip to content

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

changes for accounting 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94537 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c91fef98
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 50 deletions
webitm-fin/ibase/webitm/ejb/fin/InvAcct.java
View file @ 005b3434
...@@ -1920,7 +1920,7 @@ public class InvAcct ...@@ -1920,7 +1920,7 @@ public class InvAcct
{ {
System.out.println(">>>>>>>>>>>>>>>>>><<<sdsd<<<<<<<<<<<<chk"); System.out.println("Enter in stkAdjust >>");
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;
...@@ -1943,7 +1943,7 @@ public class InvAcct ...@@ -1943,7 +1943,7 @@ public class InvAcct
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 " 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.acct_code__inrev,d.cctr_code__inv,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);
...@@ -1969,7 +1969,7 @@ public class InvAcct ...@@ -1969,7 +1969,7 @@ public class InvAcct
effDate = rs.getTimestamp(17); effDate = rs.getTimestamp(17);
diffAmt = rs.getDouble(18); diffAmt = rs.getDouble(18);
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));
...@@ -2086,20 +2086,18 @@ public class InvAcct ...@@ -2086,20 +2086,18 @@ public class InvAcct
if(amt > amt_old) if(amt > amt_old)
{ {
/*updateAcctMap.put("acct_code__inv",acctCdInv);
updateAcctMap.put("cctr_code__inv",cctrCdInv);*/
System.out.println("stk debit"+diffAmt); 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", diffAmt); updateAcctMap.put("dr_amt", diffAmt);
updateAcctMap.put("cr_amt", 0); updateAcctMap.put("cr_amt", 0);
System.out.println("CREDIT MA"+updateAcctMap);
errString = finCommon.glTraceUpdate(updateAcctMap,conn); errString = finCommon.glTraceUpdate(updateAcctMap,conn);
updateAcctMap.clear();
if(errString != null && errString.trim().length() > 0 ) if(errString != null && errString.trim().length() > 0 )
{ {
break; break;
...@@ -2109,19 +2107,16 @@ public class InvAcct ...@@ -2109,19 +2107,16 @@ public class InvAcct
else else
{ {
System.out.println("stk credit"+diffAmt); System.out.println("stk credit"+diffAmt);
/*updateAcctMap.put("acct_code__inrev",acctCdInvR);
updateAcctMap.put("cctr_code__inrev",cctrCdInvR);*/
updateAcctMap.put("acct_code",acctCdInvR); updateAcctMap.put("acct_code",acctCdInvR);
updateAcctMap.put("cctr_code",cctrCdInvR); updateAcctMap.put("cctr_code",cctrCdInvR);
updateAcctMap.put("analysis1",analysis1__cr); updateAcctMap.put("analysis1",analysis1__cr);
updateAcctMap.put("analysis2",analysis2__cr); updateAcctMap.put("analysis2",analysis2__cr);
updateAcctMap.put("analysis3",analysis3__cr); updateAcctMap.put("analysis3",analysis3__cr);
updateAcctMap.put("dr_amt", 0);
updateAcctMap.put("dr_amt", 0);
updateAcctMap.put("cr_amt", diffAmt); updateAcctMap.put("cr_amt", diffAmt);
System.out.println("DEBIT MA"+updateAcctMap);
errString = finCommon.glTraceUpdate(updateAcctMap,conn); errString = finCommon.glTraceUpdate(updateAcctMap,conn);
updateAcctMap.clear();
if(errString != null && errString.trim().length() > 0 ) if(errString != null && errString.trim().length() > 0 )
{ {
break; break;
...@@ -2132,21 +2127,18 @@ public class InvAcct ...@@ -2132,21 +2127,18 @@ public class InvAcct
if(amt_old > amt) if(amt_old > amt)
{ {
/*updateAcctMap.put("acct_code__inv",acctCdInv);
updateAcctMap.put("cctr_code__inv",cctrCdInv);*/
System.out.println("stk debit1"+diffAmt+"{"+acctCdInv+"}{"+cctrCdInv+""); System.out.println("stk debit1"+diffAmt+"{"+acctCdInv+"}{"+cctrCdInv+"");
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", diffAmt); updateAcctMap.put("dr_amt", diffAmt);
updateAcctMap.put("cr_amt", 0); updateAcctMap.put("cr_amt", 0);
System.out.println("DEBIT MA1"+updateAcctMap);
errString = finCommon.glTraceUpdate(updateAcctMap,conn); errString = finCommon.glTraceUpdate(updateAcctMap,conn);
updateAcctMap.clear();
if(errString != null && errString.trim().length() > 0 ) if(errString != null && errString.trim().length() > 0 )
{ {
break; break;
...@@ -2159,19 +2151,16 @@ public class InvAcct ...@@ -2159,19 +2151,16 @@ public class InvAcct
{ {
System.out.println("stk credit1"+diffAmt); 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("acct_code",acctCdInvR);
updateAcctMap.put("cctr_code",cctrCdInvR); updateAcctMap.put("cctr_code",cctrCdInvR);
updateAcctMap.put("analysis1",analysis1__cr); updateAcctMap.put("analysis1",analysis1__cr);
updateAcctMap.put("analysis2",analysis2__cr); updateAcctMap.put("analysis2",analysis2__cr);
updateAcctMap.put("analysis3",analysis3__cr); updateAcctMap.put("analysis3",analysis3__cr);
updateAcctMap.put("dr_amt", 0);
updateAcctMap.put("dr_amt", 0);
updateAcctMap.put("cr_amt", diffAmt); updateAcctMap.put("cr_amt", diffAmt);
System.out.println("CREDIT MA1"+updateAcctMap);
errString = finCommon.glTraceUpdate(updateAcctMap,conn); errString = finCommon.glTraceUpdate(updateAcctMap,conn);
updateAcctMap.clear();
if(errString != null && errString.trim().length() > 0 ) if(errString != null && errString.trim().length() > 0 )
{ {
break; break;
...@@ -2198,6 +2187,10 @@ public class InvAcct ...@@ -2198,6 +2187,10 @@ public class InvAcct
} }
return errString; return errString;
} }
......
webitm-fin/ibase/webitm/ejb/fin/StockValAdjTran.java
View file @ 005b3434
...@@ -14,10 +14,8 @@ import java.sql.Statement; ...@@ -14,10 +14,8 @@ import java.sql.Statement;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.Map;
import javax.ejb.Stateless; // added for ejb3 import javax.ejb.Stateless; // added for ejb3
import javax.swing.text.html.HTMLDocument.HTMLReader.PreAction;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Node; import org.w3c.dom.Node;
...@@ -522,16 +520,18 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca ...@@ -522,16 +520,18 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
else if(childNodeName.equalsIgnoreCase("quantity")) else if(childNodeName.equalsIgnoreCase("quantity"))
{ {
quantity = checkNull(genericUtility.getColumnValue("quantity",dom));
conquan = Double.parseDouble(quantity); quantity = genericUtility.getColumnValue("quantity",dom);
if (quantity.length() == 0)
if (quantity == null || quantity.trim().length() == 0 )
{ {
errCode = "STKVALQUAN"; errCode = "STKVALQUAN";
errString = getErrorString("quantity",errCode,userId); errString = getErrorString("quantity",errCode,userId);
break; break;
} }
else else
{ {
conquan = Double.parseDouble(quantity);
siteCode = genericUtility.getColumnValue("site_code",dom1); siteCode = genericUtility.getColumnValue("site_code",dom1);
sql = "select quantity from stock where site_code = ? and item_code = ? and loc_code = ? and lot_no = ? and lot_sl=?"; sql = "select quantity from stock where site_code = ? and item_code = ? and loc_code = ? and lot_no = ? and lot_sl=?";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
......
webitm-fin/ibase/webitm/ejb/fin/StockValAdjTranConf.java
View file @ 005b3434
package ibase.webitm.ejb.fin; package ibase.webitm.ejb.fin;
import ibase.system.config.ConnDriver; import ibase.system.config.ConnDriver;
import ibase.webitm.ejb.ActionHandlerEJB;
import ibase.webitm.ejb.ITMDBAccessEJB; import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.ITMDBAccessLocal; import ibase.webitm.ejb.ITMDBAccessLocal;
import ibase.webitm.utility.GenericUtility; import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import ibase.webitm.ejb.ActionHandlerEJB;
import ibase.webitm.ejb.fin.InvAcct;
import java.sql.*;
import java.util.*;
import java.util.StringTokenizer;
import javax.ejb.Stateless;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Map;
import javax.ejb.Stateless;
@Stateless @Stateless
public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdjTranConfLocal,StockValAdjTranConfRemote { public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdjTranConfLocal,StockValAdjTranConfRemote {
...@@ -27,6 +29,7 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj ...@@ -27,6 +29,7 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj
{ {
retString = confirmTran(tranId,xtraParams,forcedFlag); retString = confirmTran(tranId,xtraParams,forcedFlag);
System.out.println("retString >>>>"+retString);
} }
catch(Exception e) catch(Exception e)
...@@ -45,6 +48,8 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj ...@@ -45,6 +48,8 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj
ResultSet rs=null; ResultSet rs=null;
Connection conn=null; Connection conn=null;
String confirmed = ""; String confirmed = "";
String isError = "";
String errCall="";
PreparedStatement pstmt=null; PreparedStatement pstmt=null;
String errString="",sql="",loginEmpCode="",siteCode="",itemCode="",locCode="",lotNo="",lotSl=""; String errString="",sql="",loginEmpCode="",siteCode="",itemCode="",locCode="",lotNo="",lotSl="";
double PriceListRate=0,amount=0; double PriceListRate=0,amount=0;
...@@ -115,6 +120,16 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj ...@@ -115,6 +120,16 @@ 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);
errCall = inv.stkAdjust(tranId, conn);
System.out.println(">>>>>>> errCall"+errCall);
if(errCall.trim().length() > 0)
{
System.out.println(">>>>>> isErrorcall");
errString = errCall;
return errString;
}
count=updateStockValAdj(conn, loginEmpCode, tranId); count=updateStockValAdj(conn, loginEmpCode, tranId);
System.out.println("updateStockRateAsPerPriceListRate count-->["+count+"]"); System.out.println("updateStockRateAsPerPriceListRate count-->["+count+"]");
...@@ -122,17 +137,9 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj ...@@ -122,17 +137,9 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj
System.out.println("654321"); System.out.println("654321");
System.out.println("123456"); System.out.println("123456");
String errCall = inv.stkAdjust(tranId, conn);
System.out.println(">>>>>>> errCall"+errCall);
if(errCall.trim().length() > 0)
{
errCall = errString;
return errString;
}
count=updateStockRateAsPerPriceListRate(conn, updateStockMap); count=updateStockRateAsPerPriceListRate(conn, updateStockMap);
System.out.println("updateStockValAdj-->>["+count+"]"); System.out.println("updateStockValAdj-->>["+count+"]");
if(count > 0){ if(count > 0){
...@@ -151,9 +158,12 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj ...@@ -151,9 +158,12 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj
} }
} }
......
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