Skip to content

B
business-java
Commit 57494975 authored by sbehera's avatar sbehera
Browse files
Options

Changes Made on StockTransferConf for viewing the accounting effect. This EJB... 

Changes Made on StockTransferConf for viewing the accounting effect. This EJB calls the method  retrieveStockTrans() i.e. in InvAcct Class of FinCommon.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93424 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b98df3aa
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 381 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/StockTransferConf.java
View file @ 57494975
...@@ -9,8 +9,8 @@ import ibase.webitm.utility.*; ...@@ -9,8 +9,8 @@ import ibase.webitm.utility.*;
import ibase.webitm.ejb.*; import ibase.webitm.ejb.*;
import ibase.webitm.ejb.dis.*; import ibase.webitm.ejb.dis.*;
import ibase.webitm.ejb.fin.FinCommon; import ibase.webitm.ejb.fin.FinCommon;
import ibase.webitm.ejb.fin.InvAcct;
import ibase.webitm.ejb.sys.*; import ibase.webitm.ejb.sys.*;
import ibase.webitm.ejb.fin.InvAcct;
import ibase.system.config.*; import ibase.system.config.*;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
//Changed by Rohan on 17-07-13 for import package //Changed by Rohan on 17-07-13 for import package
...@@ -46,11 +46,10 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -46,11 +46,10 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
{ {
retString = this.confirm(tranID, xtraParams, forcedFlag, conn, isConn); retString = this.confirm(tranID, xtraParams, forcedFlag, conn, isConn);
System.out.println("retString:::::"+retString); System.out.println("retString:::::"+retString);
//if ( retString != null && retString.length() > 0 )
/*if ( retString != null && retString.length() > 0 ) commented by somanath on 25/jul/2013 //{
{ // throw new Exception("Exception while calling confirm for tran Id:["+tranID+"]");
throw new Exception("Exception while calling confirm for tran Id:["+tranID+"]"); //}
}*/
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -141,12 +140,12 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -141,12 +140,12 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
InvAllocTraceBean invAllocTrace = new InvAllocTraceBean(); InvAllocTraceBean invAllocTrace = new InvAllocTraceBean();
DistCommon dComm = new DistCommon(); DistCommon dComm = new DistCommon();
double balQty = 0; double balQty = 0;
boolean isConn=false;//added by somanath on 25.07.2013 boolean isConn=false;//added by somanath on 03.08.13
try try
{ {
if ( conn == null ) if ( conn == null )
{ {
isConn=false;//added by somanath on 25.07.2013 isConn=false;//added by somanath on 03.08.13
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
connDriver = null; connDriver = null;
...@@ -183,8 +182,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -183,8 +182,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
if( confirmed.equalsIgnoreCase("Y") ) if( confirmed.equalsIgnoreCase("Y") )
{ {
System.out.println("The transaction already confirmed"); retString = itmDBAccess.getErrorString("","CONFIRMED","");
retString = itmDBAccess.getErrorString("","VTCONF8","");//added by somanath on 25.07.2013
return retString; return retString;
} }
else else
...@@ -291,7 +289,9 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -291,7 +289,9 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
updateRowMap.put("lot_sl", lotSl); updateRowMap.put("lot_sl", lotSl);
updateRowMap.put("quantity", ""+quantity); updateRowMap.put("quantity", ""+quantity);
/* Added by Ashish Sonawane on 07-sep-12 as per Manoharan Sir in case of partial GRL no_art to be set as 0 for issue [START] */ /* Added by Ashish Sonawane on 07-sep-12 as per Manoharan Sir in case of partial GRL no_art to be set as 0 for issue [START] */
if(invStatLocCodeTo.trim().equalsIgnoreCase(locCodeTo.trim())) //Chnaged by Rohan on 29-07-13 for setting no art is 0 in case of location code to is PGRL.
//if(invStatLocCodeTo.trim().equalsIgnoreCase(locCodeTo.trim()))
if(invStatLocCodeTo.trim().equalsIgnoreCase(locCodeTo.trim()) && invStatLocCodeTo.trim().equalsIgnoreCase(partialGrlLoc.trim()))
{ {
noArt = 0; noArt = 0;
updateRowMap.put("no_art", noArt); updateRowMap.put("no_art", noArt);
...@@ -345,10 +345,22 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -345,10 +345,22 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
updateRowMap.put("lot_sl", lotSlTo); updateRowMap.put("lot_sl", lotSlTo);
updateRowMap.put("tran_type", "R"); updateRowMap.put("tran_type", "R");
/* Added by Ashish Sonawane on 07-sep-12 as per Manoharan Sir in case of partial GRL no_art to be set as quantity at the time of receipt [START] */ /* Added by Ashish Sonawane on 07-sep-12 as per Manoharan Sir in case of partial GRL no_art to be set as quantity at the time of receipt [START] */
//Chnaged by Rohan on 29-07-13 for setting no art as quantity in case of location code to is PGRL.start
/*
if(invStatLocCodeTo.trim().equalsIgnoreCase(locCodeTo.trim())) if(invStatLocCodeTo.trim().equalsIgnoreCase(locCodeTo.trim()))
{ {
updateRowMap.put("no_art", quantity); updateRowMap.put("no_art", quantity);
} }
*/
if(invStatLocCodeTo.trim().equalsIgnoreCase(locCodeTo.trim()) && invStatLocCodeTo.trim().equalsIgnoreCase(partialGrlLoc.trim()))
{
updateRowMap.put("no_art", quantity);
}
else
{
updateRowMap.put("no_art", noArt);
}
//Chnaged by Rohan on 29-07-13 for setting no art as quantity in case of location code to is PGRL.end
/* Added by Ashish Sonawane on 07-sep-12 as per Manoharan Sir in case of partial GRL no_art to be set as quantity at the time of receipt [END] */ /* Added by Ashish Sonawane on 07-sep-12 as per Manoharan Sir in case of partial GRL no_art to be set as quantity at the time of receipt [END] */
retString = stkUpdate.updateStock( updateRowMap, xtraParams, conn ); retString = stkUpdate.updateStock( updateRowMap, xtraParams, conn );
if ( retString != null && retString.trim().length() > 0 ) if ( retString != null && retString.trim().length() > 0 )
...@@ -409,8 +421,9 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -409,8 +421,9 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
lineNoHold = 0; lineNoHold = 0;
//Changed by Rohan on 26-07-13 for disinct record
sqlHold = "SELECT D.TRAN_ID AS TRAN_ID, D.LINE_NO AS LINE_NO, " //sqlHold = "SELECT D.TRAN_ID AS TRAN_ID, D.LINE_NO AS LINE_NO, "
sqlHold = "SELECT DISTINCT D.TRAN_ID AS TRAN_ID, D.LINE_NO AS LINE_NO, "
+ " D.ITEM_CODE AS ITEM_CODE, D.SITE_CODE AS SITE_CODE, " + " D.ITEM_CODE AS ITEM_CODE, D.SITE_CODE AS SITE_CODE, "
+ " D.LOC_CODE AS LOC_CODE, D.LOT_NO AS LOT_NO, D.LOT_SL AS LOT_SL " + " D.LOC_CODE AS LOC_CODE, D.LOT_NO AS LOT_NO, D.LOT_SL AS LOT_SL "
//Changed By Rohan on 18-07-13 for getting lock_code //Changed By Rohan on 18-07-13 for getting lock_code
...@@ -564,13 +577,13 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -564,13 +577,13 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
if( updCnt > 0 ) if( updCnt > 0 )
{ {
System.out.println( updCnt + " rows updated successfully" );
invAct=new InvAcct(); invAct=new InvAcct();
System.out.println( updCnt + " rows updated successfully" ); System.out.println( updCnt + " rows updated successfully" );
retString=invAct.retreiveStockTrans(tranId, conn); retString=invAct.retreiveStockTrans(tranId, conn);
System.out.println("retString@@@@@@@@"+retString); System.out.println("retString@@@@@@@@"+retString);
System.out.println("retrieve stock transfer called---"); System.out.println("retrieve stock transfer called---");
} }if(retString==null || (retString.trim()).length()==0){
if(retString==null || (retString.trim()).length()==0){
isError = false; isError = false;
}else{ }else{
isError=true; isError=true;
...@@ -884,370 +897,4 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -884,370 +897,4 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
return tranId; return tranId;
}//generateTranTd() }//generateTranTd()
//Changed by Rohan on 17-07-13 for generating tran id for INV_HOLD_REL_TRACE.end //Changed by Rohan on 17-07-13 for generating tran id for INV_HOLD_REL_TRACE.end
//New method designed by somanath by migrating pb component for implementing accounting effect.
// public String retreiveStockTrans(String tranId, Connection conn) throws ITMException{
// System.out.println("<-------Inside retrieve stock transfer------->");
// PreparedStatement pstmt=null;
// ResultSet rs=null;
// ResultSet rs1=null;
// PreparedStatement pstmt1=null;
// String sql="";
// ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
// FinCommon finCommon= new FinCommon();
// DistCommon distCommon = new DistCommon();
// String retString="";
// String errString="";
//
// java.sql.Timestamp tranDate=null;
// java.sql.Timestamp confDate=null;
// java.sql.Timestamp refDate=null;
// java.sql.Timestamp effDate=null;
//
// HashMap glTraceMap = null;
// HashMap stkmap=new HashMap();
// String combination="";
// //variables of Stock Transfer
// String siteCode="",refserFor="",refIdFor="", reasCode="", confirmed="", itemSer="";
// String empCodeAprv="", tranType="",truckNo="";
//
// //variables of Stock Transfer Detail
// String lineNo="", itemCode="", locCodeFrom="", locCodeTo="", lotNoFrom="";
// String lotNoTo="", lotslFrom="", lotslTo="", remarks="", acctCodCr="", acctCodDr="";
// String cctrCodeCr="", cctrCodeDr="", locCodeSys="";
// int noArt=0, count=0;
// double quantity=0.0;
//
// //variable from pb comp.
// String invOnline="", finEntity="", currCode="";
// double amount=0, rate=0, exchRate=1;
// String mcctrCode="", macctCode="", analysis="",analysis1="", analysis2="", analysis3="", stkList="";
// int sum=0;
//
// try{
//
// invOnline=distCommon.getDisparams("999999", "INV_ACCT_TRF", conn);
// if(invOnline==null||invOnline.trim().length()==0){
// errString = itmDBAccessEJB.getErrorString("","VTFINPARM","","",conn);
// return errString;
// }
// else{
// sql =" select tran_date,site_code,ref_ser__for,ref_id__for,reas_code,item_ser, "
// +" confirmed,conf_date,emp_code__aprv,tran_type,truck_no,ref_date "
// +" from stock_transfer "
// +" where tran_id = ? " ;
// pstmt=conn.prepareStatement(sql);
// pstmt.setString(1, tranId);
// rs=pstmt.executeQuery();
// if(rs.next()){
// tranDate = rs.getTimestamp("tran_date");
// siteCode = rs.getString("site_code");
// refserFor= rs.getString("ref_ser__for");
// refIdFor = rs.getString("ref_id__for");
// reasCode = rs.getString("reas_code");
// itemSer = rs.getString("item_ser");
// confirmed= rs.getString("confirmed");
// confDate = rs.getTimestamp("conf_date");
// empCodeAprv=rs.getString("emp_code__aprv");
// tranType = rs.getString("tran_type");
// truckNo = rs.getString("truck_no");
// refDate = rs.getTimestamp("ref_date");
// System.out.println("@@@siteCode"+siteCode);
// }
// rs.close();
// rs=null;
// pstmt.close();
// pstmt=null;
// sql="select count(*) from stock_transfer_det where tran_id = ?";
// pstmt = conn.prepareStatement(sql);
// pstmt.setString(1,tranId);
// rs = pstmt.executeQuery();
// if(rs.next())
// {
// count =rs.getInt(1);
// }
// rs.close();
// rs = null;
// pstmt.close();
// pstmt = null;
//
// if(count <= 0)
// {
// System.out.println("no record found in stock_transfer_det");
// errString = itmDBAccessEJB.getErrorString("","VTNOREC2","","",conn);
// return errString;
// }
// sql =" select line_no,item_code,quantity,loc_code__fr,loc_code__to,lot_no__fr, "
// +" lot_no__to,lot_sl__fr,lot_sl__to,remarks,acct_code__cr,acct_code__dr, "
// +" cctr_code__dr,cctr_code__cr,no_art,loc_code__sys"
// +" from stock_transfer_det "
// +" where tran_id = ? " ;
// pstmt = conn.prepareStatement(sql);
// pstmt.setString(1,tranId);
// rs = pstmt.executeQuery();
// while(rs.next()){
//
// lineNo=rs.getString("line_no");
// itemCode=rs.getString("item_code");
// quantity=rs.getDouble("quantity");
// locCodeFrom=rs.getString("loc_code__fr");
// locCodeTo=rs.getString("loc_code__to");
// lotNoFrom=rs.getString("lot_no__fr");
// lotNoTo=rs.getString("lot_no__to");
// lotslFrom=rs.getString("lot_sl__fr");
// lotslTo=rs.getString("lot_sl__to");
// remarks=rs.getString("remarks");
// acctCodCr=rs.getString("acct_code__cr");
// acctCodDr=rs.getString("acct_code__dr");
// cctrCodeDr=rs.getString("cctr_code__dr");
// cctrCodeCr=rs.getString("cctr_code__cr");
// noArt=rs.getInt("no_art");
// locCodeSys=rs.getString("loc_code__sys");
//
//
//
// //Condition2 from pb comp.
// sql="select fin_entity from site where site_code=? ";
// pstmt1 = conn.prepareStatement(sql);
// pstmt1.setString(1,siteCode);
// rs1 = pstmt1.executeQuery();
// if(rs1.next()){
// finEntity=rs1.getString("fin_entity");
//
// }else{
// errString = itmDBAccessEJB.getErrorString("","DS000","","",conn);
// return errString;
// }
// rs1.close();
// rs1=null;
// pstmt1.close();
// pstmt1=null;
//
// //Condition3 from pb comp.
// sql="select curr_code from finent where fin_entity=?";
// pstmt1 = conn.prepareStatement(sql);
// pstmt1.setString(1,finEntity);
// rs1 = pstmt1.executeQuery();
// if(rs1.next()){
// currCode=rs1.getString("curr_code");
//
// }else{
// errString = itmDBAccessEJB.getErrorString("","DS000","","",conn);
// return errString;
// }
// rs1.close();
// rs1=null;
// pstmt1.close();
// pstmt1=null;
//
//
// //condition 4
// sql="select rate from stock where item_code=? and site_code=? and loc_code=? and lot_no=? and lot_sl=?";
// pstmt1 = conn.prepareStatement(sql);
// pstmt1.setString(1,itemCode);
// pstmt1.setString(2, siteCode);
// pstmt1.setString(3, locCodeFrom);
// pstmt1.setString(4, lotNoFrom);
// pstmt1.setString(5, lotslFrom);
// rs1 = pstmt1.executeQuery();
// if(rs1.next()){
// rate=rs1.getDouble("rate");
//
// }else{
// errString = itmDBAccessEJB.getErrorString("","DS000","","",conn);
// return errString;
// }
//
// rs1.close();
// rs1=null;
// pstmt1.close();
// pstmt1=null;
//
// //1st- Add to glTrace
// amount=quantity*rate;
// System.out.println("@@@@@@@amount@@@@@@"+amount);
// glTraceMap=new HashMap();
// glTraceMap.put("tran_date", tranDate);
// glTraceMap.put("eff_date", tranDate);
// glTraceMap.put("fin_entity", finEntity);
// glTraceMap.put("site_code", siteCode);
// glTraceMap.put("sundry_type", 'O');
// glTraceMap.put("acct_code", acctCodDr);
// glTraceMap.put("cctr_code", cctrCodeDr);
// glTraceMap.put("curr_code", currCode);
// glTraceMap.put("exch_rate", exchRate);
// glTraceMap.put("dr_amt", amount);
// glTraceMap.put("cr_amt", 0);
// glTraceMap.put("ref_type", "");
// glTraceMap.put("ref_ser", refserFor);
// glTraceMap.put("ref_id", tranId);
// glTraceMap.put("remarks", remarks);
//
// InvAcct invAcct=new InvAcct();
// analysis=invAcct.AcctAnalysisType(itemCode, refserFor, tranType, "DR", conn);
// System.out.println("analysis@@@@"+analysis);
//
// errString=finCommon.glTraceUpdate(glTraceMap, conn);
// System.out.println("errString@@@@@@"+errString);
// if(errString != null && errString.trim().length() > 0)
// {
// System.out.println("errString---inside"+errString);
// return errString;
//
// }
// //2nd part
// glTraceMap.put("tran_date", tranDate);
// glTraceMap.put("eff_date", tranDate);
// glTraceMap.put("fin_entity", finEntity);
// glTraceMap.put("site_code", siteCode);
// glTraceMap.put("sundry_type", 'O');
// glTraceMap.put("acct_code", acctCodCr);
// glTraceMap.put("cctr_code", cctrCodeCr);
// glTraceMap.put("curr_code", currCode);
// glTraceMap.put("exch_rate", exchRate);
// glTraceMap.put("dr_amt", 0);
// glTraceMap.put("cr_amt", amount);
// glTraceMap.put("ref_type", "");
// glTraceMap.put("ref_ser", refserFor);
// glTraceMap.put("ref_id", tranId);
// glTraceMap.put("remarks", remarks);
// errString=finCommon.glTraceUpdate(glTraceMap, conn);
// if(errString != null && errString.trim().length() > 0)
// {
// return errString;
// }
// String temp=finCommon.getAcctDetrTtype(itemCode, " ", "XFRX", tranType, conn);
// String[] split=temp.split(",");
// macctCode=split[0];
// mcctrCode=split[1];
// combination=macctCode+"@"+mcctrCode;
// System.out.println("combination::"+combination);
//
//
// if(!stkmap.containsKey(combination)){
// stkmap.put(combination, amount);
// }else{
//
// stkmap.put(combination,(Double)stkmap.get(combination)+amount);
// System.out.println("get value::::"+(Double)stkmap.get(combination)+(amount));
// }
//
//
// }
// rs.close();
// rs=null;
// pstmt.close();
// pstmt=null;
//
//
// Set keyset=stkmap.keySet();
// Iterator itr=keyset.iterator();
//
// while(itr.hasNext()){
// String key=(String)itr.next();
// String[] split1=key.split("@");
// macctCode=split1[0];
// mcctrCode=split1[1];
//
//
//
// glTraceMap.put("tran_date", tranDate);
// glTraceMap.put("eff_date", tranDate);
// glTraceMap.put("fin_entity", finEntity);
// glTraceMap.put("site_code", siteCode);
// glTraceMap.put("sundry_type", 'O');
//
// if((macctCode==null)||(macctCode.trim().length()==0))
// {
// errString = itmDBAccessEJB.getErrorString("","VTSTTRF","","",conn);
// return errString;
// }else{
// glTraceMap.put("acct_code", macctCode);
// }
// if((mcctrCode==null)||(mcctrCode.trim().length()==0))
// {
// glTraceMap.put("cctr_code", cctrCodeCr);
// }
// else
// {
// glTraceMap.put("cctr_code", mcctrCode);
// }
//
// glTraceMap.put("curr_code", currCode);
// glTraceMap.put("exch_rate", exchRate);
// glTraceMap.put("dr_amt", 0);
// glTraceMap.put("cr_amt", (stkmap.get(combination)));
// glTraceMap.put("ref_ser", refserFor);
// glTraceMap.put("ref_id", tranId);
// glTraceMap.put("remarks", remarks);
// errString=finCommon.glTraceUpdate(glTraceMap, conn);
//
// if(errString != null && errString.trim().length() > 0)
// {
// return errString;
// }
//
//
// glTraceMap.put("tran_date", tranDate);
// glTraceMap.put("eff_date", tranDate);
// glTraceMap.put("fin_entity", finEntity);
// glTraceMap.put("site_code", siteCode);
// glTraceMap.put("sundry_type", 'O');
// glTraceMap.put("acct_code", macctCode);
//
// if((mcctrCode==null)||(mcctrCode.trim().length()==0))
// {
// glTraceMap.put("cctr_code", cctrCodeCr);
// }
// else
// {
// glTraceMap.put("cctr_code", mcctrCode);
// }
// glTraceMap.put("curr_code", currCode);
// glTraceMap.put("exch_rate", exchRate);
// glTraceMap.put("dr_amt", (stkmap.get(combination)));
// glTraceMap.put("cr_amt", 0);
// glTraceMap.put("ref_type", "");
// glTraceMap.put("ref_ser", refserFor);
// glTraceMap.put("ref_id", tranId);
// glTraceMap.put("remarks", remarks);
// errString=finCommon.glTraceUpdate(glTraceMap, conn);
// if(errString != null && errString.trim().length() > 0)
// {
// return errString;
// }
//
// }
//
// errString=finCommon.checkGlTranDrCr(refserFor, tranId, conn);
// System.out.println("all correct");
// }
//
// }catch(Exception e){
// System.out.println("Exception :StockTransferConf :retreiveStockTrans :==>"+e.getMessage());
// errString = GenericUtility.getInstance().createErrorString(e);
// throw new ITMException(e);
// }finally{
//
// try
// {
// if(rs != null)
// {
// rs.close();
// rs = null;
// }
// if(pstmt != null)
// {
// pstmt.close();
// pstmt = null;
// }
// }
// catch(Exception e)
// {
// System.out.println("Exception : "+e);e.printStackTrace();
// throw new ITMException(e);
// }
// }
// return errString;
// }
} }
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