Updated changes in updatedwhsalessum

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@199540 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dashboard/ibase/dashboard/fin/ejb/UpdateDWHSalesSum.java

@@ -125,7 +125,12 @@ public class UpdateDWHSalesSum implements Schedule
 						.append("  DSSV.CUST_CODE                                                                     AS CUST_CODE, ")
 						.append("  DSSV.ITEM_CODE                                                                     AS ITEM_CODE, ")
 						.append("  DSSV.TRAN_DATE                                                                     AS DOC_DATE, ")
-						.append(" DSSV.POS_CODE                                                                      AS POS_CODE, ")
+						.append("  NVL((SELECT   ORG.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.GROSS_SALES_VALUE - DSSV.DISC_AMT_INV )                                  AS GROSS_SALES_VALUE, ")
 						.append("  SUM( DSSV.FREE_QTY )                                                               AS FREE_QTY, ")
@@ -172,7 +177,6 @@ public class UpdateDWHSalesSum implements Schedule
 						.append("      INVOICE.CUST_CODE, ")
 						.append("      INVOICE_TRACE.ITEM_CODE, ")
 						.append("      INVOICE.TRAN_DATE, ")
-						.append(" ORG_STRUCTURE_CUST.POS_CODE AS POS_CODE, ")
 						.append("      INVOICE.INV_TYPE            AS TRAN_TYPE, ")
 						.append("      ITEM.HSN_NO                 AS HSN_CODE, ")
 						.append("      ITEM.PACK_CODE              AS PACK_CODE, ")
@@ -237,12 +241,12 @@ public class UpdateDWHSalesSum implements Schedule
 						.append("      0 AS NET_RETURN_VALUE, ")
 						.append("      0 AS FREE_RETURN_QTY, ")
 						.append("      0 AS FREE_RET_VALUE, ")
-						.append(" NVL(FN_RGET_TAX_NEW('S-INV',INVOICE_TRACE.INVOICE_ID,CAST(INVOICE_TRACE.line_no AS CHAR(3)),'CGST_TAX',' ',' ','P'),0) AS CGST_RATE, ")
-						.append(" 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, ")
-						.append(" NVL(FN_RGET_TAX_NEW('S-INV',INVOICE_TRACE.INVOICE_ID,CAST(INVOICE_TRACE.line_no AS CHAR(3)),'SGST_TAX',' ',' ','P'),0) AS SGST_RATE, ")
-						.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(FN_RGET_TAX_NEW('S-INV',INVOICE_TRACE.INVOICE_ID,CAST(INVOICE_TRACE.LINE_NO AS CHAR(3)),'CGST_TAX',' ',' ','P'),0) AS CGST_RATE, ")
+						.append("      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, ")
+						.append("      NVL(FN_RGET_TAX_NEW('S-INV',INVOICE_TRACE.INVOICE_ID,CAST(INVOICE_TRACE.LINE_NO AS CHAR(3)),'SGST_TAX',' ',' ','P'),0) AS SGST_RATE, ")
+						.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) + 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("      ( ")
@@ -262,10 +266,7 @@ public class UpdateDWHSalesSum implements Schedule
 						.append("    INNER JOIN SITE ON INVOICE.SITE_CODE = SITE.SITE_CODE ")
 						.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("  LEFT OUTER JOIN ORG_STRUCTURE_CUST ON INVOICE.CUST_CODE = ORG_STRUCTURE_CUST.CUST_CODE ")
 						.append("    WHERE INVOICE.CONFIRMED = 'Y' ")
-						.append("  AND ITEM.ITEM_SER = ORG_STRUCTURE_CUST.TABLE_NO ")
-						.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 INVOICE.TRAN_DATE = TO_DATE('"+refDate+"','"+sourceDateFormat+"')  ")
 						.append(" 			AND INVOICE.INVOICE_ID ='"+refId+"' ")
 						.append("    UNION ALL ")
@@ -276,7 +277,6 @@ public class UpdateDWHSalesSum implements Schedule
 						.append("      SRETURN.CUST_CODE, ")
 						.append("      SRETURNDET.ITEM_CODE, ")
 						.append("      SRETURN.TRAN_DATE, ")
-						.append(" ORG_STRUCTURE_CUST.POS_CODE AS POS_CODE, ")
 						.append("      SRETURN.TRAN_TYPE, ")
 						.append("      ITEM.HSN_NO       AS HSN_CODE, ")
 						.append("      ITEM.PACK_CODE    AS PACK_CODE, ")
@@ -446,12 +446,12 @@ public class UpdateDWHSalesSum implements Schedule
 						.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, ")
-						.append(" NVL(FN_RGET_TAX_NEW('S-RET',SRETURN.TRAN_ID,CAST(SRETURNDET.line_no AS CHAR(3)),'SGST_TAX',' ',' ','P'),0) AS SGST_RATE, ")
-						.append(" NVL(FN_RGET_TAX_NEW('S-RET',SRETURN.TRAN_ID,CAST(SRETURNDET.line_no AS CHAR(3)),'SGST_TAX',' ',' ','T'),0) AS SGST_AMT, ")
-						.append(" NVL(FN_RGET_TAX_NEW('S-RET',SRETURN.TRAN_ID,CAST(SRETURNDET.line_no AS CHAR(3)),'IGST_TAX',' ',' ','P'),0) AS IGST_RATE, ")
-						.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("      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, ")
+						.append("      NVL(FN_RGET_TAX_NEW('S-RET',SRETURN.TRAN_ID,CAST(SRETURNDET.LINE_NO AS CHAR(3)),'SGST_TAX',' ',' ','P'),0) AS SGST_RATE, ")
+						.append("      NVL(FN_RGET_TAX_NEW('S-RET',SRETURN.TRAN_ID,CAST(SRETURNDET.LINE_NO AS CHAR(3)),'SGST_TAX',' ',' ','T'),0) AS SGST_AMT, ")
+						.append("      NVL(FN_RGET_TAX_NEW('S-RET',SRETURN.TRAN_ID,CAST(SRETURNDET.LINE_NO AS CHAR(3)),'IGST_TAX',' ',' ','P'),0) AS IGST_RATE, ")
+						.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, ")
@@ -466,13 +466,10 @@ public class UpdateDWHSalesSum implements Schedule
 						.append("    INNER JOIN SITE ON SRETURN.SITE_CODE = SITE.SITE_CODE ")
 						.append("    INNER JOIN ITEM 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 ON SRETURN.CUST_CODE = ORG_STRUCTURE_CUST.CUST_CODE ")
 						.append("    LEFT OUTER JOIN INVOICE_TRACE ON SRETURN.INVOICE_ID = INVOICE_TRACE.INVOICE_ID ")
 						.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 ITEM.ITEM_SER = ORG_STRUCTURE_CUST.TABLE_NO ")
-						.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("    ) DSSV ")
@@ -485,7 +482,6 @@ public class UpdateDWHSalesSum implements Schedule
 						.append("  DSSV.MRP, ")
 						.append("  DSSV.PTR, ")
 						.append("  DSSV.PTS, ")
-						.append(" DSSV.POS_CODE, ")
 						.append("  DSSV.HSN_CODE, ")
 						.append("  DSSV.PACK_CODE, ")
 						.append("  DSSV.DUE_DATE, ")