Skip to content

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

FREE quantity 0.001 condition added 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@100962 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ffa7f162
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 16 deletions
webitm-dis/ibase/webitm/ejb/dis/CustStockGWTIC.java
View file @ bbc30361
......@@ -472,8 +472,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
"where a.ref_code=a.prd_tblno and a.prd_tblno=b.prd_tblno " +
"and a.site_code=? AND b.prd_code = ? " +
"and b.prd_tblno=? " +
"AND case when a.type is null then 'X' else a.type end='S' and " +
" ? between entry_start_dt and entry_end_dt";
"AND case when a.type is null then 'X' else a.type end='S' " +
" and ? between entry_start_dt and entry_end_dt";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,loginSiteCode.trim());
pstmt.setString(2,period.trim());
......@@ -488,13 +488,13 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
rs = null;
pstmt.close();
pstmt = null;
if(entryCnt == 0)
/*if(entryCnt == 0)
{
System.out.println("Error :Period not exist in period_tbl master start and end date ");
errCode = "VMINVPRDST";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}*/
sql = "select count(*) from cust_stock where status='S' " +
"and cust_code=? and from_date=? and to_date =?";
......@@ -1336,7 +1336,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
String startForm="", netAmtFinal="",netAmtStr="",countryIemSer="",priceList="";
String confirmed="",status="",errString="",empCode="",positionCode="",empName="";
String positionDescr="",resultItemSer="",opStock="";
String reStr="";
String reStr="",invoiceMonths="";
double opStockLast=0.0,sales=0.0,transitQty=0.0,salesLast=0.0,receiptLast=0.0,clStockLast=0.0,returnLast=0.0,rateLast=0.0,salesQty=0.0,clStock=0.0;
double netAmt=0.0,opStkItem=0.0,retQty = 0.0,rcpQty=0.0,rate=0.0,adjQty=0.0,adhocQty=0.0,totRcpQtyAll=0.0;
double sretQty = 0.0,replQty=0.0,rcpQtyBon=0.0,primarySales=0.0,transitQtyAll=0.0;
......@@ -1371,7 +1371,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
int lineNoItmCnt=0,itemResLen=0,itemPos=0,itmDetCnt=0,domID2=0;
int invCnt=0,dlvFlgCnt=0,siteCustCnt=0;
int parentNodeListLength = 0,lineNo=0;
int pos=0;
int pos=0,invoiceMonthsPrevious=0;
Date invDate=null,frmDate=null,toDate=null,stmtDate=null,lrDate=null;
Date RelativeDate=null;
Date nextMonthDate=null;
......@@ -4336,10 +4336,19 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
System.out.println("formulaValue@@@@@@>>>"+formulaValue);
//System.out.println("countryCode>>>>>"+countryCode);
//System.out.println("itemSerHd>>>>>"+itemSer1);
invoiceMonths = dist.getDisparams("999999","INVOICE_MONTHS",conn);
System.out.println("invoiceMonths.." + invoiceMonths);
if (("NULLFOUND".equalsIgnoreCase(invoiceMonths) || invoiceMonths == null || invoiceMonths.trim().length() == 0) )
{
invoiceMonthsPrevious=-3;
}else
{
invoiceMonthsPrevious=Integer.parseInt(invoiceMonths);
}
//thirdMonthDay= utlmethd.AddMonths(prdtoDateTmstmp, -3);
thirdMonthDay= utlmethd.AddMonths(prdFromoDateTmstmp, -3);
System.out.println("invoiceMonthsPrevious>>>>>"+invoiceMonthsPrevious);
thirdMonthDay= utlmethd.AddMonths(prdFromoDateTmstmp, invoiceMonthsPrevious);
//thirdMonthDay= utlmethd.AddMonths(prdFromoDateTmstmp, -3);
System.out.println("thirdMonthDay>>>>>>"+thirdMonthDay);
/* sql = "select b.FR_DATE as FR_DATE,b.TO_DATE as TO_DATE " +
......@@ -4377,7 +4386,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
sql = "SELECT inv.invoice_id,itrc.rate__stduom as rate__stduom,itrc.quantity__stduom as ,itrc.quantity__stduom,inv.tran_date " +
"FROM invoice_trace itrc,invoice inv WHERE itrc.item_code=? " +
"and itrc.invoice_id=inv.invoice_id and inv.tran_date>=? " +
"and inv.tran_date<=? AND itrc.rate__stduom >0 and inv.cust_code=? " +
"and inv.tran_date<=? AND itrc.rate__stduom >0.001 and inv.cust_code=? " +
" ORDER BY inv.tran_date DESC";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,itemCode1);
......@@ -4405,6 +4414,10 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
System.out.println("closing value>>>>"+closingValue);
}
closingValue=getRequiredDcml(closingValue,3);
if(formulaValue == 0)
{
break;
}
}
rs.close();
rs = null;
......@@ -7051,6 +7064,9 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
if(!(itemList.contains(invItemCode)))
{
System.out.println("New itemcode added from invoice :"+invItemCode);
clStock="0.0";
rate="0.0";
rateOrg="0.0";
sql = " select cl_stock,CASE WHEN rate IS NULL THEN 0 ELSE rate END as rate," +
" CASE WHEN rate__org IS NULL THEN 0 ELSE rate__org END as rate__org from " +
"cust_stock_det where tran_id=? and item_code=? ";
......@@ -7817,7 +7833,7 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
//" and invoice.site_code = ? " +
" and invoice.inv_type=? and itrace.item_ser__prom in("+itemSer+") "+
//" and invoice.tran_date between ? and ? " +
" AND itrace.RATE__STDUOM>0 "
" AND itrace.RATE__STDUOM>0.001 "
+ " and itrace.item_code = ? and itrace.invoice_id in("+selectedInvList+") " ;
}else if("T".equalsIgnoreCase(quantityFlag))
{
......@@ -7827,7 +7843,7 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
//" and invoice.site_code = ? " +
" and invoice.inv_type=? and itrace.item_ser__prom in("+itemSer+") "
+ //" and invoice.tran_date between ? and ? " +
" AND itrace.RATE__STDUOM>0 "
" AND itrace.RATE__STDUOM>0.001 "
+ " and itrace.item_code = ? and itrace.invoice_id in("+transitInvList+") " ;
}
......@@ -8215,12 +8231,12 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
"from ( select invoice.invoice_id as invoice_id,0 quantity, max(rate__stduom) " +
"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 in ("+itemSer+") " +
" and invoice.inv_type='"+orderType+"' and rate__stduom>0 group by invoice.invoice_id " +
" and invoice.inv_type='"+orderType+"' and rate__stduom>=0.001 group by invoice.invoice_id " +
"union all" +
" 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 in ("+itemSer+") " +
" and invoice.inv_type='"+orderType+"' and rate__stduom=0 ) group by invoice_id ) HAVING sum(totFreeValue) >0 AND sum(totfreeQty)>0 " ;
" and invoice.inv_type='"+orderType+"' and rate__stduom<=0.001 ) group by invoice_id ) HAVING sum(totFreeValue) >0 AND sum(totfreeQty)>0 " ;
}else if("T".equalsIgnoreCase(quantityFlag))
{
......@@ -8230,12 +8246,12 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
"from ( select invoice.invoice_id as invoice_id,0 quantity, max(rate__stduom) " +
"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 in ("+itemSer+") " +
" and invoice.inv_type='"+orderType+"' and rate__stduom>0 group by invoice.invoice_id " +
" and invoice.inv_type='"+orderType+"' and rate__stduom>=0.001 group by invoice.invoice_id " +
"union all" +
" 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 in ("+itemSer+")" +
" and invoice.inv_type='"+orderType+"' and rate__stduom=0 ) group by invoice_id ) HAVING sum(totFreeValue) >0 AND sum(totfreeQty)>0 " ;
" and invoice.inv_type='"+orderType+"' and rate__stduom<=0.001 ) group by invoice_id ) HAVING sum(totFreeValue) >0 AND sum(totfreeQty)>0 " ;
}
......
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