Commit 09fe6194 authored by pborate's avatar pborate

Updated changes for sales Trend and purchase dashboard

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@200440 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 288ce1c2
......@@ -257,7 +257,7 @@ public class UpdateDWHPurchase implements Schedule
try
{
sql = "select ref_id, ref_ser, ref_date from dwh_tran_load where update_stat = 'P' and ref_ser = 'P-RCP'";
sql = "select ref_id, ref_ser, ref_date from dwh_tran_load where update_stat = 'P' and ref_ser in ('P-RCP','P-RET') ";
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
while(rs.next())
......
......@@ -85,6 +85,7 @@ public class UpdateDWHSalesSum implements Schedule
.append(" POS_CODE, ")
.append(" SALES_QTY, ")
.append(" GROSS_SALES_VALUE, ")
.append(" SALES_VALUE, ")
.append(" FREE_QTY, ")
.append(" FREE_SALES_VALUE, ")
.append(" NET_SALES_QTY, ")
......@@ -103,6 +104,7 @@ public class UpdateDWHSalesSum implements Schedule
.append(" REPL_RETURN_VALUE, ")
.append(" RETURN_QTY, ")
.append(" GROSS_RETURN_VALUE, ")
.append(" RETURN_VALUE, ")
.append(" NET_RETURN_VALUE, ")
.append(" CGST_RATE, ")
.append(" CGST_AMT, ")
......@@ -132,10 +134,11 @@ public class UpdateDWHSalesSum implements Schedule
.append(" DSSV.POS_CODE AS POS_CODE, ")
.append(" SUM( DSSV.SALES_QTY ) AS SALES_QTY, ")
.append(" SUM( DSSV.GROSS_SALES_VALUE - DSSV.DISC_AMT_INV ) AS GROSS_SALES_VALUE, ")
.append(" SUM( DSSV.GROSS_SALES_VALUE ) AS 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.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.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 - DSSV.DISC_AMT_REPL) AS REPL_VALUE, ")
.append(" SUM( DSSV.SALEABLE_RETURN_QTY ) AS SALEABLE_RETURN_QTY, ")
......@@ -150,6 +153,7 @@ public class UpdateDWHSalesSum implements Schedule
.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.GROSS_RETURN_VALUE ) AS RETURN_VALUE, ")
.append(" SUM( DSSV.NET_RETURN_VALUE ) AS NET_RETURN_VALUE, ")
.append(" DSSV.CGST_RATE, ")
.append(" SUM(DSSV.CGST_AMT) AS CGST_AMT, ")
......@@ -179,58 +183,58 @@ public class UpdateDWHSalesSum implements Schedule
.append(" nvl(INVOICE_TRACE.LINE_TYPE,'NA') as line_type, ")
.append(" INVOICE.TRAN_DATE, ")
.append(" NVL((SELECT ORG.POS_CODE ")
.append(" FROM ORG_STRUCTURE_CUST ORG ")
.append(" WHERE ORG.CUST_CODE=INVOICE.CUST_CODE ")
.append(" AND ORG.VERSION_ID IN (SELECT V.VERSION_ID FROM VERSION V WHERE TO_DATE(SYSDATE) BETWEEN V.EFF_FROM AND V.VALID_UPTO) ")
.append(" AND ORG.TABLE_NO = ITEM.ITEM_SER ")
.append(" ) ,'NA') AS POS_CODE, ")
.append(" FROM ORG_STRUCTURE_CUST ORG ")
.append(" WHERE ORG.CUST_CODE=INVOICE.CUST_CODE ")
.append(" AND ORG.VERSION_ID IN (SELECT V.VERSION_ID FROM VERSION V WHERE TO_DATE(SYSDATE) BETWEEN V.EFF_FROM AND V.VALID_UPTO) ")
.append(" AND ORG.TABLE_NO = ITEM.ITEM_SER ")
.append(" ) ,'NA') AS POS_CODE, ")
.append(" INVOICE.INV_TYPE AS TRAN_TYPE, ")
.append(" ITEM.HSN_NO AS HSN_CODE, ")
.append(" ITEM.PACK_CODE AS PACK_CODE, ")
.append(" NVL(DC.CITY , 'NOTSPECIFIED') AS CITY, ")
.append(" ITEM.PHY_ATTRIB_2 AS ITEM_BRAND, ")
.append(" ITEM.PHY_ATTRIB_2 AS ITEM_BRAND, ")
.append(" TO_CHAR(NVL(INVOICE.DUE_DATE,INVOICE.TRAN_DATE )) AS DUE_DATE, ")
.append(" ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') IN ( 'F', 'V') AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE INVOICE_TRACE.QUANTITY__STDUOM ")
.append(" END ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') IN ( 'F', 'V') AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE INVOICE_TRACE.QUANTITY__STDUOM ")
.append(" END ")
.append(" ) AS SALES_QTY, ")
.append(" ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE INVOICE_TRACE.QUANTITY__STDUOM * INVOICE_TRACE.RATE__STDUOM ")
.append(" END ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE INVOICE_TRACE.QUANTITY__STDUOM * INVOICE_TRACE.RATE__STDUOM ")
.append(" END ")
.append(" ) AS GROSS_SALES_VALUE, ")
.append(" ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') IN ( 'I', 'V') ")
.append(" THEN INVOICE_TRACE.QUANTITY__STDUOM ")
.append(" ELSE 0 ")
.append(" END ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') IN ( 'I', 'V') ")
.append(" THEN INVOICE_TRACE.QUANTITY__STDUOM ")
.append(" ELSE 0 ")
.append(" END ")
.append(" ) AS REPL_QTY, ")
.append(" ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN INVOICE_TRACE.QUANTITY__STDUOM ")
.append(" ELSE 0 ")
.append(" END ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN INVOICE_TRACE.QUANTITY__STDUOM ")
.append(" ELSE 0 ")
.append(" END ")
.append(" ) AS FREE_QTY, ")
.append(" ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' 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 ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' 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 ")
.append(" ) 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 ")
.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 ")
.append(" ) AS REPL_VALUE, ")
.append(" INVOICE_TRACE.NET_AMT AS NET_SALES_VALUE, ")
.append(" 0 AS SALEABLE_RETURN_QTY, ")
......@@ -257,12 +261,12 @@ public class UpdateDWHSalesSum implements Schedule
.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 ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') IN ( 'I', 'V') AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN ( (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_NEW('S-INV', INVOICE_TRACE.INVOICE_ID, CAST(INVOICE_TRACE.LINE_NO AS CHAR(3)),'DISC_GST',' ',' ','T')*(-1),0)) ) ")
.append(" ELSE 0 ")
.append(" END ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') IN ( 'I', 'V') AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN ( (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_NEW('S-INV', INVOICE_TRACE.INVOICE_ID, CAST(INVOICE_TRACE.LINE_NO AS CHAR(3)),'DISC_GST',' ',' ','T')*(-1),0)) ) ")
.append(" ELSE 0 ")
.append(" END ")
.append(" ) AS DISC_AMT_REPL, ")
.append(" 0 AS DISC_AMT_REPL_RET, ")
.append(" NVL(FN_RPICK_MRP_PTR(INVOICE_TRACE.ITEM_CODE,INVOICE.TRAN_DATE,INVOICE_TRACE.LOT_NO,'MRP_GST'),0) AS MRP, ")
......@@ -274,8 +278,8 @@ public class UpdateDWHSalesSum implements Schedule
.append(" INNER JOIN ITEM ON INVOICE_TRACE.ITEM_CODE = ITEM.ITEM_CODE ")
.append(" LEFT OUTER JOIN CUSTOMER DC ON INVOICE.CUST_CODE = DC.CUST_CODE ")
.append(" WHERE INVOICE.CONFIRMED = 'Y' ")
.append(" AND INVOICE.TRAN_DATE = TO_DATE('"+refDate+"','"+sourceDateFormat+"') ")
.append(" AND INVOICE.INVOICE_ID ='"+refId+"' ")
.append(" AND INVOICE.TRAN_DATE = TO_DATE('"+refDate+"','"+sourceDateFormat+"') ")
.append(" AND INVOICE.INVOICE_ID ='"+refId+"' ")
.append(" UNION ALL ")
.append(" SELECT 'S-RET' AS REF_SER, ")
.append(" ITEM.ITEM_SER, ")
......@@ -286,12 +290,12 @@ public class UpdateDWHSalesSum implements Schedule
.append(" nvl(SRETURNDET.LOT_NO,'NA') as lot_no, ")
.append(" nvl(SRETURNDET.LINE_TYPE,'NA') as line_type, ")
.append(" SRETURN.TRAN_DATE, ")
.append("NVL((SELECT ORG.POS_CODE ")
.append(" FROM ORG_STRUCTURE_CUST ORG ")
.append(" WHERE ORG.CUST_CODE=SRETURN.CUST_CODE ")
.append(" AND ORG.VERSION_ID IN (SELECT V.VERSION_ID FROM VERSION V WHERE TO_DATE(SYSDATE) BETWEEN V.EFF_FROM AND V.VALID_UPTO) ")
.append(" AND ORG.TABLE_NO = ITEM.ITEM_SER ")
.append(" ) ,'NA') AS POS_CODE, ")
.append(" NVL((SELECT ORG.POS_CODE ")
.append(" FROM ORG_STRUCTURE_CUST ORG ")
.append(" WHERE ORG.CUST_CODE=SRETURN.CUST_CODE ")
.append(" AND ORG.VERSION_ID IN (SELECT V.VERSION_ID FROM VERSION V WHERE TO_DATE(SYSDATE) BETWEEN V.EFF_FROM AND V.VALID_UPTO) ")
.append(" AND ORG.TABLE_NO = ITEM.ITEM_SER ")
.append(" ) ,'NA') AS POS_CODE, ")
.append(" SRETURN.TRAN_TYPE, ")
.append(" ITEM.HSN_NO AS HSN_CODE, ")
.append(" ITEM.PACK_CODE AS PACK_CODE, ")
......@@ -307,159 +311,159 @@ public class UpdateDWHSalesSum implements Schedule
.append(" 0 AS NET_SALES_VALUE, ")
.append(" ( ")
.append(" CASE ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" AND SRETURN.TRAN_TYPE IN('SR') ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, SRETURNDET.QUANTITY__STDUOM, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE SRETURNDET.QUANTITY__STDUOM ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" AND SRETURN.TRAN_TYPE IN('SR') ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, SRETURNDET.QUANTITY__STDUOM, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE SRETURNDET.QUANTITY__STDUOM ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" END) AS SALEABLE_RETURN_QTY, ")
.append(" ( ")
.append(" CASE ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" AND SRETURN.TRAN_TYPE IN('SR') ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, SRETURNDET.QUANTITY__STDUOM * SRETURNDET.RATE__STDUOM, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE SRETURNDET.QUANTITY__STDUOM * INVOICE_TRACE.RATE__STDUOM ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" AND SRETURN.TRAN_TYPE IN('SR') ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, SRETURNDET.QUANTITY__STDUOM * SRETURNDET.RATE__STDUOM, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE SRETURNDET.QUANTITY__STDUOM * INVOICE_TRACE.RATE__STDUOM ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" END) AS SALEABLE_RETURN_AMT, ")
.append(" ( ")
.append(" CASE ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" AND SRETURN.TRAN_TYPE IN('BR', 'DR') ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, SRETURNDET.QUANTITY__STDUOM, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE SRETURNDET.QUANTITY__STDUOM ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" AND SRETURN.TRAN_TYPE IN('BR', 'DR') ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, SRETURNDET.QUANTITY__STDUOM, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE SRETURNDET.QUANTITY__STDUOM ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" END) AS BREAKAGE_RETURN_QTY, ")
.append(" ( ")
.append(" CASE ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" AND SRETURN.TRAN_TYPE IN('BR', 'DR') ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, SRETURNDET.QUANTITY__STDUOM * SRETURNDET.RATE__STDUOM, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE SRETURNDET.QUANTITY__STDUOM * INVOICE_TRACE.RATE__STDUOM ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" AND SRETURN.TRAN_TYPE IN('BR', 'DR') ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, SRETURNDET.QUANTITY__STDUOM * SRETURNDET.RATE__STDUOM, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE SRETURNDET.QUANTITY__STDUOM * INVOICE_TRACE.RATE__STDUOM ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" END) AS BREAKAGE_RETURN_AMT, ")
.append(" ( ")
.append(" CASE ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" AND SRETURN.TRAN_TYPE = 'ER' ")
.append(" AND SRETURNDET.DISCOUNT <> 100 ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, SRETURNDET.QUANTITY__STDUOM, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE SRETURNDET.QUANTITY__STDUOM ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" AND SRETURN.TRAN_TYPE = 'ER' ")
.append(" AND SRETURNDET.DISCOUNT <> 100 ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, SRETURNDET.QUANTITY__STDUOM, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE SRETURNDET.QUANTITY__STDUOM ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" END) AS EXPIRY_RETURN_QTY, ")
.append(" ( ")
.append(" CASE ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" AND SRETURN.TRAN_TYPE = 'ER' ")
.append(" AND SRETURNDET.DISCOUNT <> 100 ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, SRETURNDET.QUANTITY__STDUOM * SRETURNDET.RATE__STDUOM, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE SRETURNDET.QUANTITY__STDUOM * INVOICE_TRACE.RATE__STDUOM ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" AND SRETURN.TRAN_TYPE = 'ER' ")
.append(" AND SRETURNDET.DISCOUNT <> 100 ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, SRETURNDET.QUANTITY__STDUOM * SRETURNDET.RATE__STDUOM, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE SRETURNDET.QUANTITY__STDUOM * INVOICE_TRACE.RATE__STDUOM ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" END) AS EXPIRY_RETURN_AMT, ")
.append(" ( ")
.append(" CASE ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" AND SRETURN.TRAN_TYPE IN('IC') ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, SRETURNDET.QUANTITY__STDUOM, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE SRETURNDET.QUANTITY__STDUOM ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" AND SRETURN.TRAN_TYPE IN('IC') ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, SRETURNDET.QUANTITY__STDUOM, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE SRETURNDET.QUANTITY__STDUOM ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" END) AS CORRECTION_RETURN_QTY, ")
.append(" ( ")
.append(" CASE ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" AND SRETURN.TRAN_TYPE IN('IC') ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, SRETURNDET.QUANTITY__STDUOM * SRETURNDET.RATE__STDUOM, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE SRETURNDET.QUANTITY__STDUOM * INVOICE_TRACE.RATE__STDUOM ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" AND SRETURN.TRAN_TYPE IN('IC') ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, SRETURNDET.QUANTITY__STDUOM * SRETURNDET.RATE__STDUOM, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE SRETURNDET.QUANTITY__STDUOM * INVOICE_TRACE.RATE__STDUOM ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" END) AS CORRECTION_RETURN_AMT, ")
.append(" DECODE(SRETURNDET.RET_REP_FLAG, 'P', SRETURNDET.QUANTITY__STDUOM, 0) AS REPL_RETURN_QTY, ")
.append(" DECODE(SRETURNDET.RET_REP_FLAG, 'P', SRETURNDET.QUANTITY__STDUOM * SRETURNDET.RATE__STDUOM, 0) AS REPL_RETURN_VALUE, ")
.append(" ( ")
.append(" CASE ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, SRETURNDET.QUANTITY__STDUOM, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE SRETURNDET.QUANTITY__STDUOM ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, SRETURNDET.QUANTITY__STDUOM, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE SRETURNDET.QUANTITY__STDUOM ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" END) AS RETURN_QTY, ")
.append(" ( ")
.append(" CASE ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, SRETURNDET.QUANTITY__STDUOM * SRETURNDET.RATE__STDUOM, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE SRETURNDET.QUANTITY__STDUOM * INVOICE_TRACE.RATE__STDUOM ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, SRETURNDET.QUANTITY__STDUOM * SRETURNDET.RATE__STDUOM, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN 0 ")
.append(" ELSE SRETURNDET.QUANTITY__STDUOM * INVOICE_TRACE.RATE__STDUOM ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" END) AS GROSS_RETURN_VALUE, ")
.append(" SRETURNDET.NET_AMT AS NET_RETURN_VALUE, ")
.append(" ( ")
.append(" CASE ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, 0, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN SRETURNDET.QUANTITY__STDUOM ")
.append(" ELSE 0 ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, 0, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN SRETURNDET.QUANTITY__STDUOM ")
.append(" ELSE 0 ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" END) AS FREE_RETURN_QTY, ")
.append(" (CASE ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, 0, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN SRETURNDET.QUANTITY__STDUOM * INVOICE_TRACE.RATE__STDUOM ")
.append(" ELSE 0 ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" WHEN SRETURNDET.RET_REP_FLAG = 'R' ")
.append(" THEN DECODE(INVOICE_TRACE.INVOICE_ID, NULL, 0, ( ")
.append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') = 'F' ")
.append(" AND INVOICE_TRACE.RATE__STDUOM = 0 ")
.append(" THEN SRETURNDET.QUANTITY__STDUOM * INVOICE_TRACE.RATE__STDUOM ")
.append(" ELSE 0 ")
.append(" END) ) ")
.append(" ELSE 0 ")
.append(" END) AS FREE_RET_VALUE, ")
.append(" NVL(FN_RGET_TAX_NEW('S-RET',SRETURN.TRAN_ID,CAST(SRETURNDET.LINE_NO AS CHAR(3)),'CGST_TAX',' ',' ','P'),0) AS CGST_RATE, ")
.append(" NVL(FN_RGET_TAX_NEW('S-RET',SRETURN.TRAN_ID,CAST(SRETURNDET.LINE_NO AS CHAR(3)),'CGST_TAX',' ',' ','T'),0) AS CGST_AMT, ")
......@@ -469,10 +473,10 @@ public class UpdateDWHSalesSum implements Schedule
.append(" NVL(FN_RGET_TAX_NEW('S-RET',SRETURN.TRAN_ID,CAST(SRETURNDET.LINE_NO AS CHAR(3)),'IGST_TAX',' ',' ','T'),0) AS IGST_AMT, ")
.append(" 0 AS DISC_AMT_INV, ")
.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(" + 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(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_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, ")
.append(" NVL(FN_RPICK_MRP_PTR(SRETURNDET.ITEM_CODE, SRETURN.TRAN_DATE,SRETURNDET.LOT_NO,'PTS_GST'),0) AS PTS ")
......@@ -485,8 +489,8 @@ public class UpdateDWHSalesSum implements Schedule
.append(" AND SRETURNDET.INVOICE_ID = INVOICE_TRACE.INVOICE_ID ")
.append(" AND SRETURNDET.LINE_NO__INVTRACE = INVOICE_TRACE.LINE_NO ")
.append(" WHERE SRETURN.CONFIRMED = 'Y' ")
.append(" AND SRETURN.TRAN_DATE = TO_DATE('"+refDate+"','"+sourceDateFormat+"') ")
.append(" AND SRETURN.TRAN_ID ='"+refId+"' ")
.append(" AND SRETURN.TRAN_DATE = TO_DATE('"+refDate+"','"+sourceDateFormat+"') ")
.append(" AND SRETURN.TRAN_ID ='"+refId+"' ")
.append(" ) DSSV ")
.append(" ")
.append(" GROUP BY DSSV.TRAN_ID, ")
......@@ -510,7 +514,6 @@ public class UpdateDWHSalesSum implements Schedule
.append(" DSSV.IGST_RATE, ")
.append(" DSSV.REF_SER, ")
.append(" DSSV.ITEM_SER ")
;
pstmt = userDbConn.prepareStatement(sql.toString());
......
......@@ -18,6 +18,7 @@ BEGIN
POS_CODE,
SALES_QTY,
GROSS_SALES_VALUE,
SALES_VALUE,
FREE_QTY,
FREE_SALES_VALUE,
NET_SALES_QTY,
......@@ -36,6 +37,7 @@ BEGIN
REPL_RETURN_VALUE,
RETURN_QTY,
GROSS_RETURN_VALUE,
RETURN_VALUE,
NET_RETURN_VALUE,
CGST_RATE,
CGST_AMT,
......@@ -65,10 +67,11 @@ BEGIN
DSSV.POS_CODE AS POS_CODE,
SUM( DSSV.SALES_QTY ) AS SALES_QTY,
SUM( DSSV.GROSS_SALES_VALUE - DSSV.DISC_AMT_INV ) AS GROSS_SALES_VALUE,
SUM( DSSV.GROSS_SALES_VALUE ) AS SALES_VALUE,
SUM( DSSV.FREE_QTY ) AS FREE_QTY,
SUM( DSSV.FREE_SALES_VALUE ) AS FREE_SALES_VALUE,
SUM( DSSV.SALES_QTY + DSSV.FREE_QTY + DSSV.REPL_QTY - DSSV.RETURN_QTY + DSSV.REPL_RETURN_QTY ) AS NET_SALES_QTY,
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,
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,
SUM( DSSV.REPL_QTY ) AS REPL_QTY,
SUM( DSSV.REPL_VALUE - DSSV.DISC_AMT_REPL) AS REPL_VALUE,
SUM( DSSV.SALEABLE_RETURN_QTY ) AS SALEABLE_RETURN_QTY,
......@@ -83,6 +86,7 @@ BEGIN
SUM( DSSV.REPL_RETURN_VALUE - DSSV.DISC_AMT_REPL_RET) AS REPL_RETURN_VALUE,
SUM( DSSV.RETURN_QTY ) AS RETURN_QTY,
SUM( DSSV.GROSS_RETURN_VALUE - DSSV.DISC_AMT_RET) AS GROSS_RETURN_VALUE,
SUM( DSSV.GROSS_RETURN_VALUE ) AS RETURN_VALUE,
SUM( DSSV.NET_RETURN_VALUE ) AS NET_RETURN_VALUE,
DSSV.CGST_RATE,
SUM(DSSV.CGST_AMT) AS CGST_AMT,
......
......@@ -12,6 +12,7 @@ CREATE TABLE DWH_SALES_SUM
SALES_QTY NUMBER(14,3),
GROSS_SALES_VALUE NUMBER(14,3),
SALES_VALUE NUMBER(14,3),
FREE_QTY NUMBER(14,3),
FREE_SALES_VALUE NUMBER(14,3),
NET_SALES_QTY NUMBER(14,3),
......@@ -33,6 +34,7 @@ CREATE TABLE DWH_SALES_SUM
RETURN_QTY NUMBER(14,3),
GROSS_RETURN_VALUE NUMBER(14,3),
NET_RETURN_VALUE NUMBER(14,3),
RETURN_VALUE NUMBER(14,3),
CGST_RATE NUMBER(14,3),
CGST_AMT NUMBER(14,3),
......
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