Skip to content

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

updated 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94530 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c7997fb1
Show whitespace changes
Inline Side-by-side
Showing with 101 additions and 18 deletions
webitm-fin/ibase/webitm/ejb/fin/StockValAdjTran.java
View file @ 68659ec7
......@@ -298,7 +298,7 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
}
else
{
sql = "select count(1) from gencodes where fld_value = ?";
sql = "select count(1) from gencodes where fld_name = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,reasCode);
rs = pstmt.executeQuery();
......@@ -880,9 +880,76 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
pstmt = null;
rs = null;
if(itemCode.length() > 0 && locCode.length() > 0 && lotNo.length() > 0 && lotsl.length() > 0)
{
sql = "select rate from stock where site_code = ? and item_code = ? and loc_code = ? and lot_no = ? and lot_sl = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
pstmt.setString(2,itemCode);
pstmt.setString(3,locCode);
pstmt.setString(4,lotNo);
pstmt.setString(5,lotsl);
rs = pstmt.executeQuery();
if(rs.next())
{
oldRate = rs.getString(1) == null ? "":rs.getString(1);
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
sql = "select list_type from pricelist where price_list = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
rs = pstmt.executeQuery();
if(rs.next())
{
listType = rs.getString(1) == null ? "":rs.getString(1);
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
if(listType.trim().length() == 0)
{
sql = "select list_type from pricelist_mst where price_list = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,siteCode);
rs = pstmt.executeQuery();
if(rs.next())
{
listType = rs.getString(1) == null ? "":rs.getString(1);
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
}
rate = getPriceListRate(priceList, utranDate, itemCode, lotNo, listType, conn);
if(rate == 0.0 || rate == 0 || rate == -1)
{
rate = 0;
}
valueXmlString.append("<rate__old>").append("<![CDATA[" + oldRate + "]]>").append("</rate__old>");
valueXmlString.append("<rate>").append("<![CDATA[" + rate + " ]]>").append("</rate>");
valueXmlString.append("<item_descr>").append("<![CDATA[" + itmdesc + " ]]>").append("</item_descr>");
}else
{
valueXmlString.append("<rate__old>").append("<![CDATA[]]>").append("</rate__old>");
valueXmlString.append("<rate>").append("<![CDATA[]]>").append("</rate>");
}
valueXmlString.append("<item_descr>").append("<![CDATA[" + itmdesc + "]]>").append("</item_descr>");
}
else
{
......@@ -1014,7 +1081,7 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
rate = 0;
}
valueXmlString.append("<rate>").append("<![CDATA[" + rate + " ]]>").append("</rate>");
valueXmlString.append("<rate>").append("<![CDATA[" + rate + "]]>").append("</rate>");
}else
......@@ -1084,8 +1151,8 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
{
rate = 0;
}
valueXmlString.append("<rate__old>").append("<![CDATA[" + oldRate + " ]]>").append("</rate__old>");
valueXmlString.append("<rate>").append("<![CDATA[" + rate + " ]]>").append("</rate>");
valueXmlString.append("<rate__old>").append("<![CDATA[" + oldRate + "]]>").append("</rate__old>");
valueXmlString.append("<rate>").append("<![CDATA[" + rate + "]]>").append("</rate>");
}else
......@@ -1115,9 +1182,9 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
amtdiff = amount - oldAmount;
valueXmlString.append("<amount__old>").append("<![CDATA[" + oldAmount + " ]]>").append("</amount__old>");
valueXmlString.append("<amount>").append("<![CDATA[" + amount + " ]]>").append("</amount>");
valueXmlString.append("<amount__diff>").append("<![CDATA[" + amtdiff + " ]]>").append("</amount__diff>");
valueXmlString.append("<amount__old>").append("<![CDATA[" + oldAmount + "]]>").append("</amount__old>");
valueXmlString.append("<amount>").append("<![CDATA[" + amount + "]]>").append("</amount>");
valueXmlString.append("<amount__diff>").append("<![CDATA[" + amtdiff + "]]>").append("</amount__diff>");
}
else
......
webitm-fin/ibase/webitm/ejb/fin/StockValAdjTranConf.java
View file @ 68659ec7
......@@ -6,7 +6,7 @@ import ibase.webitm.ejb.ITMDBAccessLocal;
import ibase.webitm.utility.GenericUtility;
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;
......@@ -18,6 +18,7 @@ import java.rmi.RemoteException;
@Stateless
public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdjTranConfLocal,StockValAdjTranConfRemote {
public String confirm(String tranId, String xtraParams, String forcedFlag) throws RemoteException,ITMException
{
System.out.println("--------------confirm method of StockValAdjTranConf ------------- : "+tranId);
......@@ -37,10 +38,10 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj
return retString;
}
private String confirmTran(String tranId,String xtraParams,String forcedFlag)
private String confirmTran(String tranId,String xtraParams,String forcedFlag) throws ITMException
{
System.out.println("---------Class : StockValAdjTranConf-->> confirm method called-----------");
InvAcct inv = new InvAcct();
ResultSet rs=null;
Connection conn=null;
String confirmed = "";
......@@ -65,7 +66,7 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
if( rs.next() )
if( rs.next())
{
confirmed =rs.getString(1) == null ? "N":rs.getString(1);
......@@ -102,10 +103,10 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj
siteCode=checkNull(rs.getString(1));
PriceListRate=rs.getDouble(2);
itemCode=checkNull(rs.getString(4));
locCode=checkNull(rs.getString(5));
lotNo=checkNull(rs.getString(6));
lotSl=checkNull(rs.getString(7));
itemCode=checkNull(rs.getString(3));
locCode=checkNull(rs.getString(4));
lotNo=checkNull(rs.getString(5));
lotSl=checkNull(rs.getString(6));
updateStockMap.put("price_list_rate",Double.toString(PriceListRate));
updateStockMap.put("item_code",itemCode);
......@@ -117,13 +118,28 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj
count=updateStockRateAsPerPriceListRate(conn, updateStockMap);
System.out.println("updateStockRateAsPerPriceListRate count-->["+count+"]");
if(count > 0){
System.out.println("654321");
System.out.println("123456");
String errCall = inv.stkAdjust(tranId, conn);
System.out.println(">>>>>>> errCall"+errCall);
count=updateStockValAdj(conn, loginEmpCode, tranId);
System.out.println("updateStockValAdj-->>["+count+"]");
if(count > 0){
//confirmed messages show.............
System.out.println("COMMITING RECORD");
conn.commit();
errString = itmdbAccess.getErrorString("", "STKVACONF", "", "", conn);
return errString;
}
}else{
//disply error message.
conn.rollback();
errString = itmdbAccess.getErrorString("", "STKVNCONF", "", "", conn);
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