Skip to content

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

Updated changes for purchase dashboard 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@201788 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 933f5dac
Show whitespace changes
Inline Side-by-side
Showing with 122 additions and 84 deletions
webitm-dashboard/ibase/dashboard/fin/ejb/UpdateDWHPurchase.java
View file @ 6d54a71e
......@@ -72,8 +72,8 @@ public class UpdateDWHPurchase implements Schedule
String refDate =transDataObj.optString("ref_date");
//refDate=genericUtility.getValidDateString(refDate, sourceDateFormat, targetDateFormat);
System.out.println("UpdateDWHPurchase ==== Insert query for transaction of records in DWH_PURCHASE [" +refId+"] refSer ["+refSer+"] refDate ["+refDate+"]");
sql.append("INSERT ")
.append("INTO DWH_PURCHASE ")
sql.append(" INSERT ")
.append(" INTO DWH_PURCHASE ")
.append(" ( ")
.append(" RECEIPT_NO, ")
.append(" RECEIPT_DATE, ")
......@@ -83,7 +83,7 @@ public class UpdateDWHPurchase implements Schedule
.append(" ITEM_CODE , ")
.append(" QUANTITY , ")
.append(" LOT_NO, ")
.append(" LOT_SL, ")
.append(" LOT_SL , ")
.append(" DISC_AMT , ")
.append(" RATE, ")
.append(" TAX_AMT , ")
......@@ -106,12 +106,27 @@ public class UpdateDWHPurchase implements Schedule
.append(" BATCH_NO , ")
.append(" MFG_DATE , ")
.append(" EXP_DATE , ")
.append(" QC_REQD ,")
.append(" SITE_CODE, ")
.append(" LINE_NO, ")
.append(" TRAN_SER ")
.append(" QC_REQD , ")
.append(" SITE_CODE , ")
.append(" LINE_NO , ")
.append(" TRAN_SER , ")
.append(" CGST_RATE , ")
.append(" CGST_TAXABLE_AMT , ")
.append(" CGST_AMT , ")
.append(" SGST_RATE , ")
.append(" SGST_TAXABLE_AMT , ")
.append(" SGST_AMT , ")
.append(" IGST_RATE , ")
.append(" IGST_TAXABLE_AMT , ")
.append(" IGST_AMT , ")
.append(" CESS_RATE , ")
.append(" CESS_TAXABLE_AMT , ")
.append(" CESS_AMT, ")
.append(" TAX_CHARGES ")
.append(" ) ")
.append(" SELECT PR.TRAN_ID AS RECEIPT_NO, ")
.append(" ")
.append(" SELECT ")
.append(" PR.TRAN_ID AS RECEIPT_NO, ")
.append(" PR.TRAN_DATE AS RECEIPT_DATE, ")
.append(" PR.SUPP_CODE AS SUPPLIER_CODE, ")
.append(" S.SUPP_NAME AS SUPPLIER_NAME, ")
......@@ -128,14 +143,12 @@ public class UpdateDWHPurchase implements Schedule
.append(" PR.INVOICE_DATE, ")
.append(" PR.DC_NO AS CHALLAN_NO, ")
.append(" PR.DC_DATE AS CHALLAN_DATE, ")
.append(" NVL((SELECT TRAN_NAME FROM TRANSPORTER T WHERE PR.TRAN_CODE =T.TRAN_CODE),'NA') ")
.append(" AS TRAN_NAME, ")
.append(" NVL((SELECT TRAN_NAME FROM TRANSPORTER T WHERE PR.TRAN_CODE =T.TRAN_CODE),'NA') AS TRAN_NAME, ")
.append(" PR.LR_NO, ")
.append(" PR.LR_DATE, ")
.append(" PR.TRAN_TYPE, ")
.append(" PR.PURC_ORDER AS PO_NO, ")
.append(" (SELECT PORD.ORD_DATE FROM PORDER PORD WHERE PR.PURC_ORDER =PORD.PURC_ORDER ")
.append(" ) AS PO_DATE, ")
.append(" (SELECT PORD.ORD_DATE FROM PORDER PORD WHERE PR.PURC_ORDER =PORD.PURC_ORDER) AS PO_DATE, ")
.append(" PR.ITEM_SER, ")
.append(" PR.TRAN_CODE, ")
.append(" PRD.NO_ART, ")
......@@ -146,16 +159,41 @@ public class UpdateDWHPurchase implements Schedule
.append(" PRD.EXPIRY_DATE AS EXP_DATE, ")
.append(" PRD.QC_REQD, ")
.append(" PR.SITE_CODE, ")
.append(" PRD.LINE_NO, ")
.append(" PR.TRAN_SER ")
.append(" PRD.LINE_NO, ").append(" ")
.append(" ")
.append(" ")
.append(" ")
.append(" PR.TRAN_SER, ")
.append(" NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'CGST_PUR_REG',' ',' ','P'),0) * (PR.EXCH_RATE) AS CGST_RATE , ")
.append(" NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'CGST_PUR_REG',' ',' ','B'),0) * (PR.EXCH_RATE) AS CGST_TAXABLE_AMT , ")
.append(" NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'CGST_PUR_REG',' ',' ','T'),0) * (PR.EXCH_RATE) AS CGST_AMT , ")
.append(" NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'SGST_PUR_REG',' ',' ','P'),0) * (PR.EXCH_RATE) AS SGST_RATE , ")
.append(" NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'SGST_PUR_REG',' ',' ','B'),0) * (PR.EXCH_RATE) AS SGST_TAXABLE_AMT , ")
.append(" NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'SGST_PUR_REG',' ',' ','T'),0) * (PR.EXCH_RATE) AS SGST_AMT , ")
.append(" NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'IGST_PUR_REG',' ',' ','P'),0) * (PR.EXCH_RATE) AS IGST_RATE , ")
.append(" NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'IGST_PUR_REG',' ',' ','B'),0) * (PR.EXCH_RATE) AS IGST_TAXABLE_AMT , ")
.append(" NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'IGST_PUR_REG',' ',' ','T'),0) * (PR.EXCH_RATE) AS IGST_AMT , ")
.append(" NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'CESS_PUR_REG',' ',' ','P'),0) * (PR.EXCH_RATE) AS CESS_RATE , ")
.append(" NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'CESS_PUR_REG',' ',' ','B'),0) * (PR.EXCH_RATE) AS CESS_TAXABLE_AMT , ")
.append(" NVL(FN_RGET_TAX_NEW(PR.TRAN_SER,PR.TRAN_ID,CAST(PRD.LINE_NO AS CHAR(3)),'CESS_PUR_REG',' ',' ','T'),0) * (PR.EXCH_RATE) AS CESS_AMT, ")
.append(" (SELECT SUM(TAX_AMT) ")
.append(" FROM taxtran ti, tax tx ")
.append(" WHERE tx.tax_code = ti.tax_code ")
.append(" AND ti.tran_code = PR.TRAN_SER ")
.append(" AND TI.TRAN_ID = PR.TRAN_ID ")
.append(" AND TX.TAX_TYPE NOT IN ('H','I','J') ")
.append(" AND TI.LINE_NO = PRD.LINE_NO ")
.append(" ) AS TAX_CHARGES ")
.append(" ")
.append(" FROM PORCPDET PRD ")
.append(" INNER JOIN PORCP PR ")
.append(" ON PR.TRAN_ID =PRD.TRAN_ID ")
.append(" INNER JOIN SUPPLIER S ")
.append(" ON PR.SUPP_CODE =S.SUPP_CODE ")
.append(" WHERE PR.CONFIRMED ='Y' ")
.append(" INNER JOIN PORCP PR ON PR.TRAN_ID =PRD.TRAN_ID ")
.append(" INNER JOIN SUPPLIER S ON PR.SUPP_CODE =S.SUPP_CODE ")
.append(" WHERE ")
.append(" PR.CONFIRMED ='Y' ")
.append(" AND PR.TRAN_ID ='"+refId+"' ")
.append(" AND PR.TRAN_DATE = TO_DATE('"+refDate+"','"+sourceDateFormat+"') ") ;
.append(" AND PR.TRAN_DATE = TO_DATE('"+refDate+"','"+sourceDateFormat+"') ");
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