Skip to content

B
business-java
Commit ca7e41dc authored by pborate's avatar pborate
Browse files
Options

Updated changes for dwh_sales_sum insert query 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@198752 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6232addf
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 9 deletions
webitm-dashboard/ibase/dashboard/fin/ejb/UpdateDWHSalesSum.java
View file @ ca7e41dc
......@@ -75,7 +75,7 @@ public class UpdateDWHSalesSum implements Schedule
sql.append("INSERT INTO DWH_SALES_SUM ( ")
.append("CGST_AMT, CGST_RATE, SGST_RATE, SGST_AMT, DISC_AMT, IGST_RATE,IGST_AMT, MRP, PTR, PTS,TRAN_ID,SITE_CODE, CUST_CODE, ")
.append(" ITEM_CODE, DOC_DATE,POS_CODE,SALES_QTY, GROSS_SALES_VALUE,FREE_QTY,FREE_SALES_VALUE, NET_SALES_QTY, ")
.append("NET_SALES_VALUE, REPL_QTY, SALEABLE_RETURN_QTY, SALEABLE_RETURN_AMT, BREAKAGE_RETURN_QTY, BREAKAGE_RETURN_AMT, ")
.append("NET_SALES_VALUE, REPL_QTY,REPL_VALUE, SALEABLE_RETURN_QTY, SALEABLE_RETURN_AMT, BREAKAGE_RETURN_QTY, BREAKAGE_RETURN_AMT, ")
.append("EXPIRY_RETURN_QTY, EXPIRY_RETURN_AMT, CORRECTION_RETURN_QTY, CORRECTION_RETURN_AMT, REPL_RETURN_QTY, " )
.append("REPL_RETURN_VALUE, RETURN_QTY, GROSS_RETURN_VALUE, NET_RETURN_VALUE, HSN_CODE, PACK,DUE_DATE,REF_SER,CITY,ITEM_BRAND,ITEM_SER")
.append(" ) ")
......@@ -102,6 +102,7 @@ public class UpdateDWHSalesSum implements Schedule
.append(" SUM( SALES_QTY + FREE_QTY - RETURN_QTY + REPL_RETURN_QTY ) AS NET_SALES_QTY, " )
.append(" SUM( A.GROSS_SALES_VALUE - A.NET_RETURN_VALUE + A.REPL_RETURN_VALUE ) AS NET_SALES_VALUE, " )
.append(" SUM( A.REPL_QTY ) AS REPL_QTY, " )
.append(" SUM( A.REPL_VALUE ) AS REPL_VALUE, " )
.append(" SUM( A.SALEABLE_RETURN_QTY ) AS SALEABLE_RETURN_QTY, " )
.append(" SUM( A.SALEABLE_RETURN_AMT ) AS SALEABLE_RETURN_AMT, " )
.append(" SUM( A.BREAKAGE_RETURN_QTY ) AS BREAKAGE_RETURN_QTY, " )
......@@ -117,7 +118,7 @@ public class UpdateDWHSalesSum implements Schedule
.append(" SUM( A.NET_RETURN_VALUE ) AS NET_RETURN_VALUE, " )
.append(" A.HSN_CODE,A.PACK,A.DUE_DATE, " )
.append(" '"+refSer+"' AS REF_SER, " )
.append(" DC.CITY, " )
.append(" A.CITY, " )
.append(" A.ITEM_BRAND, A.ITEM_SER " )
.append(" FROM " )
.append(" (SELECT NVL(FN_RGET_TAX_NEW('S-INV',INVOICE_TRACE.INVOICE_ID,CAST(INVOICE_TRACE.line_no AS CHAR(3)),'CGST_TAX',' ',' ','T'),0) AS CGST_AMT, " )
......@@ -136,6 +137,7 @@ public class UpdateDWHSalesSum implements Schedule
.append(" INVOICE_TRACE.ITEM_CODE, " )
.append(" INVOICE.TRAN_DATE, " )
.append(" ORG_STRUCTURE_CUST.POS_CODE AS POS_CODE, " )
.append(" DC.CITY, " )
.append(" INVOICE.INV_TYPE AS TRAN_TYPE, " )
.append(" INVOICE.INVOICE_ID AS TRAN_ID, " )
.append(" ITEM.HSN_NO AS HSN_CODE, " )
......@@ -172,11 +174,16 @@ public class UpdateDWHSalesSum implements Schedule
.append(" END ) AS FREE_QTY, " )
.append(" ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN INVOICE_TRACE.QUANTITY__STDUOM * INVOICE_TRACE.RATE__STDUOM ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') IN ( 'I', 'V') AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN INVOICE_TRACE.QUANTITY__STDUOM * NVL(FN_RPICK_RATE_PL(DC.PRICE_LIST, INVOICE.TRAN_DATE, INVOICE_TRACE.ITEM_CODE, INVOICE_TRACE.LOT_NO) , 0 ) ")
.append(" ELSE 0 ")
.append(" END ) AS FREE_SALES_VALUE, ")
.append(" ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') IN ( 'I', 'V') AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN INVOICE_TRACE.QUANTITY__STDUOM * NVL(FN_RPICK_RATE_PL(DC.PRICE_LIST, INVOICE.TRAN_DATE, INVOICE_TRACE.ITEM_CODE, INVOICE_TRACE.LOT_NO) , 0 ) ")
.append(" ELSE 0 ")
.append(" END ) AS REPL_VALUE, ")
.append(" INVOICE_TRACE.NET_AMT AS NET_SALES_VALUE, ")
.append(" 0 AS SALEABLE_RETURN_QTY, " )
.append(" 0 AS SALEABLE_RETURN_AMT, " )
......@@ -200,6 +207,7 @@ public class UpdateDWHSalesSum implements Schedule
.append(" ON INVOICE.SITE_CODE = SITE.SITE_CODE " )
.append(" INNER JOIN ITEM " )
.append(" ON INVOICE_TRACE.ITEM_CODE = ITEM.ITEM_CODE " )
.append(" LEFT OUTER JOIN CUSTOMER DC ON INVOICE.CUST_CODE = DC.CUST_CODE " )
.append(" LEFT OUTER JOIN ORG_STRUCTURE_CUST " )
.append(" ON INVOICE.CUST_CODE = ORG_STRUCTURE_CUST.CUST_CODE " )
.append(" INNER JOIN PACKING ON ITEM.PACK_CODE=PACKING.PACK_CODE " )
......@@ -224,6 +232,7 @@ public class UpdateDWHSalesSum implements Schedule
.append(" SRETURNDET.ITEM_CODE, " )
.append(" SRETURN.TRAN_DATE, " )
.append(" ORG_STRUCTURE_CUST.POS_CODE AS POS_CODE, " )
.append(" DC.CITY, " )
.append(" SRETURN.TRAN_TYPE, " )
.append(" SRETURN.TRAN_ID, " )
.append(" ITEM.HSN_NO AS HSN_CODE, " )
......@@ -236,6 +245,7 @@ public class UpdateDWHSalesSum implements Schedule
.append(" 0 AS REPL_QTY, " )
.append(" 0 AS FREE_QTY, " )
.append(" 0 AS FREE_SALES_VALUE, " )
.append(" 0 AS REPL_VALUE, " )
.append(" 0 AS NET_SALES_VALUE, " )
.append(" ( " )
.append(" CASE " )
......@@ -400,6 +410,7 @@ public class UpdateDWHSalesSum implements Schedule
.append(" ON SRETURN.SITE_CODE = SITE.SITE_CODE " )
.append(" INNER JOIN ITEM " )
.append(" ON SRETURNDET.ITEM_CODE = ITEM.ITEM_CODE " )
.append(" LEFT OUTER JOIN CUSTOMER DC ON SRETURN.CUST_CODE = DC.CUST_CODE " )
.append(" LEFT OUTER JOIN ORG_STRUCTURE_CUST " )
.append(" ON SRETURN.CUST_CODE = ORG_STRUCTURE_CUST.CUST_CODE " )
.append(" LEFT OUTER JOIN INVOICE_TRACE " )
......@@ -412,8 +423,6 @@ public class UpdateDWHSalesSum implements Schedule
.append(" AND SRETURN.TRAN_DATE = TO_DATE('"+refDate+"','"+sourceDateFormat+"')" )
.append(" AND SRETURN.TRAN_ID ='"+refId+"' " )
.append(" ) A ")
.append(" LEFT OUTER JOIN CUSTOMER DC " )
.append(" ON A.CUST_CODE = DC.CUST_CODE " )
.append(" GROUP BY A.SITE_CODE, " )
.append(" A.CUST_CODE, " )
.append(" A.ITEM_CODE, " )
......@@ -425,7 +434,7 @@ public class UpdateDWHSalesSum implements Schedule
.append(" A.PTR, " )
.append(" A.PTS,")
.append(" A.TRAN_ID,")
.append(" A.HSN_CODE,A.PACK, A.DUE_DATE,DC.CITY ,A.ITEM_BRAND, A.IGST_RATE,A.ITEM_SER ");
.append(" A.HSN_CODE,A.PACK, A.DUE_DATE,A.ITEM_BRAND,A.CITY, A.IGST_RATE,A.ITEM_SER ");
pstmt = userDbConn.prepareStatement(sql.toString());
rs = pstmt.executeQuery();
......@@ -447,6 +456,7 @@ public class UpdateDWHSalesSum implements Schedule
}
catch (SQLException e) {
// TODO Auto-generated catch block
BaseLogger.log("0",null,null, "Inside updateDwhSalesSum sql Exception["+e+"]" );
if( pstmt != null )
{
pstmt.close();
......@@ -459,6 +469,7 @@ public class UpdateDWHSalesSum implements Schedule
}
}
catch(Exception ex) {
BaseLogger.log("0",null,null, "Inside updateDwhSalesSum Exception["+ex+"]" );
if( pstmt != null )
{
pstmt.close();
......@@ -477,10 +488,11 @@ public class UpdateDWHSalesSum implements Schedule
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
BaseLogger.log("0",null,null, "Inside updateDwhSalesSum sql Exception:::["+e+"]" );
}
catch (Exception ex) {
// TODO Auto-generated catch block
BaseLogger.log("0",null,null, "Inside updateDwhSalesSum Exception:::["+ex+"]" );
}
finally
......
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