Skip to content

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

updated 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94549 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9f6b0e6d
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 13 deletions
webitm-fin/ibase/webitm/ejb/fin/InvAcct.java
View file @ ebf56931
......@@ -2108,6 +2108,11 @@ public class InvAcct
}
else
{
if(0 > diffAmt)
{
diffAmt = amt_old;
}
System.out.println("stk credit"+diffAmt);
updateAcctMap.put("acct_code",acctCdInvR);
updateAcctMap.put("cctr_code",cctrCdInvR);
......@@ -2128,7 +2133,10 @@ public class InvAcct
if(amt_old > amt)
{
if(0 > diffAmt)
{
diffAmt = amt_old;
}
System.out.println("stk debit1"+diffAmt+"{"+acctCdInv+"}{"+cctrCdInv+"");
updateAcctMap.put("acct_code",acctCdInv);
......
webitm-fin/ibase/webitm/ejb/fin/StockValAdjTran.java
View file @ ebf56931
......@@ -565,6 +565,14 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
else
{
conquan = Double.parseDouble(quantity);
if(conquan == 0)
{
errCode = "STKVALQUAN";
errString = getErrorString("quantity",errCode,userId);
break;
}
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=?";
pstmt=conn.prepareStatement(sql);
......@@ -596,7 +604,7 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
rate = Double.parseDouble(oRate);
System.out.println("rate is"+rate);
if(rate == -1)
if(rate == 0)
{
errCode = "VTPRLINE";
errString = getErrorString("quantity",errCode,userId);
......@@ -647,7 +655,7 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
cctrCodeInv = genericUtility.getColumnValue("cctr_code__inv",dom);
acctCodeInv = genericUtility.getColumnValue("acct_code__inv",dom);
if (cctrCodeInv == null || cctrCodeInv.trim().length() == 0 )
if (cctrCodeInv == null || cctrCodeInv.length() == 0 )
{
errCode = "STKVALCCCB";
errString = getErrorString("cctr_code__inv",errCode,userId);
......@@ -745,7 +753,7 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
cctrCodeInvrev = genericUtility.getColumnValue("cctr_code__inrev",dom);
acctCodeInvrev = genericUtility.getColumnValue("acct_code__inrev",dom);
if (cctrCodeInvrev == null || cctrCodeInvrev.trim().length() == 0 )
if (cctrCodeInvrev == null || cctrCodeInvrev.length() == 0 )
{
errCode = "STKVACCNA";
errString = getErrorString("cctr_code__inrev",errCode,userId);
......@@ -883,7 +891,7 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
String columnValue="",chgTerm="",chgUser="",priceList="",tranDate="",listType="",oRate="";
String itemCode="",locCode="",lotNo="",lotsl="",quantity="",itmdesc="",loginSite="";
Date utranDate;
double rate = 0,conquan,conOldRate,oldAmount,amount,amtdiff,oldRate=0;
double rate = 0,conquan,conOldRate,oldAmount,amount,amtdiff,oldRate=0,getquantity=0;
try
{
conn = connDriver.getConnectDB("DriverITM");
......@@ -990,10 +998,20 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
if(itemCode.length() > 0 && locCode.length() > 0 && lotNo.length() > 0 && lotsl.length() > 0)
{
oldRate=getRateFromStock(conn, siteCode, itemCode, locCode, lotNo, lotsl);
getquantity = getQuantityFromStock(conn, siteCode, itemCode, locCode, lotNo, lotsl);
System.out.println("Old Rate in item code----->>["+oldRate);
getquantity =
rate = getPriceListRate(priceList, utranDate, itemCode, lotNo, "", conn);
if(rate == -1)
{
rate = 0;
}
if(getquantity == -1)
{
getquantity = 0;
}
valueXmlString.append("<quantity>").append("<![CDATA["+getquantity+"]]>").append("</quantity>");
valueXmlString.append("<rate__old>").append("<![CDATA["+oldRate+"]]>").append("</rate__old>");
valueXmlString.append("<rate>").append("<![CDATA["+rate+"]]>").append("</rate>");
......@@ -1001,6 +1019,7 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
}else
{
valueXmlString.append("<quantity>").append("<![CDATA[]]>").append("</quantity>");
valueXmlString.append("<rate__old>").append("<![CDATA[]]>").append("</rate__old>");
valueXmlString.append("<rate>").append("<![CDATA[]]>").append("</rate>");
}
......@@ -1014,21 +1033,37 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
{
if(itemCode.length() > 0 && locCode.length() > 0 && lotNo.length() > 0 && lotsl.length() > 0)
{
oldRate=getRateFromStock(conn, siteCode, itemCode, locCode, lotNo, lotsl);
System.out.println("Old Rate in lot_noe----->>["+oldRate);
getquantity = getQuantityFromStock(conn, siteCode, itemCode, locCode, lotNo, lotsl);
System.out.println("Old Rate in item code----->>["+oldRate);
getquantity =
rate = getPriceListRate(priceList, utranDate, itemCode, lotNo, "", conn);
if(rate == -1)
{
System.out.println("CODE RATE ERROR-----------------------------------------");
rate = 0;
}
if(getquantity == -1)
{
getquantity = 0;
}
valueXmlString.append("<quantity>").append("<![CDATA["+getquantity+"]]>").append("</quantity>");
valueXmlString.append("<rate__old>").append("<![CDATA["+oldRate+"]]>").append("</rate__old>");
valueXmlString.append("<rate>").append("<![CDATA["+rate+"]]>").append("</rate>");
valueXmlString.append("<rate>").append("<![CDATA["+rate+"]]>").append("</rate>");
}else
{
valueXmlString.append("<quantity>").append("<![CDATA[]]>").append("</quantity>");
valueXmlString.append("<rate__old>").append("<![CDATA[]]>").append("</rate__old>");
valueXmlString.append("<rate>").append("<![CDATA[]]>").append("</rate>");
}
......@@ -1039,20 +1074,32 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
if(itemCode.length() > 0 && locCode.length() > 0 && lotNo.length() > 0 && lotsl.length() > 0)
{
oldRate=getRateFromStock(conn, siteCode, itemCode, locCode, lotNo, lotsl);
System.out.println("Old Rate in lot_sl----->>["+oldRate);
getquantity = getQuantityFromStock(conn, siteCode, itemCode, locCode, lotNo, lotsl);
System.out.println("Old Rate in item code----->>["+oldRate);
getquantity =
rate = getPriceListRate(priceList, utranDate, itemCode, lotNo, "", conn);
if(rate == -1)
{
System.out.println("CODE RATE ERROR-----------------------------------------");
rate = 0;
}
if(getquantity == -1)
{
getquantity = 0;
}
valueXmlString.append("<quantity>").append("<![CDATA["+getquantity+"]]>").append("</quantity>");
valueXmlString.append("<rate__old>").append("<![CDATA["+oldRate+"]]>").append("</rate__old>");
valueXmlString.append("<rate>").append("<![CDATA["+rate+"]]>").append("</rate>");
valueXmlString.append("<rate>").append("<![CDATA["+rate+"]]>").append("</rate>");
}else
{
valueXmlString.append("<quantity>").append("<![CDATA[]]>").append("</quantity>");
valueXmlString.append("<rate__old>").append("<![CDATA[]]>").append("</rate__old>");
valueXmlString.append("<rate>").append("<![CDATA[]]>").append("</rate>");
}
}
......@@ -1326,6 +1373,41 @@ public class StockValAdjTran extends ValidatorEJB implements StockValAdjTranLoca
return oldRate;
}
public double getQuantityFromStock(Connection conn,String siteCode,String itemCode,String locCode,String lotNo,String lotSl){
ResultSet rs=null;
PreparedStatement pstmt=null;
String sql="";
int count=0;
double stkquantity=0;
try{
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.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())
{
stkquantity =rs.getDouble(1);
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
}
catch(Exception e){
System.out.println("Exception in getQuantityFromStock----------");
e.printStackTrace();
}
return stkquantity;
}
protected String getColumnDescr(Connection conn, String columnName ,String tableName, String columnName2, String value)
{
......
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