Skip to content

B
business-java
Commit caeba3b7 authored by caluka's avatar caluka
Browse files
Options

After testing Rawtani sir logic changed 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@99347 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 906fa21b
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 20 deletions
webitm-dis/ibase/webitm/ejb/dis/CustStockGWTIC.java
View file @ caeba3b7
......@@ -21,6 +21,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Statement;
import java.sql.Timestamp;
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
......@@ -1301,6 +1302,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
double grossSecondaryQty=0.0;
double grossSecondaryRate=0.0,rcpFreeValue=0.0;
double rcpFreesValue=0.0,transitFreeValue=0.0,rateOrg=0.0;
double grossClosingRate=0.0,grossClosingValue=0.0;
int lineNoCustSt=0,currentFormNo = 0,varValue=0,domID3=0,sreturnCnt=0;
int lineNoItmCnt=0,itemResLen=0,itemPos=0,itmDetCnt=0,domID2=0;
int invCnt=0,dlvFlgCnt=0;
......@@ -2376,7 +2378,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
"from sreturn srn,sreturndet sdet where srn.tran_id=sdet.tran_id " +
"and srn.site_code= ? and srn.item_ser=? " +
"and srn.tran_date >= ? and srn.tran_date <= ? " +
"and sdet.ret_rep_flag in ('P') and srn.cust_code=? ";
"and sdet.ret_rep_flag in ('P') and srn.cust_code=? and srn.confirmed='Y'";
pstmt = conn.prepareStatement(sql);
......@@ -2966,7 +2968,9 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
sretQtyAllTot= billRetQty - replQtyAll -retFreeQtyAll ;
System.out.println("sretQtyAllTot @@@@@@@@@@@!!!!!!:"+sretQtyAllTot);
/*------------------------------------------------------------------------------------------------*/
/*------------------------------------------------------------------------------------------------*/
itemListLast.add(itemCodeLast);
System.out.println("-------calculate Primary Sales for availble transcaion Id--------");
......@@ -2982,6 +2986,9 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
}
System.out.println("primarySales cal for avaible transcation id :"+primarySales);
salesLast=opStockLast+(receiptLast)+returnReciptRepl-billRetQty;
System.out.println("SECONDARY SALES EDIT MODE>>>>>"+salesLast);
if(receiptLast >= 0)
{
......@@ -3009,11 +3016,17 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
valueXmlString.append("<descr>").append("<![CDATA["+descrLast+"]]>").append("</descr>");
valueXmlString.append("<unit>").append("<![CDATA["+unitLast+"]]>").append("</unit>");
valueXmlString.append("<loc_type>").append("<![CDATA["+locTypeLast+"]]>").append("</loc_type>");
valueXmlString.append("<rate>").append("<![CDATA["+(long)Math.round(rateLast)+"]]>").append("</rate>");
valueXmlString.append("<rate__org>").append("<![CDATA["+(long)Math.round(rateOrg)+"]]>").append("</rate__org>");
if(!Double.isNaN(rateLast))
{
valueXmlString.append("<rate>").append("<![CDATA["+getRequiredDecimal(rateLast,2)+"]]>").append("</rate>");
}
if(!Double.isNaN(rateOrg))
{
valueXmlString.append("<rate__org>").append("<![CDATA["+getRequiredDecimal(rateOrg,2)+"]]>").append("</rate__org>");
}
valueXmlString.append("<op_stock protect='1'>").append("<![CDATA["+(long)Math.round(opStockLast)+"]]>").append("</op_stock>");
valueXmlString.append("<purc_rcp>").append("<![CDATA["+(long)Math.round((rcpChargableLast))+"]]>").append("</purc_rcp>");
valueXmlString.append("<purc_rcp>").append("<![CDATA["+(long)Math.round((receiptLast))+"]]>").append("</purc_rcp>");
valueXmlString.append("<purc_rcp__repl>").append("<![CDATA["+(long)Math.round(returnReciptRepl)+"]]>").append("</purc_rcp__repl>");
valueXmlString.append("<purc_rcp__free>").append("<![CDATA["+(long)Math.round((rcpFreesLast))+"]]>").append("</purc_rcp__free>");
......@@ -3035,7 +3048,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
{
valueXmlString.append("<cl_stock protect='0'>").append("<![CDATA[0]]>").append("</cl_stock>");
}
valueXmlString.append("<transit_qty>").append("<![CDATA["+(long)Math.round(transitCharQty)+"]]>").append("</transit_qty>");
valueXmlString.append("<transit_qty>").append("<![CDATA["+(long)Math.round(transitQty)+"]]>").append("</transit_qty>");
valueXmlString.append("<transit_qty__repl>").append("<![CDATA["+(long)Math.round(returnTransitRepl)+"]]>").append("</transit_qty__repl>");
valueXmlString.append("<transit_qty__free>").append("<![CDATA["+(long)Math.round(transitQtyFreesLast)+"]]>").append("</transit_qty__free>");
valueXmlString.append("<primary_sales>").append("<![CDATA["+(long)Math.round(primarySales)+"]]>").append("</primary_sales>");
......@@ -3244,7 +3257,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
System.out.println("Rate for not available in last or current tranaction"+"itemCode :"+itemCode +"rate :"+rate);*/
salesQty=0;
salesQty=opStkItem+(rcpQtyAll-transitCharQtyAll)+returnReciptRepl-sretQtyAllTot;
salesQty=opStkItem+(rcpQtyAll)+replQtyAll-billRetQty;
System.out.println("salesQty AFTER>>>>"+salesQty);
itemMap.put("itemCode@"+lineNoItmCnt, itemCode);
......@@ -3253,7 +3266,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
itemMap.put("mUnit@"+lineNoItmCnt, unitItem);
itemMap.put("mlType@"+lineNoItmCnt, locTypeItem);
itemMap.put("mopStk@"+lineNoItmCnt, String.valueOf(opStkItem));
itemMap.put("mquantRcp@"+lineNoItmCnt, String.valueOf((rcpQtyAll - rcpFreesAll)));
itemMap.put("mquantRcp@"+lineNoItmCnt, String.valueOf((rcpQtyAll)));
itemMap.put("rcpQtyBon@"+lineNoItmCnt, String.valueOf(0.0));//purc_ret__repl
itemMap.put("rcpFreesAll@"+lineNoItmCnt, String.valueOf((rcpFreesAll)));//purc_rcp__free
itemMap.put("mquant@"+lineNoItmCnt, String.valueOf(billRetQty));//purc_ret
......@@ -3262,7 +3275,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
itemMap.put("retReplQty@"+lineNoItmCnt, String.valueOf(replQtyAll));//purc_rcp__repl
itemMap.put("msalesQty@"+lineNoItmCnt, String.valueOf(salesQty));
itemMap.put("rate@"+lineNoItmCnt, String.valueOf(rateAll));
itemMap.put("transitQty@"+lineNoItmCnt, String.valueOf(transitCharQtyAll));
itemMap.put("transitQty@"+lineNoItmCnt, String.valueOf(transitQtyAll));
itemMap.put("transitQtyBon@"+lineNoItmCnt, String.valueOf(returnTransitRepl));//transit_qty__repl
itemMap.put("transitQtyFrees@"+lineNoItmCnt, String.valueOf(transitQtyFrees));
itemMap.put("primarySales@"+lineNoItmCnt, String.valueOf(primarySalesAll));
......@@ -3402,6 +3415,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
if(currentColumn.trim().equals("cl_stock"))
{
rateOld=0.0;rateOrgOld=0.0;
System.out.println("in cl stock !!!!!!!!!!!!");
clStockInp = genericUtility.getColumnValue("cl_stock",dom);
System.out.println("clStockInp :"+clStockInp);
......@@ -3495,16 +3509,23 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
if(cmQuantity1>clStock)
{
formulaValue=0;
closingRate=cmValue1/cmQuantity1;
grossClosingRate=cmValue1/cmQuantity1;
}else
{
formulaValue=clStock-cmQuantity1;
closingRate=(cmValue1+(formulaValue*rateOld))/clStock;
grossClosingRate=(cmValue1+(formulaValue*rateOrgOld))/clStock;
}
System.out.println("formulaValue>>>>>"+formulaValue);
closingRate=(cmValue1+(formulaValue*rateOld))/clStock;
System.out.println("closingRate>>>>"+closingRate);
System.out.println("grossClosingRate>>>"+grossClosingRate);
closingValue=closingRate*clStock;
System.out.println("closingValue>>>>>>>"+closingValue);
System.out.println("");
grossClosingValue=grossClosingRate*clStock;
netSecondarySalesValue=(opStkDom*rateOld)+rcpValue+replValue-retValue-closingValue;
System.out.println("netSecondarySalesValue>>>>>>>"+netSecondarySalesValue);
......@@ -3513,12 +3534,12 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
netSecondaryRate=netSecondarySalesValue/secondaryQty;
System.out.println("netSecondaryRate>>>"+netSecondaryRate);
grossSecondarySalesValue=(opStkDom*rateOld)+rcpValue+replValue+rcpFreeValue-retValue-closingValue;
grossSecondarySalesValue=(opStkDom*rateOrgOld)+rcpValue+replValue+rcpFreeValue-retValue-grossClosingValue;
grossSecondaryQty=opStkDom+rcpQtmDom+rcpReplQtmDom+rcpFreeQtmDom-retQtyDom-clStock;
System.out.println("grossSecondaryQty>>>>"+grossSecondaryQty);
grossSecondaryRate=grossSecondarySalesValue/grossSecondaryQty;
System.out.println("netSecondaryRate>>>"+grossSecondaryRate);
System.out.println("grossSecondaryRate>>>"+grossSecondaryRate);
salesQtyCal = opStkDom + (rcpQtmDom + rcpReplQtmDom) - (retQtyDom + retQtyFreeDom) - clStock;
}
......@@ -3526,9 +3547,18 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
System.out.println("salesQtyCal :" + salesQtyCal);
valueXmlString.append("<Detail4>\r\n");
valueXmlString.append("<sales>").append("<![CDATA[" + (long) Math.round(salesQtyCal) + "]]>").append("</sales>");
valueXmlString.append("<rate>").append("<![CDATA[" + (long) Math.round(netSecondaryRate) + "]]>").append("</rate>");
valueXmlString.append("<rate__org>").append("<![CDATA[" + (long) Math.round(grossSecondaryRate) + "]]>").append("</rate__org>");
if(!Double.isNaN(salesQtyCal))
{
valueXmlString.append("<sales>").append("<![CDATA[" + (long) Math.round(salesQtyCal) + "]]>").append("</sales>");
}
if(!Double.isNaN(netSecondaryRate))
{
valueXmlString.append("<rate>").append("<![CDATA[" + getRequiredDecimal(netSecondaryRate,2) + "]]>").append("</rate>");
}
if(!Double.isNaN(grossSecondaryRate))
{
valueXmlString.append("<rate__org>").append("<![CDATA[" + getRequiredDecimal(grossSecondaryRate,2) + "]]>").append("</rate__org>");
}
valueXmlString.append("</Detail4>\r\n");
}else
......@@ -6788,7 +6818,7 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
try
{
System.out.println("calculate GetRcpQtyCommon "+quantityFlag+" quantity!!!!!!!!!!itemcode>>>>>"+itenmCode);
if("R".equalsIgnoreCase(quantityFlag))
/*if("R".equalsIgnoreCase(quantityFlag))
{
sql = " SELECT (itrace.QUANTITY__STDUOM) QUANTITY__STDUOM, itrace.RATE__STDUOM RATE__STDUOM FROM" +
" invoice invoice,invoice_trace itrace " +
......@@ -6807,7 +6837,14 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
+ " and itrace.item_code = ? and itrace.invoice_id in("+transitInvList+") " ;
// "group by itrace.RATE__STDUOM ";
}
}*/
sql = " SELECT (itrace.QUANTITY__STDUOM) QUANTITY__STDUOM, itrace.RATE__STDUOM RATE__STDUOM FROM" +
" invoice invoice,invoice_trace itrace " +
" where invoice.invoice_id=itrace.invoice_id AND invoice.cust_code = ? " +
" and invoice.site_code = ? and invoice.inv_type=? and itrace.item_ser__prom=? "
+ " and invoice.tran_date between ? and ? AND itrace.RATE__STDUOM>0 "
+ " and itrace.item_code = ? and itrace.invoice_id in("+selectedInvList+","+transitInvList+") " ;
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, custCode );
pstmt.setString( 2, siteCode );
......@@ -6878,7 +6915,7 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
" select invoice.invoice_id as invoice_id,quantity__stduom quantity, 0 rate from " +
"invoice invoice,invoice_trace itrace where invoice.invoice_id= Itrace.invoice_id and " +
"invoice.invoice_id in("+selectedInvList+") and item_code='"+itemCode+"' and itrace.item_ser__prom='"+itemSer+"'" +
" and invoice.inv_type='"+orderType+"' and rate__stduom=0 ) group by invoice_id )" ;
" and invoice.inv_type='"+orderType+"' and rate__stduom=0 ) group by invoice_id ) HAVING sum(totFreeValue) >0 AND sum(totfreeQty)>0 " ;
}else if("T".equalsIgnoreCase(quantityFlag))
{
......@@ -6893,7 +6930,7 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
" select invoice.invoice_id as invoice_id,quantity__stduom quantity, 0 rate from " +
"invoice invoice,invoice_trace itrace where invoice.invoice_id= Itrace.invoice_id and " +
"invoice.invoice_id in("+transitInvList+") and item_code='"+itemCode+"' and itrace.item_ser__prom='"+itemSer+"'" +
" and invoice.inv_type='"+orderType+"' and rate__stduom=0 ) group by invoice_id )" ;
" and invoice.inv_type='"+orderType+"' and rate__stduom=0 ) group by invoice_id ) HAVING sum(totFreeValue) >0 AND sum(totfreeQty)>0 " ;
}
......@@ -6986,5 +7023,16 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
System.out.println(" Receipt rate :"+rate);
return rate ;
}
public String getRequiredDecimal(double actVal, int prec)//Added by chandrashekar on 28-08-14
{
String fmtStr = "############0";
String strValue = null;
if (prec > 0)
{
fmtStr = fmtStr + "." + "000000000".substring(0, prec);
}
DecimalFormat decFormat = new DecimalFormat(fmtStr);
return decFormat.format(actVal);
}
}
\ No newline at end of file
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