Skip to content

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

item_credit_perc table items and invoices display[D16EBAS006] 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@102898 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9a4567c2
Show whitespace changes
Inline Side-by-side
Showing with 117 additions and 22 deletions
webitm-dis/ibase/webitm/ejb/dis/CustStockGWTIC.java
View file @ 8e126d27
......@@ -174,10 +174,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
dbSysDate = Timestamp.valueOf(genericUtility.getValidDateString(sysDate, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
System.out.println("dbSysDate>>>>>>>"+dbSysDate);
sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
//Changes and Commented By Bhushan on 09-06-2016 :START
//conn = connDriver.getConnectDB("DriverITM");
conn = getConnection();
//Changes and Commented By Bhushan on 09-06-2016 :END
conn = connDriver.getConnectDB("DriverITM");
DistCommon distCommon = new DistCommon();
userId = getValueFromXTRA_PARAMS(xtraParams, "loginCode");
loginSiteCode = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginSiteCode"));
......@@ -1461,10 +1458,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
ConnDriver connDriver = null;
connDriver = new ConnDriver();
//Changes and Commented By Bhushan on 09-06-2016 :START
//conn = connDriver.getConnectDB("DriverITM");
conn = getConnection();
//Changes and Commented By Bhushan on 09-06-2016 :END
conn = connDriver.getConnectDB("DriverITM");
sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
chgDate = sdf.format(new java.util.Date());
chgUser = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"));
......@@ -2791,7 +2785,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
pstmt.close();
pstmt = null;
System.out.println("tranIdNew(case 3) :"+tranIdNew);
resultItemSer=getItemSerList(itemSer,conn);
resultItemSer=getItemSerListInv(itemSer,conn);
if(tranIdNew.trim().length() > 0)
{
......@@ -3055,7 +3049,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
" and invoice.confirmed = 'Y'" +
" and CASE WHEN cinv.dlv_flg IS NULL THEN 'N' ELSE cinv.dlv_flg END='N' "+
" UNION "+
"select '' as invoice_id ,srn.tran_date,'N' as DLV_FLG,sdet.net_amt,sdet.tran_id as tran_id " +
"select '' as invoice_id ,srn.tran_date,'N' as DLV_FLG,srn.net_amt,sdet.tran_id as tran_id " +
"from sreturn srn,sreturndet sdet where srn.tran_id=sdet.tran_id " +
//"and srn.site_code= ? " +
"and srn.item_ser in ("+resultItemSer+") " +
......@@ -7170,14 +7164,15 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
sql = "select distinct (invdet.item_code) ,item.descr as descr" +
/*sql = "select distinct (invdet.item_code) ,item.descr as descr" +
" from invdet invdet,item item where " +
" invoice_id in( SELECT distinct invoice.invoice_id invoice_id " +
" 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 in ("+itemSer+") and ( invoice.confirmed = 'Y' ) and" +
" and ( itrace.item_ser__prom in ("+itemSer+") OR((itrace.item_ser__prom,itrace.ITEM_CODE) IN (select item_ser,item_code from item_credit_perc WHERE item_ser NOT IN("+itemSer+") )) )" +
" and ( invoice.confirmed = 'Y' ) and" +
" ( (invoice.tran_date >=?) and (invoice.tran_date <= ? ) " +
"or ((invoice.tran_date >=? ) and (invoice.tran_date <= ? ) ) " +
"and(exists (SELECT cust_stock_inv.invoice_id FROM cust_stock_inv cust_stock_inv " +
......@@ -7202,7 +7197,42 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
" and srn.item_ser in ("+itemSer+") " +
"and srn.tran_date >= ? and srn.tran_date <= ? " +
"and sdet.ret_rep_flag in('P') " +
"and srn.cust_code=? order by descr ";
"and srn.cust_code=? order by descr ";*/
sql = "select distinct item_code,descr from(SELECT distinct invoice.invoice_id invoice_id," +
"item.item_code,item.descr descr FROM invoice invoice ," +
"invoice_trace itrace,item item WHERE invoice.invoice_id=itrace.invoice_id and " +
"itrace.item_code=item.item_code and invoice.cust_code = ? " +
//" and invoice.site_code =? " +
//"and invoice.inv_type=? " +
" and ( itrace.item_ser__prom in ("+itemSer+") OR((itrace.item_ser__prom,itrace.ITEM_CODE) IN (select item_ser,item_code from item_credit_perc WHERE item_ser NOT IN("+itemSer+") )) )" +
" and ( invoice.confirmed = 'Y' ) and" +
" ( (invoice.tran_date >=?) and (invoice.tran_date <= ? ) " +
"or ((invoice.tran_date >=? ) and (invoice.tran_date <= ? ) ) " +
"and(exists (SELECT cust_stock_inv.invoice_id FROM cust_stock_inv cust_stock_inv,invoice invoice " +
" WHERE cust_stock_inv.invoice_id = invoice.invoice_id and " +
" cust_stock_inv.dlv_flg = 'N' )) ) " +
" UNION " +
" SELECT distinct cinv.invoice_id,item.item_code,item.descr descr FROM CUST_STOCK_INV cinv ," +
" invoice invoice,invoice_trace invtrace ,item item WHERE cinv.invoice_id=invoice.invoice_id " +
" and invtrace.invoice_id=cinv.invoice_id and " +
" invoice.cust_code = ? and invtrace.item_code=item.item_code " +
//" and invoice.inv_type = ? " +
" and invtrace.item_ser__prom in ("+itemSer+") " +
"and invoice.confirmed = 'Y' and CASE WHEN cinv.dlv_flg IS NULL " +
"THEN 'N' ELSE cinv.dlv_flg END='N') " +
"UNION "+
"select distinct sdet.item_code,item.descr as descr " +
"from sreturn srn,sreturndet sdet ,item item " +
"where srn.tran_id=sdet.tran_id " +
"and item.item_code=sdet.item_code " +
//"and srn.site_code= ? " +
//" and srn.item_ser in ("+itemSer+") " +
"and srn.tran_date >= ? " +
"and srn.tran_date <= ? " +
"and ( srn.item_ser in ("+itemSer+") OR((srn.item_ser,item.ITEM_CODE) IN (select item_ser,item_code from item_credit_perc WHERE item_ser NOT IN("+itemSer+") )) ) " +
"and sdet.ret_rep_flag in('P') " +
"and srn.cust_code=? ";
......@@ -8001,7 +8031,8 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
" where invoice.invoice_id=itrace.invoice_id AND invoice.cust_code = ? " +
//" and invoice.site_code = ? " +
//" and invoice.inv_type=? " +
" and itrace.item_ser__prom in("+itemSer+") "+
//" and itrace.item_ser__prom in("+itemSer+") "+
" and ( itrace.item_ser__prom in("+itemSer+") OR((itrace.item_ser__prom,itrace.ITEM_CODE) IN (select item_ser,item_code from item_credit_perc WHERE item_ser NOT IN("+itemSer+") )) ) "+
//" and invoice.tran_date between ? and ? " +
" AND itrace.RATE__STDUOM>0.001 "
+ " and itrace.item_code = ? and itrace.invoice_id in("+selectedInvList+") " ;
......@@ -8012,7 +8043,7 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
" where invoice.invoice_id=itrace.invoice_id AND invoice.cust_code = ? " +
//" and invoice.site_code = ? " +
//" and invoice.inv_type=? " +
" and itrace.item_ser__prom in("+itemSer+") "
" and ( itrace.item_ser__prom in("+itemSer+") OR((itrace.item_ser__prom,itrace.ITEM_CODE) IN (select item_ser,item_code from item_credit_perc WHERE item_ser NOT IN("+itemSer+") )) ) "
+ //" and invoice.tran_date between ? and ? " +
" AND itrace.RATE__STDUOM>0.001 "
+ " and itrace.item_code = ? and itrace.invoice_id in("+transitInvList+") " ;
......@@ -8189,7 +8220,8 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
+ " AND A.TRAN_DATE <= ? "
+ " AND B.ITEM_CODE = ? "
//+ " AND A.SITE_CODE = ? "
+" and a.item_ser in ("+itemSer+") ";
//+" and a.item_ser in ("+itemSer+") ";
+ " and ( A.item_ser in ("+itemSer+") OR((A.item_ser,B.ITEM_CODE) IN (select item_ser,item_code from item_credit_perc WHERE item_ser NOT IN("+itemSer+") )) ) " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,custCode);
pstmt.setTimestamp(2,fromDate );
......@@ -8315,7 +8347,7 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
" where invoice.invoice_id=itrace.invoice_id AND invoice.cust_code = ? " +
//" and invoice.site_code = ? " +
//" and invoice.inv_type=? " +
" and itrace.item_ser__prom in ("+itemSer+") "
" and ( itrace.item_ser__prom in ("+itemSer+") OR((itrace.item_ser__prom,itrace.ITEM_CODE) IN (select item_ser,item_code from item_credit_perc WHERE item_ser NOT IN("+itemSer+") )) ) "
+ " and invoice.tran_date between ? and ? AND itrace.RATE__STDUOM>0 "
+ " and itrace.item_code = ? and itrace.invoice_id in("+selectedInvList+") " ;
// "group by itrace.RATE__STDUOM ";
......@@ -8326,7 +8358,7 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
" where invoice.invoice_id=itrace.invoice_id AND invoice.cust_code = ? " +
//" and invoice.site_code = ? " +
//" and invoice.inv_type=? " +
" and itrace.item_ser__prom in ("+itemSer+") "
" and ( itrace.item_ser__prom in ("+itemSer+") OR((itrace.item_ser__prom,itrace.ITEM_CODE) IN (select item_ser,item_code from item_credit_perc WHERE item_ser NOT IN("+itemSer+") )) ) "
+ " and invoice.tran_date between ? and ? AND itrace.RATE__STDUOM>0 "
+ " and itrace.item_code = ? and itrace.invoice_id in("+transitInvList+") " ;
// "group by itrace.RATE__STDUOM ";
......@@ -8405,13 +8437,13 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
" (select invoice_id,sum(quantity) totfreeQty,sum(rate),sum(quantity)*sum(rate) as totFreeValue " +
"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.invoice_id in("+selectedInvList+") and item_code='"+itemCode+"' and ( itrace.item_ser__prom in ("+itemSer+") OR((itrace.item_ser__prom,itrace.ITEM_CODE) IN (select item_ser,item_code from item_credit_perc WHERE item_ser NOT IN("+itemSer+") )) ) " +
//" 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+") " +
"invoice.invoice_id in("+selectedInvList+") and item_code='"+itemCode+"' and ( itrace.item_ser__prom in ("+itemSer+") OR((itrace.item_ser__prom,itrace.ITEM_CODE) IN (select item_ser,item_code from item_credit_perc WHERE item_ser NOT IN("+itemSer+") )) ) " +
//" and invoice.inv_type='"+orderType+"' " +
" and rate__stduom<=0.001 ) group by invoice_id ) HAVING sum(totFreeValue) >0 AND sum(totfreeQty)>0 " ;
......@@ -8422,13 +8454,13 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
" (select invoice_id,sum(quantity) totfreeQty,sum(rate),sum(quantity)*sum(rate) as totFreeValue " +
"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.invoice_id in("+transitInvList+") and item_code='"+itemCode+"' and ( itrace.item_ser__prom in ("+itemSer+") OR((itrace.item_ser__prom,itrace.ITEM_CODE) IN (select item_ser,item_code from item_credit_perc WHERE item_ser NOT IN("+itemSer+") )) ) " +
//" 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+")" +
"invoice.invoice_id in("+transitInvList+") and item_code='"+itemCode+"' and ( itrace.item_ser__prom in ("+itemSer+") OR((itrace.item_ser__prom,itrace.ITEM_CODE) IN (select item_ser,item_code from item_credit_perc WHERE item_ser NOT IN("+itemSer+") )) ) " +
//" and invoice.inv_type='"+orderType+"' " +
" and rate__stduom<=0.001 ) group by invoice_id ) HAVING sum(totFreeValue) >0 AND sum(totfreeQty)>0 " ;
......@@ -8547,6 +8579,69 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
DecimalFormat decFormat = new DecimalFormat(fmtStr);
return decFormat.format(actVal);
}
public String getItemSerListInv(String itemser, Connection conn)
{
String itemSerGrpValue="",itemSerSplit="",resultItemSer="";
PreparedStatement pstmt = null,pstmt2 = null,pstmt3 = null;
ResultSet rs = null,rs2 = null,rs3 = null;
String sql = null;
String itemCrdPrcValue="",itemCrdPrcSplit="",resultItemCrd="";
try
{
resultItemSer=getItemSerList(itemser, conn);
/*sql= " select item_ser from itemser where grp_code=? and item_ser<>case when grp_code is null then '.' else grp_code end " +
"union all " +
"select item_ser from itemser where item_ser=? and item_ser<>case when grp_code is null then '.' else grp_code end";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemser);
pstmt.setString(2, itemser);
rs = pstmt.executeQuery();
while(rs.next())
{
itemSerGrpValue=checkNull(rs.getString("item_ser")).trim();
itemSerSplit=itemSerSplit+"'"+itemSerGrpValue+"',";
}
rs.close();
rs = null;
pstmt.close();
resultItemSer = itemSerSplit.substring(0, itemSerSplit.length() - 1);*/
System.out.println("resultItemSer>>>>>"+resultItemSer);
//Start added by chnadra shekar on 05-aug-2016
sql= " select distinct item_ser from item_credit_perc WHERE item_ser NOT IN("+resultItemSer+")";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
while(rs.next())
{
itemCrdPrcValue=checkNull(rs.getString("item_ser")).trim();
itemCrdPrcSplit=itemCrdPrcSplit+"'"+itemCrdPrcValue+"',";
System.out.println("itemCrdPrcSplit>>>>"+itemCrdPrcSplit);
}
rs.close();
rs = null;
pstmt.close();
if(itemCrdPrcSplit !=null && itemCrdPrcSplit.trim().length()>0)
{
resultItemCrd = itemCrdPrcSplit.substring(0, itemCrdPrcSplit.length() - 1);
resultItemSer=resultItemSer+","+resultItemCrd;
}
System.out.println("final resultItemSer>>>>>"+resultItemSer);
//End added by chnadra shekar on 05-aug-2016
}
catch(Exception exception)
{
exception.printStackTrace();
try
{
throw new ITMException( exception );
} catch (ITMException e)
{
e.printStackTrace();
}
}
return resultItemSer;
}
public String getItemSerList(String itemser, Connection conn)
{
String itemSerGrpValue="",itemSerSplit="",resultItemSer="";
......
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