Commit 3201b6d7 authored by pborate's avatar pborate

Done the changes for UpdateDwhSalesSum class

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@199013 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 89dc395f
......@@ -127,13 +127,13 @@ public class UpdateDWHSalesSum implements Schedule
.append(" DSSV.TRAN_DATE AS DOC_DATE, ")
.append(" DSSV.POS_CODE AS POS_CODE, ")
.append(" SUM( DSSV.SALES_QTY ) AS SALES_QTY, ")
.append(" SUM( DSSV.GROSS_SALES_VALUE ) AS GROSS_SALES_VALUE, ")
.append(" SUM( DSSV.GROSS_SALES_VALUE - DSSV.DISC_AMT_INV ) AS GROSS_SALES_VALUE, ")
.append(" SUM( DSSV.FREE_QTY ) AS FREE_QTY, ")
.append(" SUM( DSSV.FREE_SALES_VALUE ) AS FREE_SALES_VALUE, ")
.append(" SUM( DSSV.SALES_QTY + DSSV.FREE_QTY + DSSV.REPL_QTY - DSSV.RETURN_QTY + DSSV.REPL_RETURN_QTY ) AS NET_SALES_QTY, ")
.append(" SUM( DSSV.GROSS_SALES_VALUE - DSSV.GROSS_RETURN_VALUE + DSSV.REPL_RETURN_VALUE ) AS NET_SALES_VALUE, ")
.append(" SUM( DSSV.GROSS_SALES_VALUE - DSSV.DISC_AMT_INV - DSSV.GROSS_RETURN_VALUE - DSSV.DISC_AMT_RET + DSSV.REPL_RETURN_VALUE - DSSV.DISC_AMT_REPL_RET) AS NET_SALES_VALUE, ")
.append(" SUM( DSSV.REPL_QTY ) AS REPL_QTY, ")
.append(" SUM( DSSV.REPL_VALUE ) AS REPL_VALUE, ")
.append(" SUM( DSSV.REPL_VALUE - DSSV.DISC_AMT_REPL) AS REPL_VALUE, ")
.append(" SUM( DSSV.SALEABLE_RETURN_QTY ) AS SALEABLE_RETURN_QTY, ")
.append(" SUM( DSSV.SALEABLE_RETURN_AMT ) AS SALEABLE_RETURN_AMT, ")
.append(" SUM( DSSV.BREAKAGE_RETURN_QTY ) AS BREAKAGE_RETURN_QTY, ")
......@@ -143,7 +143,7 @@ public class UpdateDWHSalesSum implements Schedule
.append(" SUM( DSSV.CORRECTION_RETURN_QTY ) AS CORRECTION_RETURN_QTY, ")
.append(" SUM( DSSV.CORRECTION_RETURN_AMT ) AS CORRECTION_RETURN_AMT, ")
.append(" SUM( DSSV.REPL_RETURN_QTY ) AS REPL_RETURN_QTY, ")
.append(" SUM( DSSV.REPL_RETURN_VALUE ) AS REPL_RETURN_VALUE, ")
.append(" SUM( DSSV.REPL_RETURN_VALUE - DSSV.DISC_AMT_REPL_RET) AS REPL_RETURN_VALUE, ")
.append(" SUM( DSSV.RETURN_QTY ) AS RETURN_QTY, ")
.append(" SUM( DSSV.GROSS_RETURN_VALUE - DSSV.DISC_AMT_RET) AS GROSS_RETURN_VALUE, ")
.append(" SUM( DSSV.NET_RETURN_VALUE ) AS NET_RETURN_VALUE, ")
......@@ -153,67 +153,19 @@ public class UpdateDWHSalesSum implements Schedule
.append(" SUM(DSSV.SGST_AMT) AS SGST_AMT, ")
.append(" DSSV.IGST_RATE, ")
.append(" SUM(DSSV.IGST_AMT) AS IGST_AMT, ")
.append(" SUM(DSSV.DISC_AMT) AS DISC_AMT, ")
.append(" SUM(DSSV.DISC_AMT_INV + DSSV.DISC_AMT_RET + DSSV.DISC_AMT_REPL + DSSV.DISC_AMT_REPL_RET) AS DISC_AMT, ")
.append(" DSSV.MRP, ")
.append(" DSSV.PTR, ")
.append(" DSSV.PTS, ")
.append(" DSSV.HSN_CODE, ")
.append(" DSSV.PACK, ")
.append(" (SELECT DESCR FROM PACKING WHERE PACK_CODE = DSSV.PACK_CODE) AS PACK, ")
.append(" DSSV.DUE_DATE, ")
.append(" DSSV.REF_SER, ")
.append(" DSSV.CITY, ")
.append(" DSSV.ITEM_BRAND, ")
.append(" DSSV.ITEM_SER ")
.append(" FROM ")
.append(" (SELECT A.TRAN_ID, ")
.append(" A.SITE_CODE AS SITE_CODE, ")
.append(" A.CUST_CODE AS CUST_CODE, ")
.append(" A.ITEM_CODE AS ITEM_CODE, ")
.append(" A.TRAN_DATE AS TRAN_DATE, ")
.append(" A.POS_CODE AS POS_CODE, ")
.append(" A.SALES_QTY AS SALES_QTY, ")
.append(" ( A.GROSS_SALES_VALUE - A.DISC_AMT_INV ) AS GROSS_SALES_VALUE, ")
.append(" A.FREE_QTY AS FREE_QTY, ")
.append(" A.FREE_SALES_VALUE AS FREE_SALES_VALUE, ")
.append(" A.REPL_QTY AS REPL_QTY, ")
.append(" ( A.REPL_VALUE - A.DISC_AMT_REPL ) AS REPL_VALUE, ")
.append(" A.SALEABLE_RETURN_QTY AS SALEABLE_RETURN_QTY, ")
.append(" A.SALEABLE_RETURN_AMT AS SALEABLE_RETURN_AMT, ")
.append(" A.BREAKAGE_RETURN_QTY AS BREAKAGE_RETURN_QTY, ")
.append(" A.BREAKAGE_RETURN_AMT AS BREAKAGE_RETURN_AMT, ")
.append(" A.EXPIRY_RETURN_QTY AS EXPIRY_RETURN_QTY, ")
.append(" A.EXPIRY_RETURN_AMT AS EXPIRY_RETURN_AMT, ")
.append(" A.CORRECTION_RETURN_QTY AS CORRECTION_RETURN_QTY, ")
.append(" A.CORRECTION_RETURN_AMT AS CORRECTION_RETURN_AMT, ")
.append(" A.REPL_RETURN_QTY AS REPL_RETURN_QTY, ")
.append(" ( A.REPL_RETURN_VALUE - A.DISC_AMT_REPL_RET ) AS REPL_RETURN_VALUE, ")
.append(" A.RETURN_QTY AS RETURN_QTY, ")
.append(" ( A.GROSS_RETURN_VALUE - A.DISC_AMT_RET) AS GROSS_RETURN_VALUE, ")
.append(" A.NET_RETURN_VALUE AS NET_RETURN_VALUE, ")
.append(" A.CGST_RATE, ")
.append(" A.CGST_AMT, ")
.append(" A.SGST_RATE, ")
.append(" A.SGST_AMT, ")
.append(" A.IGST_RATE, ")
.append(" A.IGST_AMT, ")
.append(" A.DISC_AMT_INV, ")
.append(" A.DISC_AMT_RET, ")
.append(" DISC_AMT_REPL, ")
.append(" DISC_AMT_REPL_RET, ")
.append(" (A.DISC_AMT_INV + A.DISC_AMT_RET + A.DISC_AMT_REPL + A.DISC_AMT_REPL_RET) AS DISC_AMT, ")
.append(" A.MRP, ")
.append(" A.PTR, ")
.append(" A.PTS, ")
.append(" A.HSN_CODE, ")
.append(" (SELECT DESCR FROM PACKING WHERE PACK_CODE = A.PACK_CODE) AS PACK, ")
.append(" A.DUE_DATE, ")
.append(" A.REF_SER, ")
.append(" A.CITY, ")
.append(" A.ITEM_BRAND, ")
.append(" A.ITEM_SER ")
.append(" FROM ")
.append(" ( SELECT ")
.append(" '"+refSer+"' AS REF_SER, ")
.append(" (SELECT 'S-INV ' AS REF_SER, ")
.append(" ITEM.ITEM_SER, ")
.append(" INVOICE.INVOICE_ID AS TRAN_ID, ")
.append(" INVOICE.SITE_CODE, ")
......@@ -291,8 +243,7 @@ public class UpdateDWHSalesSum implements Schedule
.append(" NVL(FN_RGET_TAX_NEW('S-INV',INVOICE_TRACE.INVOICE_ID,CAST(INVOICE_TRACE.line_no AS CHAR(3)),'SGST_TAX',' ',' ','T'),0) AS SGST_AMT, ")
.append(" NVL(FN_RGET_TAX_NEW('S-INV',INVOICE_TRACE.INVOICE_ID,CAST(INVOICE_TRACE.line_no AS CHAR(3)),'IGST_TAX',' ',' ','P'),0) AS IGST_RATE, ")
.append(" NVL(FN_RGET_TAX_NEW('S-INV',INVOICE_TRACE.INVOICE_ID,CAST(INVOICE_TRACE.line_no AS CHAR(3)),'IGST_TAX',' ',' ','T'),0) AS IGST_AMT, ")
.append(" ( (NVL((((NVL(INVOICE_TRACE.QUANTITY,0)*NVL(INVOICE_TRACE.RATE__STDUOM,0)*NVL(INVOICE.EXCH_RATE,0))*NVL(INVOICE_TRACE.DISCOUNT,0))/100),0) + ")
.append(" NVL(FN_RGET_TAX_DET('S-INV', INVOICE_TRACE.INVOICE_ID, CAST(INVOICE_TRACE.LINE_NO AS CHAR(3)),'DISC_GST','T')*(-1),0)) ) AS DISC_AMT_INV, ")
.append(" ( (NVL((((NVL(INVOICE_TRACE.QUANTITY,0)*NVL(INVOICE_TRACE.RATE__STDUOM,0)*NVL(INVOICE.EXCH_RATE,0))*NVL(INVOICE_TRACE.DISCOUNT,0))/100),0) + NVL(FN_RGET_TAX_NEW('S-INV', INVOICE_TRACE.INVOICE_ID, CAST(INVOICE_TRACE.LINE_NO AS CHAR(3)),'DISC_GST',' ',' ','T')*(-1),0)) ) AS DISC_AMT_INV, ")
.append(" 0 AS DISC_AMT_RET, ")
.append(" ( ")
.append(" CASE ")
......@@ -318,8 +269,7 @@ public class UpdateDWHSalesSum implements Schedule
.append(" AND INVOICE.TRAN_DATE = TO_DATE('"+refDate+"','"+sourceDateFormat+"') ")
.append(" AND INVOICE.INVOICE_ID ='"+refId+"' ")
.append(" UNION ALL ")
.append(" SELECT ")
.append(" '"+refSer+"' AS REF_SER, ")
.append(" SELECT 'S-RET' AS REF_SER, ")
.append(" ITEM.ITEM_SER, ")
.append(" SRETURN.TRAN_ID, ")
.append(" SRETURN.SITE_CODE, ")
......@@ -506,8 +456,7 @@ public class UpdateDWHSalesSum implements Schedule
.append(" ((NVL((((NVL(SRETURNDET.QUANTITY,0)*NVL(SRETURNDET.RATE__STDUOM,0)*NVL(SRETURN.EXCH_RATE,0))*NVL(SRETURNDET.DISCOUNT,0))/100),0) ")
.append(" + NVL(FN_RGET_TAX_NEW('S-RET', SRETURN.TRAN_ID, CAST(SRETURNDET.LINE_NO AS CHAR(3)),'DISC_GST',' ',' ','T')*(-1),0))) AS DISC_AMT_RET, ")
.append(" 0 AS DISC_AMT_REPL, ")
.append(" DECODE(SRETURNDET.RET_REP_FLAG,'P',((NVL((((NVL(SRETURNDET.QUANTITY,0)*NVL(SRETURNDET.RATE__STDUOM,0)*NVL(SRETURN.EXCH_RATE,0))*NVL ")
.append(" (SRETURNDET.DISCOUNT,0))/100),0) ")
.append(" DECODE(SRETURNDET.RET_REP_FLAG,'P',((NVL((((NVL(SRETURNDET.QUANTITY,0)*NVL(SRETURNDET.RATE__STDUOM,0)*NVL(SRETURN.EXCH_RATE,0))*NVL(SRETURNDET.DISCOUNT,0))/100),0) ")
.append(" + NVL(FN_RGET_TAX_NEW('S-RET', SRETURN.TRAN_ID, CAST(SRETURNDET.LINE_NO AS CHAR(3)),'DISC_GST',' ',' ','T')*(-1),0))), 0) AS DISC_AMT_REPL_RET, ")
.append(" NVL(FN_RPICK_MRP_PTR(SRETURNDET.ITEM_CODE, SRETURN.TRAN_DATE,SRETURNDET.LOT_NO,'MRP_GST'),0) AS MRP, ")
.append(" NVL(FN_RPICK_MRP_PTR(SRETURNDET.ITEM_CODE, SRETURN.TRAN_DATE,SRETURNDET.LOT_NO,'PTR_GST'),0) AS PTR, ")
......@@ -526,8 +475,8 @@ public class UpdateDWHSalesSum implements Schedule
.append(" AND ORG_STRUCTURE_CUST.VERSION_ID IN (SELECT v.version_id FROM version v WHERE to_date(sysdate) BETWEEN v.eff_from AND v.valid_upto) ")
.append(" AND SRETURN.TRAN_DATE = TO_DATE('"+refDate+"','"+sourceDateFormat+"') ")
.append(" AND SRETURN.TRAN_ID ='"+refId+"' ")
.append(" ) A ")
.append(" ) DSSV ")
.append(" ")
.append(" GROUP BY DSSV.TRAN_ID, ")
.append(" DSSV.SITE_CODE, ")
.append(" DSSV.CUST_CODE, ")
......@@ -538,7 +487,7 @@ public class UpdateDWHSalesSum implements Schedule
.append(" DSSV.PTS, ")
.append(" DSSV.POS_CODE, ")
.append(" DSSV.HSN_CODE, ")
.append(" DSSV.PACK, ")
.append(" DSSV.PACK_CODE, ")
.append(" DSSV.DUE_DATE, ")
.append(" DSSV.ITEM_BRAND, ")
.append(" DSSV.CITY, ")
......@@ -546,7 +495,8 @@ public class UpdateDWHSalesSum implements Schedule
.append(" DSSV.SGST_RATE, ")
.append(" DSSV.IGST_RATE, ")
.append(" DSSV.REF_SER, ")
.append(" DSSV.ITEM_SER ");
.append(" DSSV.ITEM_SER ")
;
pstmt = userDbConn.prepareStatement(sql.toString());
rs = pstmt.executeQuery();
......
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