Skip to content

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

Updated changes in updatedwhSalessum scheduler 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@200180 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f9c99ad7
Show whitespace changes
Inline Side-by-side
Showing with 244 additions and 235 deletions
webitm-dashboard/ibase/dashboard/fin/ejb/UpdateDWHSalesSum.java
View file @ 0479e655
...@@ -126,15 +126,10 @@ public class UpdateDWHSalesSum implements Schedule ...@@ -126,15 +126,10 @@ public class UpdateDWHSalesSum implements Schedule
.append(" DSSV.SITE_CODE AS SITE_CODE, ") .append(" DSSV.SITE_CODE AS SITE_CODE, ")
.append(" DSSV.CUST_CODE AS CUST_CODE, ") .append(" DSSV.CUST_CODE AS CUST_CODE, ")
.append(" DSSV.ITEM_CODE AS ITEM_CODE, ") .append(" DSSV.ITEM_CODE AS ITEM_CODE, ")
.append(" NVL(DSSV.LOT_NO,'NA') AS LOT_NO, ") .append(" DSSV.LOT_NO AS LOT_NO, ")
.append(" NVL(DSSV.LINE_TYPE,'NA') AS LINE_TYPE, ") .append(" DSSV.LINE_TYPE AS LINE_TYPE, ")
.append(" DSSV.TRAN_DATE AS DOC_DATE, ") .append(" DSSV.TRAN_DATE AS DOC_DATE, ")
.append(" NVL((SELECT ORG.POS_CODE ") .append(" DSSV.POS_CODE AS POS_CODE, ")
.append(" FROM ORG_STRUCTURE_CUST ORG ")
.append(" WHERE ORG.CUST_CODE=DSSV.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 = DSSV.ITEM_SER ")
.append(" ) ,'NA') AS POS_CODE, ")
.append(" SUM( DSSV.SALES_QTY ) AS SALES_QTY, ") .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 - DSSV.DISC_AMT_INV ) AS GROSS_SALES_VALUE, ")
.append(" SUM( DSSV.FREE_QTY ) AS FREE_QTY, ") .append(" SUM( DSSV.FREE_QTY ) AS FREE_QTY, ")
...@@ -170,7 +165,7 @@ public class UpdateDWHSalesSum implements Schedule ...@@ -170,7 +165,7 @@ public class UpdateDWHSalesSum implements Schedule
.append(" (SELECT DESCR FROM PACKING WHERE PACK_CODE = DSSV.PACK_CODE) AS PACK, ") .append(" (SELECT DESCR FROM PACKING WHERE PACK_CODE = DSSV.PACK_CODE) AS PACK, ")
.append(" DSSV.DUE_DATE, ") .append(" DSSV.DUE_DATE, ")
.append(" DSSV.REF_SER, ") .append(" DSSV.REF_SER, ")
.append(" DSSV.CITY, ") .append(" NVL(DSSV.CITY , 'NOTSPECIFIED') AS CITY, ")
.append(" DSSV.ITEM_BRAND, ") .append(" DSSV.ITEM_BRAND, ")
.append(" DSSV.ITEM_SER ") .append(" DSSV.ITEM_SER ")
.append(" FROM ") .append(" FROM ")
...@@ -180,15 +175,21 @@ public class UpdateDWHSalesSum implements Schedule ...@@ -180,15 +175,21 @@ public class UpdateDWHSalesSum implements Schedule
.append(" INVOICE.SITE_CODE, ") .append(" INVOICE.SITE_CODE, ")
.append(" INVOICE.CUST_CODE, ") .append(" INVOICE.CUST_CODE, ")
.append(" INVOICE_TRACE.ITEM_CODE, ") .append(" INVOICE_TRACE.ITEM_CODE, ")
.append(" INVOICE_TRACE.LOT_NO, ") .append(" nvl(INVOICE_TRACE.LOT_NO,'NA') as lot_no, ")
.append(" INVOICE_TRACE.LINE_TYPE, ") .append(" nvl(INVOICE_TRACE.LINE_TYPE,'NA') as line_type, ")
.append(" INVOICE.TRAN_DATE, ") .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(" INVOICE.INV_TYPE AS TRAN_TYPE, ") .append(" INVOICE.INV_TYPE AS TRAN_TYPE, ")
.append(" ITEM.HSN_NO AS HSN_CODE, ") .append(" ITEM.HSN_NO AS HSN_CODE, ")
.append(" ITEM.PACK_CODE AS PACK_CODE, ") .append(" ITEM.PACK_CODE AS PACK_CODE, ")
.append(" DC.CITY AS CITY, ") .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(INVOICE.DUE_DATE) AS DUE_DATE, ") .append(" TO_CHAR(NVL(INVOICE.DUE_DATE,INVOICE.TRAN_DATE )) AS DUE_DATE, ")
.append(" ( ") .append(" ( ")
.append(" CASE ") .append(" CASE ")
.append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') IN ( 'F', 'V') AND INVOICE_TRACE.RATE__STDUOM = 0 ") .append(" WHEN COALESCE(INVOICE_TRACE.LINE_TYPE,'C') IN ( 'F', 'V') AND INVOICE_TRACE.RATE__STDUOM = 0 ")
...@@ -266,7 +267,7 @@ public class UpdateDWHSalesSum implements Schedule ...@@ -266,7 +267,7 @@ public class UpdateDWHSalesSum implements Schedule
.append(" 0 AS DISC_AMT_REPL_RET, ") .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, ") .append(" NVL(FN_RPICK_MRP_PTR(INVOICE_TRACE.ITEM_CODE,INVOICE.TRAN_DATE,INVOICE_TRACE.LOT_NO,'MRP_GST'),0) AS MRP, ")
.append(" NVL(FN_RPICK_MRP_PTR(INVOICE_TRACE.ITEM_CODE,INVOICE.TRAN_DATE,INVOICE_TRACE.LOT_NO,'PTR_GST'),0) AS PTR, ") .append(" NVL(FN_RPICK_MRP_PTR(INVOICE_TRACE.ITEM_CODE,INVOICE.TRAN_DATE,INVOICE_TRACE.LOT_NO,'PTR_GST'),0) AS PTR, ")
.append(" NVL(INVOICE_TRACE.RATE__STDUOM,0) * NVL(INVOICE_TRACE.EXCH_RATE,0) AS PTS ") .append(" NVL(FN_RPICK_MRP_PTR(INVOICE_TRACE.ITEM_CODE,INVOICE.TRAN_DATE,INVOICE_TRACE.LOT_NO,'PTS_GST'),0) AS PTS ")
.append(" FROM INVOICE ") .append(" FROM INVOICE ")
.append(" INNER JOIN INVOICE_TRACE ON INVOICE.INVOICE_ID = INVOICE_TRACE.INVOICE_ID ") .append(" INNER JOIN INVOICE_TRACE ON INVOICE.INVOICE_ID = INVOICE_TRACE.INVOICE_ID ")
.append(" INNER JOIN SITE ON INVOICE.SITE_CODE = SITE.SITE_CODE ") .append(" INNER JOIN SITE ON INVOICE.SITE_CODE = SITE.SITE_CODE ")
...@@ -282,15 +283,21 @@ public class UpdateDWHSalesSum implements Schedule ...@@ -282,15 +283,21 @@ public class UpdateDWHSalesSum implements Schedule
.append(" SRETURN.SITE_CODE, ") .append(" SRETURN.SITE_CODE, ")
.append(" SRETURN.CUST_CODE, ") .append(" SRETURN.CUST_CODE, ")
.append(" SRETURNDET.ITEM_CODE, ") .append(" SRETURNDET.ITEM_CODE, ")
.append(" SRETURNDET.LOT_NO, ") .append(" nvl(SRETURNDET.LOT_NO,'NA') as lot_no, ")
.append(" SRETURNDET.LINE_TYPE, ") .append(" nvl(SRETURNDET.LINE_TYPE,'NA') as line_type, ")
.append(" SRETURN.TRAN_DATE, ") .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(" SRETURN.TRAN_TYPE, ") .append(" SRETURN.TRAN_TYPE, ")
.append(" ITEM.HSN_NO AS HSN_CODE, ") .append(" ITEM.HSN_NO AS HSN_CODE, ")
.append(" ITEM.PACK_CODE AS PACK_CODE, ") .append(" ITEM.PACK_CODE AS PACK_CODE, ")
.append(" ITEM.PHY_ATTRIB_2 AS ITEM_BRAND, ") .append(" ITEM.PHY_ATTRIB_2 AS ITEM_BRAND, ")
.append(" DC.CITY AS CITY, ") .append(" NVL(DC.CITY , 'NOTSPECIFIED') AS CITY, ")
.append(" '' DUE_DATE, ") .append(" TO_CHAR( SRETURN.TRAN_DATE) AS DUE_DATE, ")
.append(" 0 AS SALES_QTY, ") .append(" 0 AS SALES_QTY, ")
.append(" 0 AS GROSS_SALES_VALUE, ") .append(" 0 AS GROSS_SALES_VALUE, ")
.append(" 0 AS REPL_QTY, ") .append(" 0 AS REPL_QTY, ")
...@@ -468,7 +475,7 @@ public class UpdateDWHSalesSum implements Schedule ...@@ -468,7 +475,7 @@ public class UpdateDWHSalesSum implements Schedule
.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,'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,'PTR_GST'),0) AS PTR, ")
.append(" NVL(SRETURNDET.RATE__STDUOM,0) * NVL(SRETURN.EXCH_RATE,0) AS PTS ") .append(" NVL(FN_RPICK_MRP_PTR(SRETURNDET.ITEM_CODE, SRETURN.TRAN_DATE,SRETURNDET.LOT_NO,'PTS_GST'),0) AS PTS ")
.append(" FROM SRETURN ") .append(" FROM SRETURN ")
.append(" INNER JOIN SRETURNDET ON SRETURN.TRAN_ID = SRETURNDET.TRAN_ID ") .append(" INNER JOIN SRETURNDET ON SRETURN.TRAN_ID = SRETURNDET.TRAN_ID ")
.append(" INNER JOIN SITE ON SRETURN.SITE_CODE = SITE.SITE_CODE ") .append(" INNER JOIN SITE ON SRETURN.SITE_CODE = SITE.SITE_CODE ")
...@@ -489,6 +496,7 @@ public class UpdateDWHSalesSum implements Schedule ...@@ -489,6 +496,7 @@ public class UpdateDWHSalesSum implements Schedule
.append(" DSSV.LOT_NO, ") .append(" DSSV.LOT_NO, ")
.append(" DSSV.LINE_TYPE, ") .append(" DSSV.LINE_TYPE, ")
.append(" DSSV.TRAN_DATE, ") .append(" DSSV.TRAN_DATE, ")
.append(" DSSV.POS_CODE, ")
.append(" DSSV.MRP, ") .append(" DSSV.MRP, ")
.append(" DSSV.PTR, ") .append(" DSSV.PTR, ")
.append(" DSSV.PTS, ") .append(" DSSV.PTS, ")
...@@ -496,12 +504,13 @@ public class UpdateDWHSalesSum implements Schedule ...@@ -496,12 +504,13 @@ public class UpdateDWHSalesSum implements Schedule
.append(" DSSV.PACK_CODE, ") .append(" DSSV.PACK_CODE, ")
.append(" DSSV.DUE_DATE, ") .append(" DSSV.DUE_DATE, ")
.append(" DSSV.ITEM_BRAND, ") .append(" DSSV.ITEM_BRAND, ")
.append(" DSSV.CITY, ") .append(" NVL(DSSV.CITY , 'NOTSPECIFIED'), ")
.append(" DSSV.CGST_RATE, ") .append(" DSSV.CGST_RATE, ")
.append(" DSSV.SGST_RATE, ") .append(" DSSV.SGST_RATE, ")
.append(" DSSV.IGST_RATE, ") .append(" DSSV.IGST_RATE, ")
.append(" DSSV.REF_SER, ") .append(" DSSV.REF_SER, ")
.append(" DSSV.ITEM_SER ") .append(" DSSV.ITEM_SER ")
; ;
pstmt = userDbConn.prepareStatement(sql.toString()); pstmt = userDbConn.prepareStatement(sql.toString());
......
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